diff --git a/arch/arm/src/imx6/hardware/imx_ccm.h b/arch/arm/src/imx6/hardware/imx_ccm.h index cd4ba05dc7..9f51d617f5 100644 --- a/arch/arm/src/imx6/hardware/imx_ccm.h +++ b/arch/arm/src/imx6/hardware/imx_ccm.h @@ -45,7 +45,7 @@ ************************************************************************************/ #include -#include "hardware/imx_memory.map" +#include "hardware/imx_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/imx6/hardware/imx_gpio.h b/arch/arm/src/imx6/hardware/imx_gpio.h index 43bd5ff0d5..2ccd23acff 100644 --- a/arch/arm/src/imx6/hardware/imx_gpio.h +++ b/arch/arm/src/imx6/hardware/imx_gpio.h @@ -45,7 +45,7 @@ ************************************************************************************/ #include -#include "hardware/imx_memory.map" +#include "hardware/imx_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/imx6/hardware/imx_gpt.h b/arch/arm/src/imx6/hardware/imx_gpt.h index f884b7d4be..f4658400c2 100644 --- a/arch/arm/src/imx6/hardware/imx_gpt.h +++ b/arch/arm/src/imx6/hardware/imx_gpt.h @@ -45,7 +45,7 @@ ************************************************************************************/ #include -#include "hardware/imx_memory.map" +#include "hardware/imx_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/imx6/hardware/imx_iomuxc.h b/arch/arm/src/imx6/hardware/imx_iomuxc.h index 85a66f5036..226c68a9c3 100644 --- a/arch/arm/src/imx6/hardware/imx_iomuxc.h +++ b/arch/arm/src/imx6/hardware/imx_iomuxc.h @@ -45,7 +45,7 @@ ************************************************************************************/ #include -#include "hardware/imx_memory.map" +#include "hardware/imx_memorymap.h" /* These definitions derive from specifications for the i.MX 6Quad/6Dual and require * review and modification in order to support other family members. diff --git a/arch/arm/src/imx6/hardware/imx_src.h b/arch/arm/src/imx6/hardware/imx_src.h index af5f97a1eb..d6e52cf7fc 100644 --- a/arch/arm/src/imx6/hardware/imx_src.h +++ b/arch/arm/src/imx6/hardware/imx_src.h @@ -45,7 +45,7 @@ ****************************************************************************************************/ #include -#include "hardware/imx_memory.map" +#include "hardware/imx_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imx6/hardware/imx_uart.h b/arch/arm/src/imx6/hardware/imx_uart.h index cbe0cd99c2..9a3db18911 100644 --- a/arch/arm/src/imx6/hardware/imx_uart.h +++ b/arch/arm/src/imx6/hardware/imx_uart.h @@ -45,7 +45,7 @@ ************************************************************************************/ #include -#include "hardware/imx_memory.map" +#include "hardware/imx_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/chip.h b/arch/arm/src/lpc17xx/chip.h index 2f04b031d8..391901a271 100644 --- a/arch/arm/src/lpc17xx/chip.h +++ b/arch/arm/src/lpc17xx/chip.h @@ -55,7 +55,7 @@ * this file for the proper setup. */ -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/chip/lpc176x_memorymap.h b/arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h similarity index 96% rename from arch/arm/src/lpc17xx/chip/lpc176x_memorymap.h rename to arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h index 094a47788f..a99f93d754 100644 --- a/arch/arm/src/lpc17xx/chip/lpc176x_memorymap.h +++ b/arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/lpc176x_memorymap.h + * arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC176X_MEMORYMAP_H -#define __ARCH_ARM_SRC_LPC17XX_LPC176X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_MEMORYMAP_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_MEMORYMAP_H /************************************************************************************ * Included Files @@ -133,4 +133,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC176X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_MEMORYMAP_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h b/arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h rename to arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h index cd80c602a2..3adb293adc 100644 --- a/arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h +++ b/arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h + * arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h * * Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONFIG_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONFIG_H /************************************************************************************ * Included Files @@ -231,4 +231,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONFIG_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc176x_pinconn.h b/arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc176x_pinconn.h rename to arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h index 6d5b05ba9e..fccf9e8854 100644 --- a/arch/arm/src/lpc17xx/chip/lpc176x_pinconn.h +++ b/arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc176x_pinconn.h + * arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONN_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONN_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONN_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONN_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -632,4 +632,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONN_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONN_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h b/arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc176x_syscon.h rename to arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h index bc3ae3c92e..96b75be806 100644 --- a/arch/arm/src/lpc17xx/chip/lpc176x_syscon.h +++ b/arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc176x_syscon.h + * arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_SYSCON_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_SYSCON_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_SYSCON_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_SYSCON_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -491,4 +491,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_SYSCON_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_SYSCON_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h b/arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc178x_iocon.h rename to arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h index 690313f4db..bb49cd13a8 100644 --- a/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h +++ b/arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc178x_iocon.h + * arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Rommel Marcelo @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_IOCON_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_IOCON_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_IOCON_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_IOCON_H /************************************************************************************ * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -372,4 +372,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_IOCON_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_IOCON_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc178x_memorymap.h b/arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc178x_memorymap.h rename to arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h index 35c5186656..76a87f182c 100644 --- a/arch/arm/src/lpc17xx/chip/lpc178x_memorymap.h +++ b/arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/lpc178x_memorymap.h + * arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Authors: Rommel Marcelo @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC178X_MEMORYMAP_H -#define __ARCH_ARM_SRC_LPC17XX_LPC178X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_MEMORYMAP_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_MEMORYMAP_H /************************************************************************************ * Included Files @@ -155,4 +155,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC178X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_MEMORYMAP_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h b/arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h rename to arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h index f4007a89c9..acafae871a 100644 --- a/arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h +++ b/arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h + * arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Authors: Rommel Marcelo @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_PINCONFIG_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_PINCONFIG_H /************************************************************************************ * Included Files @@ -656,4 +656,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_PINCONFIG_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc178x_syscon.h b/arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc178x_syscon.h rename to arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h index bf5186abcb..b6701ce6c2 100644 --- a/arch/arm/src/lpc17xx/chip/lpc178x_syscon.h +++ b/arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/lpc17xx/chip/lpc178x_syscon.h + * arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Authors: Rommel Marcelo @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_SYSCON_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_SYSCON_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_SYSCON_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_SYSCON_H /**************************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -633,4 +633,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_SYSCON_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_SYSCON_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_adc.h b/arch/arm/src/lpc17xx/hardware/lpc17_adc.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_adc.h rename to arch/arm/src/lpc17xx/hardware/lpc17_adc.h index 8cec0d3250..fc6fb80b00 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_adc.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_adc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_adc.h + * arch/arm/src/lpc17xx/hardware/lpc17_adc.h * * Copyright (C) 2010, 2012, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_ADC_H -#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_ADC_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_ADC_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_ADC_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -177,4 +177,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_ADC_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_ADC_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_can.h b/arch/arm/src/lpc17xx/hardware/lpc17_can.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc17_can.h rename to arch/arm/src/lpc17xx/hardware/lpc17_can.h index 74a2109442..2a9172ada9 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_can.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_can.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_can.h + * arch/arm/src/lpc17xx/hardware/lpc17_can.h * * Copyright (C) 2010-2012, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_CAN_H -#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_CAN_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_CAN_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_CAN_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -507,4 +507,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_CAN_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_CAN_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_dac.h b/arch/arm/src/lpc17xx/hardware/lpc17_dac.h similarity index 94% rename from arch/arm/src/lpc17xx/chip/lpc17_dac.h rename to arch/arm/src/lpc17xx/hardware/lpc17_dac.h index be78bef059..9e39c1e982 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_dac.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_dac.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_dac.h + * arch/arm/src/lpc17xx/hardware/lpc17_dac.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_DAC_H -#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_DAC_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_DAC_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_DAC_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -94,4 +94,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_DAC_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_DAC_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_eeprom.h b/arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_eeprom.h rename to arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h index 7f14770431..d202cb7317 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_eeprom.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_eeprom.h + * arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EEPROM_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EEPROM_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EEPROM_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EEPROM_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -183,4 +183,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EEPROM_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EEPROM_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_emc.h b/arch/arm/src/lpc17xx/hardware/lpc17_emc.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_emc.h rename to arch/arm/src/lpc17xx/hardware/lpc17_emc.h index 2454003a4e..11e30a0cf4 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_emc.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_emc.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/lpc17xx/chip/lpc17_emc + * arch/arm/src/lpc17xx/hardware/lpc17_emc * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EMC_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EMC_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EMC_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EMC_H /**************************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -347,4 +347,4 @@ * Public Functions ****************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EMC_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EMC_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_ethernet.h b/arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc17_ethernet.h rename to arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h index b0791ced96..f60e5530f8 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_ethernet.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_ethernet.h + * arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_ETHERNET_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_ETHERNET_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_ETHERNET_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_ETHERNET_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -594,4 +594,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_ETHERNET_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_gpdma.h b/arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc17_gpdma.h rename to arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h index a915559b96..4a1f25bf91 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_gpdma.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_gpdma.h + * arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_GPDMA_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_GPDMA_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_GPDMA_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_GPDMA_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -594,4 +594,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_GPDMA_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_GPDMA_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_gpio.h b/arch/arm/src/lpc17xx/hardware/lpc17_gpio.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_gpio.h rename to arch/arm/src/lpc17xx/hardware/lpc17_gpio.h index aa5c0f57b0..2e9891058b 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_gpio.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_gpio.h + * arch/arm/src/lpc17xx/hardware/lpc17_gpio.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_GPIO_H -#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_GPIO_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_GPIO_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_GPIO_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -207,4 +207,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_GPIO_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_GPIO_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_i2c.h b/arch/arm/src/lpc17xx/hardware/lpc17_i2c.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_i2c.h rename to arch/arm/src/lpc17xx/hardware/lpc17_i2c.h index 96b6f19b1a..eb370fdd5d 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_i2c.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_i2c.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_i2c.h + * arch/arm/src/lpc17xx/hardware/lpc17_i2c.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2C_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2C_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2C_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2C_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -205,4 +205,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2C_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2C_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_i2s.h b/arch/arm/src/lpc17xx/hardware/lpc17_i2s.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_i2s.h rename to arch/arm/src/lpc17xx/hardware/lpc17_i2s.h index 100d2f39f1..bb0f9ca442 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_i2s.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_i2s.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_i2s + * arch/arm/src/lpc17xx/hardware/lpc17_i2s * * Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2S_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2S_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2S_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2S_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -187,4 +187,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2S_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2S_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_lcd.h b/arch/arm/src/lpc17xx/hardware/lpc17_lcd.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_lcd.h rename to arch/arm/src/lpc17xx/hardware/lpc17_lcd.h index ef334a1a67..af47bbd8a7 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_lcd.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_lcd.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_lcd.h + * arch/arm/src/lpc17xx/hardware/lpc17_lcd.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_LCD_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_LCD_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_LCD_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_LCD_H /************************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************************ * Pre-processor Definitions @@ -343,4 +343,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_LCD_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_LCD_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h b/arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h rename to arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h index 16a21a162c..fc04e68ab9 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h + * arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MCPWM_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MCPWM_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MCPWM_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MCPWM_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -277,4 +277,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MCPWM_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MCPWM_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_memorymap.h b/arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h similarity index 90% rename from arch/arm/src/lpc17xx/chip/lpc17_memorymap.h rename to arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h index 53214c8a5d..54dcc06b75 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_memorymap.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_memorymap.h + * arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h * * Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MEMORYMAP_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MEMORYMAP_H /************************************************************************************ * Included Files @@ -49,9 +49,9 @@ #include #if defined(LPC176x) -# include "chip/lpc176x_memorymap.h" +# include "hardware/lpc176x_memorymap.h" #elif defined(LPC178x) -# include "chip/lpc178x_memorymap.h" +# include "hardware/lpc178x_memorymap.h" #else # error "Unrecognized LPC17xx family" #endif @@ -72,4 +72,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MEMORYMAP_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h b/arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h similarity index 90% rename from arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h rename to arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h index c0090dbc1a..39a9fe0908 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h + * arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h * * Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONFIG_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONFIG_H /************************************************************************************ * Included Files @@ -49,9 +49,9 @@ #include #if defined(LPC176x) -# include "chip/lpc176x_pinconfig.h" +# include "hardware/lpc176x_pinconfig.h" #elif defined(LPC178x) -# include "chip/lpc178x_pinconfig.h" +# include "hardware/lpc178x_pinconfig.h" #else # error "Unrecognized LPC17xx family" #endif @@ -72,4 +72,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONFIG_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_pinconn.h b/arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h similarity index 91% rename from arch/arm/src/lpc17xx/chip/lpc17_pinconn.h rename to arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h index 8b6829f9ba..f9f46dfb5f 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_pinconn.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_pinconn.h + * arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONN_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONN_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONN_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONN_H /************************************************************************************ * Included Files @@ -49,9 +49,9 @@ #include #if defined(LPC176x) -# include "chip/lpc176x_pinconn.h" +# include "hardware/lpc176x_pinconn.h" #elif defined(LPC178x) -# include "chip/lpc178x_iocon.h" +# include "hardware/lpc178x_iocon.h" #else # error "Unrecognized LPC17xx family" #endif @@ -72,4 +72,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONN_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONN_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_pwm.h b/arch/arm/src/lpc17xx/hardware/lpc17_pwm.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_pwm.h rename to arch/arm/src/lpc17xx/hardware/lpc17_pwm.h index 610215bc02..4c158c9d0c 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_pwm.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_pwm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_pwm.h + * arch/arm/src/lpc17xx/hardware/lpc17_pwm.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PWM_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PWM_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PWM_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PWM_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -220,4 +220,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PWM_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PWM_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_qei.h b/arch/arm/src/lpc17xx/hardware/lpc17_qei.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_qei.h rename to arch/arm/src/lpc17xx/hardware/lpc17_qei.h index af0d692439..ab3e3fb98a 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_qei.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_qei.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/lpc17xx/chip/lpc17_qei.h + * arch/arm/src/lpc17xx/hardware/lpc17_qei.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_QEI_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_QEI_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_QEI_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_QEI_H /******************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -211,4 +211,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_QEI_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_QEI_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_rit.h b/arch/arm/src/lpc17xx/hardware/lpc17_rit.h similarity index 94% rename from arch/arm/src/lpc17xx/chip/lpc17_rit.h rename to arch/arm/src/lpc17xx/hardware/lpc17_rit.h index 00029f8fe7..7ddf129e92 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_rit.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_rit.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_rit.h + * arch/arm/src/lpc17xx/hardware/lpc17_rit.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RIT_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RIT_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RIT_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RIT_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -89,4 +89,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RIT_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RIT_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_rtc.h b/arch/arm/src/lpc17xx/hardware/lpc17_rtc.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_rtc.h rename to arch/arm/src/lpc17xx/hardware/lpc17_rtc.h index 56144c6cf2..08975f2e99 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_rtc.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_rtc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_rtc.h + * arch/arm/src/lpc17xx/hardware/lpc17_rtc.h * * Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTC_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTC_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTC_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTC_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -274,4 +274,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTC_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTC_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_rtcevmr.h b/arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_rtcevmr.h rename to arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h index a16decd471..5448a3b7cf 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_rtcevmr.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_rtcevmr.h + * arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTCEVMR_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTCEVMR_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTCEVMR_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTCEVMR_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -140,4 +140,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTCEVMR_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTCEVMR_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_sdcard.h b/arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_sdcard.h rename to arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h index 5e91435ef9..7140d186cf 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_sdcard.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_sdcard.h + * arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SDCARD_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SDCARD_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SDCARD_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SDCARD_H /************************************************************************************ * Pre-processor Definitions @@ -268,5 +268,5 @@ * The FIFOs contain 16 entries on 16 sequential addresses. */ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SDCARD_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SDCARD_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_spi.h b/arch/arm/src/lpc17xx/hardware/lpc17_spi.h similarity index 96% rename from arch/arm/src/lpc17xx/chip/lpc17_spi.h rename to arch/arm/src/lpc17xx/hardware/lpc17_spi.h index 716e70cb54..dc9dce9438 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_spi.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_spi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_spi.h + * arch/arm/src/lpc17xx/hardware/lpc17_spi.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SPI_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SPI_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SPI_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SPI_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -138,4 +138,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SPI_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SPI_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_ssp.h b/arch/arm/src/lpc17xx/hardware/lpc17_ssp.h similarity index 97% rename from arch/arm/src/lpc17xx/chip/lpc17_ssp.h rename to arch/arm/src/lpc17xx/hardware/lpc17_ssp.h index dd791327fb..c1d40a211f 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_ssp.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_ssp.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_ssp.h + * arch/arm/src/lpc17xx/hardware/lpc17_ssp.h * * Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SSP_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SSP_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SSP_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SSP_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -182,4 +182,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SSP_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SSP_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_syscon.h b/arch/arm/src/lpc17xx/hardware/lpc17_syscon.h similarity index 91% rename from arch/arm/src/lpc17xx/chip/lpc17_syscon.h rename to arch/arm/src/lpc17xx/hardware/lpc17_syscon.h index ebab3a1be5..29d4380f29 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_syscon.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_syscon.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_syscon.h + * arch/arm/src/lpc17xx/hardware/lpc17_syscon.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SYSCON_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SYSCON_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SYSCON_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SYSCON_H /************************************************************************************ * Included Files @@ -49,9 +49,9 @@ #include #if defined(LPC176x) -# include "chip/lpc176x_syscon.h" +# include "hardware/lpc176x_syscon.h" #elif defined(LPC178x) -# include "chip/lpc178x_syscon.h" +# include "hardware/lpc178x_syscon.h" #else # error "Unrecognized LPC17xx family" #endif @@ -72,4 +72,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SYSCON_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SYSCON_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_timer.h b/arch/arm/src/lpc17xx/hardware/lpc17_timer.h similarity index 98% rename from arch/arm/src/lpc17xx/chip/lpc17_timer.h rename to arch/arm/src/lpc17xx/hardware/lpc17_timer.h index 455133ee7e..b66b3921ad 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_timer.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_timer.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_timer.h + * arch/arm/src/lpc17xx/hardware/lpc17_timer.h * * Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_TIMER_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_TIMER_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_TIMER_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_TIMER_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -247,4 +247,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_TIMER_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_TIMER_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_uart.h b/arch/arm/src/lpc17xx/hardware/lpc17_uart.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc17_uart.h rename to arch/arm/src/lpc17xx/hardware/lpc17_uart.h index 478c18b70a..175fedacfa 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_uart.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_uart.h + * arch/arm/src/lpc17xx/hardware/lpc17_uart.h * * Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_UART_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_UART_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_UART_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_UART_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -411,4 +411,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_UART_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_UART_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_usb.h b/arch/arm/src/lpc17xx/hardware/lpc17_usb.h similarity index 99% rename from arch/arm/src/lpc17xx/chip/lpc17_usb.h rename to arch/arm/src/lpc17xx/hardware/lpc17_usb.h index 32b02455c5..56b38e55a0 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_usb.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_usb.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_usb.h + * arch/arm/src/lpc17xx/hardware/lpc17_usb.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_USB_H -#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_USB_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_USB_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_USB_H /************************************************************************************ * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -775,4 +775,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_USB_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_USB_H */ diff --git a/arch/arm/src/lpc17xx/chip/lpc17_wdt.h b/arch/arm/src/lpc17xx/hardware/lpc17_wdt.h similarity index 96% rename from arch/arm/src/lpc17xx/chip/lpc17_wdt.h rename to arch/arm/src/lpc17xx/hardware/lpc17_wdt.h index d76ff17622..f740fe167c 100644 --- a/arch/arm/src/lpc17xx/chip/lpc17_wdt.h +++ b/arch/arm/src/lpc17xx/hardware/lpc17_wdt.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/lpc17xx/chip/lpc17_wdt.h + * arch/arm/src/lpc17xx/hardware/lpc17_wdt.h * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_WDT_H -#define __ARCH_ARM_SRC_LPC17XX_LPC17_WDT_H +#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_WDT_H +#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_WDT_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -153,4 +153,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_WDT_H */ +#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_WDT_H */ diff --git a/arch/arm/src/lpc17xx/lpc176x_clockconfig.c b/arch/arm/src/lpc17xx/lpc176x_clockconfig.c index a6f57b3a52..cc9cc89b8b 100644 --- a/arch/arm/src/lpc17xx/lpc176x_clockconfig.c +++ b/arch/arm/src/lpc17xx/lpc176x_clockconfig.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "up_internal.h" #include "lpc17_clockconfig.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c index 8254915968..ae5a18949d 100644 --- a/arch/arm/src/lpc17xx/lpc176x_rtc.c +++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c @@ -52,7 +52,7 @@ #include "up_internal.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_rtc.h" diff --git a/arch/arm/src/lpc17xx/lpc178x_clockconfig.c b/arch/arm/src/lpc17xx/lpc178x_clockconfig.c index efdca053d2..216d27012f 100644 --- a/arch/arm/src/lpc17xx/lpc178x_clockconfig.c +++ b/arch/arm/src/lpc17xx/lpc178x_clockconfig.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "up_internal.h" #include "lpc17_clockconfig.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_adc.c b/arch/arm/src/lpc17xx/lpc17_adc.c index 9d476e48d3..b7d22b393b 100644 --- a/arch/arm/src/lpc17xx/lpc17_adc.c +++ b/arch/arm/src/lpc17xx/lpc17_adc.c @@ -63,7 +63,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_adc.h" diff --git a/arch/arm/src/lpc17xx/lpc17_adc.h b/arch/arm/src/lpc17xx/lpc17_adc.h index 95d8a13d4b..09f1b66984 100644 --- a/arch/arm/src/lpc17xx/lpc17_adc.h +++ b/arch/arm/src/lpc17xx/lpc17_adc.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/lpc17_adc.h" +#include "hardware/lpc17_adc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_allocateheap.c b/arch/arm/src/lpc17xx/lpc17_allocateheap.c index 39038742d7..839c5a3987 100644 --- a/arch/arm/src/lpc17xx/lpc17_allocateheap.c +++ b/arch/arm/src/lpc17xx/lpc17_allocateheap.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" #include "lpc17_emacram.h" #include "lpc17_ohciram.h" #include "lpc17_mpuinit.h" diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c index 52be6268e5..3d3069b0b5 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.c +++ b/arch/arm/src/lpc17xx/lpc17_can.c @@ -63,7 +63,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_can.h" diff --git a/arch/arm/src/lpc17xx/lpc17_can.h b/arch/arm/src/lpc17xx/lpc17_can.h index 2cbb8014a9..271339ff05 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.h +++ b/arch/arm/src/lpc17xx/lpc17_can.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/lpc17_can.h" +#include "hardware/lpc17_can.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_clockconfig.c b/arch/arm/src/lpc17xx/lpc17_clockconfig.c index 97ef496f0d..0dc378c98e 100644 --- a/arch/arm/src/lpc17xx/lpc17_clockconfig.c +++ b/arch/arm/src/lpc17xx/lpc17_clockconfig.c @@ -56,9 +56,9 @@ #include #if defined(LPC176x) -# include "chip/lpc176x_clockconfig.c" +# include "hardware/lpc176x_clockconfig.c" #elif defined(LPC178x) -# include "chip/lpc178x_clockconfig.c" +# include "hardware/lpc178x_clockconfig.c" #else # error "Unrecognized LPC17xx family" #endif diff --git a/arch/arm/src/lpc17xx/lpc17_dac.c b/arch/arm/src/lpc17xx/lpc17_dac.c index 003d609266..301dc4133f 100644 --- a/arch/arm/src/lpc17xx/lpc17_dac.c +++ b/arch/arm/src/lpc17xx/lpc17_dac.c @@ -62,8 +62,8 @@ #include "chip.h" -#include "chip/lpc17_syscon.h" -#include "chip/lpc17_pinconfig.h" +#include "hardware/lpc17_syscon.h" +#include "hardware/lpc17_pinconfig.h" #include "lpc17_gpio.h" #include "lpc17_dac.h" diff --git a/arch/arm/src/lpc17xx/lpc17_dac.h b/arch/arm/src/lpc17xx/lpc17_dac.h index ac8477507c..a27b6a66d1 100644 --- a/arch/arm/src/lpc17xx/lpc17_dac.h +++ b/arch/arm/src/lpc17xx/lpc17_dac.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_dac.h" +#include "hardware/lpc17_dac.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_emacram.h b/arch/arm/src/lpc17xx/lpc17_emacram.h index d1d0d8d4e5..f68e62734e 100644 --- a/arch/arm/src/lpc17xx/lpc17_emacram.h +++ b/arch/arm/src/lpc17xx/lpc17_emacram.h @@ -42,8 +42,8 @@ #include #include "chip.h" -#include "chip/lpc17_ethernet.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_ethernet.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_emc.c b/arch/arm/src/lpc17xx/lpc17_emc.c index c2701947e6..ca24d060bd 100644 --- a/arch/arm/src/lpc17xx/lpc17_emc.c +++ b/arch/arm/src/lpc17xx/lpc17_emc.c @@ -45,7 +45,7 @@ #include "up_arch.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_emc.h" diff --git a/arch/arm/src/lpc17xx/lpc17_emc.h b/arch/arm/src/lpc17xx/lpc17_emc.h index b5a9010038..4b020762fe 100644 --- a/arch/arm/src/lpc17xx/lpc17_emc.h +++ b/arch/arm/src/lpc17xx/lpc17_emc.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/lpc17_emc.h" +#include "hardware/lpc17_emc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 983b249743..de08bb75cd 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -65,7 +65,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_ethernet.h" #include "lpc17_emacram.h" diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.h b/arch/arm/src/lpc17xx/lpc17_ethernet.h index 77ce1cc0f4..9aebf2d7e7 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.h +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_ethernet.h" +#include "hardware/lpc17_ethernet.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_gpdma.c b/arch/arm/src/lpc17xx/lpc17_gpdma.c index 19b828edc0..9de5338a86 100644 --- a/arch/arm/src/lpc17xx/lpc17_gpdma.c +++ b/arch/arm/src/lpc17xx/lpc17_gpdma.c @@ -55,7 +55,7 @@ #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpdma.h" #ifdef CONFIG_LPC17_GPDMA diff --git a/arch/arm/src/lpc17xx/lpc17_gpdma.h b/arch/arm/src/lpc17xx/lpc17_gpdma.h index 7953bda182..3c93379a9d 100644 --- a/arch/arm/src/lpc17xx/lpc17_gpdma.h +++ b/arch/arm/src/lpc17xx/lpc17_gpdma.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/lpc17_gpdma.h" +#include "hardware/lpc17_gpdma.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_gpio.h b/arch/arm/src/lpc17xx/lpc17_gpio.h index 6aab5b9f84..b794c3055b 100644 --- a/arch/arm/src/lpc17xx/lpc17_gpio.h +++ b/arch/arm/src/lpc17xx/lpc17_gpio.h @@ -49,9 +49,9 @@ #include -#include "chip/lpc17_gpio.h" -#include "chip/lpc17_pinconn.h" -#include "chip/lpc17_pinconfig.h" +#include "hardware/lpc17_gpio.h" +#include "hardware/lpc17_pinconn.h" +#include "hardware/lpc17_pinconfig.h" /* Include the GPIO definitions for the selected LPC17xx family. */ diff --git a/arch/arm/src/lpc17xx/lpc17_i2c.c b/arch/arm/src/lpc17xx/lpc17_i2c.c index 522afae683..d89c2c7f60 100644 --- a/arch/arm/src/lpc17xx/lpc17_i2c.c +++ b/arch/arm/src/lpc17xx/lpc17_i2c.c @@ -70,7 +70,7 @@ #include "up_internal.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_i2c.h" diff --git a/arch/arm/src/lpc17xx/lpc17_i2c.h b/arch/arm/src/lpc17xx/lpc17_i2c.h index 044f0560c7..3595c880db 100644 --- a/arch/arm/src/lpc17xx/lpc17_i2c.h +++ b/arch/arm/src/lpc17xx/lpc17_i2c.h @@ -42,7 +42,7 @@ #include #include -#include "chip/lpc17_i2c.h" +#include "hardware/lpc17_i2c.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/lpc17xx/lpc17_i2s.h b/arch/arm/src/lpc17xx/lpc17_i2s.h index f6cbe06775..49a02dbec5 100644 --- a/arch/arm/src/lpc17xx/lpc17_i2s.h +++ b/arch/arm/src/lpc17xx/lpc17_i2s.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "chip/lpc17_i2s.h" +#include "hardware/lpc17_i2s.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.c b/arch/arm/src/lpc17xx/lpc17_lcd.c index e7aebe109f..9894e05f6c 100644 --- a/arch/arm/src/lpc17xx/lpc17_lcd.c +++ b/arch/arm/src/lpc17xx/lpc17_lcd.c @@ -48,7 +48,7 @@ #include #include "up_arch.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_lcd.h" diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.h b/arch/arm/src/lpc17xx/lpc17_lcd.h index 99daa20069..103cf81bca 100644 --- a/arch/arm/src/lpc17xx/lpc17_lcd.h +++ b/arch/arm/src/lpc17xx/lpc17_lcd.h @@ -46,7 +46,7 @@ #include -#include "chip/lpc17_lcd.h" +#include "hardware/lpc17_lcd.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_lowputc.c b/arch/arm/src/lpc17xx/lpc17_lowputc.c index 8f163f3440..7970940f90 100644 --- a/arch/arm/src/lpc17xx/lpc17_lowputc.c +++ b/arch/arm/src/lpc17xx/lpc17_lowputc.c @@ -47,8 +47,8 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/lpc17_syscon.h" -#include "chip/lpc17_uart.h" +#include "hardware/lpc17_syscon.h" +#include "hardware/lpc17_uart.h" #include "lpc17_gpio.h" #include "lpc17_lowputc.h" diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c index c076a10ce5..997a1b46fa 100644 --- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c +++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c @@ -54,9 +54,9 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_pwm.h" -#include "chip/lpc176x_pinconfig.h" +#include "hardware/lpc176x_pinconfig.h" #include "lpc17_gpio.h" #include "lpc176x_gpio.h" diff --git a/arch/arm/src/lpc17xx/lpc17_ohciram.h b/arch/arm/src/lpc17xx/lpc17_ohciram.h index 2c0bcdcaf0..7aa894c8e0 100644 --- a/arch/arm/src/lpc17xx/lpc17_ohciram.h +++ b/arch/arm/src/lpc17xx/lpc17_ohciram.h @@ -42,7 +42,7 @@ #include #include "chip.h" -#include "chip/lpc17_memorymap.h" +#include "hardware/lpc17_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c index f28c099626..dbbc8de2cd 100644 --- a/arch/arm/src/lpc17xx/lpc17_pwm.c +++ b/arch/arm/src/lpc17xx/lpc17_pwm.c @@ -54,9 +54,9 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_pwm.h" -#include "chip/lpc176x_pinconfig.h" +#include "hardware/lpc176x_pinconfig.h" #include "lpc17_gpio.h" #include "lpc176x_gpio.h" diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.h b/arch/arm/src/lpc17xx/lpc17_pwm.h index f0f26cea09..34fba32bdd 100644 --- a/arch/arm/src/lpc17xx/lpc17_pwm.h +++ b/arch/arm/src/lpc17xx/lpc17_pwm.h @@ -41,8 +41,8 @@ ************************************************************************************/ #include -#include "chip/lpc17_pwm.h" -#include "chip/lpc17_mcpwm.h" +#include "hardware/lpc17_pwm.h" +#include "hardware/lpc17_mcpwm.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_qei.h b/arch/arm/src/lpc17xx/lpc17_qei.h index e2515b1028..dfa01ff3ff 100644 --- a/arch/arm/src/lpc17xx/lpc17_qei.h +++ b/arch/arm/src/lpc17xx/lpc17_qei.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_qei.h" +#include "hardware/lpc17_qei.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_rit.h b/arch/arm/src/lpc17xx/lpc17_rit.h index 4c0949a467..99611ca5a3 100644 --- a/arch/arm/src/lpc17xx/lpc17_rit.h +++ b/arch/arm/src/lpc17xx/lpc17_rit.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_rit.h" +#include "hardware/lpc17_rit.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_rtc.h b/arch/arm/src/lpc17xx/lpc17_rtc.h index 1ee2ea91b2..80523759b6 100644 --- a/arch/arm/src/lpc17xx/lpc17_rtc.h +++ b/arch/arm/src/lpc17xx/lpc17_rtc.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_rtc.h" +#include "hardware/lpc17_rtc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c index 1d21e582c5..04e48c44e0 100644 --- a/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -65,8 +65,8 @@ #include "lpc17_gpio.h" #include "lpc17_sdcard.h" -#include "chip/lpc17_syscon.h" -#include "chip/lpc17_pinconfig.h" +#include "hardware/lpc17_syscon.h" +#include "hardware/lpc17_pinconfig.h" #ifdef CONFIG_LPC17_SDCARD diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.h b/arch/arm/src/lpc17xx/lpc17_sdcard.h index 82f94264c7..1057bcb60d 100644 --- a/arch/arm/src/lpc17xx/lpc17_sdcard.h +++ b/arch/arm/src/lpc17xx/lpc17_sdcard.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/lpc17_sdcard.h" +#include "hardware/lpc17_sdcard.h" /************************************************************************************ * Public Functions diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c index 484356657f..cdd4ae29a9 100644 --- a/arch/arm/src/lpc17xx/lpc17_serial.c +++ b/arch/arm/src/lpc17xx/lpc17_serial.c @@ -62,7 +62,7 @@ #include "up_internal.h" #include "chip.h" -#include "chip/lpc17_uart.h" +#include "hardware/lpc17_uart.h" #include "lpc17_gpio.h" #include "lpc17_serial.h" diff --git a/arch/arm/src/lpc17xx/lpc17_serial.h b/arch/arm/src/lpc17xx/lpc17_serial.h index 3db62f7f8a..9e0205182b 100644 --- a/arch/arm/src/lpc17xx/lpc17_serial.h +++ b/arch/arm/src/lpc17xx/lpc17_serial.h @@ -43,8 +43,8 @@ #include #include -#include "chip/lpc17_uart.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_uart.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c index f653df2d36..c75a57fa80 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.c +++ b/arch/arm/src/lpc17xx/lpc17_spi.c @@ -56,7 +56,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_spi.h" diff --git a/arch/arm/src/lpc17xx/lpc17_spi.h b/arch/arm/src/lpc17xx/lpc17_spi.h index f0be0e9978..c807b88a53 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.h +++ b/arch/arm/src/lpc17xx/lpc17_spi.h @@ -44,7 +44,7 @@ #include -#include "chip/lpc17_spi.h" +#include "hardware/lpc17_spi.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c index af8fb4bc42..477572c869 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -55,7 +55,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_ssp.h" diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.h b/arch/arm/src/lpc17xx/lpc17_ssp.h index dd8ba3c766..d08e1b8d17 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.h +++ b/arch/arm/src/lpc17xx/lpc17_ssp.h @@ -44,7 +44,7 @@ #include -#include "chip/lpc17_ssp.h" +#include "hardware/lpc17_ssp.h" #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c index 8540d1b386..ea780238f7 100644 --- a/arch/arm/src/lpc17xx/lpc17_timer.c +++ b/arch/arm/src/lpc17xx/lpc17_timer.c @@ -54,9 +54,9 @@ #include "up_arch.h" #include "chip.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_timer.h" -#include "chip/lpc176x_pinconfig.h" +#include "hardware/lpc176x_pinconfig.h" #include "lpc17_gpio.h" #include "lpc176x_gpio.h" diff --git a/arch/arm/src/lpc17xx/lpc17_timer.h b/arch/arm/src/lpc17xx/lpc17_timer.h index d548fada51..3f0e8af09a 100644 --- a/arch/arm/src/lpc17xx/lpc17_timer.h +++ b/arch/arm/src/lpc17xx/lpc17_timer.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_timer.h" +#include "hardware/lpc17_timer.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c index 778679ed5b..6bb27bc06c 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbdev.c +++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c @@ -60,8 +60,8 @@ #include "up_internal.h" #include "chip.h" -#include "chip/lpc17_usb.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_usb.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_gpdma.h" diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c index 6231c13ab5..e8954bbc68 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -66,8 +66,8 @@ #include "up_internal.h" #include "chip.h" -#include "chip/lpc17_usb.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_usb.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_gpio.h" #include "lpc17_ohciram.h" diff --git a/arch/arm/src/lpc17xx/lpc17_wdt.h b/arch/arm/src/lpc17xx/lpc17_wdt.h index b9ef49fc35..eb4d60834e 100644 --- a/arch/arm/src/lpc17xx/lpc17_wdt.h +++ b/arch/arm/src/lpc17xx/lpc17_wdt.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include "chip/lpc17_wdt.h" +#include "hardware/lpc17_wdt.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/open1788/src/lpc17_sdraminitialize.c b/configs/open1788/src/lpc17_sdraminitialize.c index e81cda735d..9a8c772223 100644 --- a/configs/open1788/src/lpc17_sdraminitialize.c +++ b/configs/open1788/src/lpc17_sdraminitialize.c @@ -47,7 +47,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/lpc17_syscon.h" +#include "hardware/lpc17_syscon.h" #include "lpc17_emc.h" #include "open1788.h"