diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index 43a20f38c6f..7746ee3c5ce 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -240,7 +240,7 @@

NuttX RTOS Porting Guide

-

Last Updated: February 18, 2019

+

Last Updated: May 25, 2019

@@ -488,7 +488,7 @@

Configuration Files. - The NuttX configuration consists of logic in processor architecture directories, chip/SoC directories, and board configuration directories. + The NuttX configuration consists of logic in processor architecture directories, chip/SoC directories, and board configuration directories. The complete configuration is specified by several settings in the NuttX configuration file.

@@ -5204,7 +5204,7 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len, The controller-specific, "upper half" touchscreen drivers reside in the directory drivers/input.
  • "Lower Half" Drivers. - Platform-specific touchscreen drivers reside in either: (1) The arch/<architecture>/src/<chip> directory for the processor architectures that have build in touchscreen controllers or (2) the configs/<board>/src/ directory for boards that use an external touchscreen controller chip. + Platform-specific touchscreen drivers reside in either: (1) The arch/<architecture>/src/<hardware> directory for the processor architectures that have build in touchscreen controllers or (2) the configs/<board>/src/ directory for boards that use an external touchscreen controller chip.
    • @@ -5229,7 +5229,7 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len, Common analog logic and share-able analog drivers reside in the drivers/analog/.
  • - Platform-specific drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> analog peripheral devices. + Platform-specific drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> analog peripheral devices.
    • @@ -5315,7 +5315,7 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len, The generic, "upper half" PWM driver resides at drivers/pwm.c.
  • "Lower Half" Drivers. - Platform-specific PWM drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> PWM peripheral devices. + Platform-specific PWM drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> PWM peripheral devices.
    • @@ -5346,7 +5346,7 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len, The generic, "upper half" CAN driver resides at drivers/can.c.
  • "Lower Half" Drivers. - Platform-specific CAN drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> CAN peripheral devices. + Platform-specific CAN drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> CAN peripheral devices.

    • @@ -5414,7 +5414,7 @@ for (i = 0; i <= nread - CAN_MSGLEN(0); i += msglen) The generic, "upper half" Quadrature Encoder driver resides at drivers/sensors/qencoder.c.

  • "Lower Half" Drivers. - Platform-specific Quadrature Encoder drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> Quadrature Encoder peripheral devices. + Platform-specific Quadrature Encoder drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> Quadrature Encoder peripheral devices.
    • @@ -5443,7 +5443,7 @@ for (i = 0; i <= nread - CAN_MSGLEN(0); i += msglen) The generic, "upper half" timer driver resides at drivers/timers/timer.c.
  • "Lower Half" Drivers. - Platform-specific timer drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> timer peripheral devices. + Platform-specific timer drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> timer peripheral devices.
    • @@ -5472,7 +5472,7 @@ for (i = 0; i <= nread - CAN_MSGLEN(0); i += msglen) The generic, "upper half" RTC driver resides at drivers/timers/rtc.c.
  • "Lower Half" Drivers. - Platform-specific RTC drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> RTC peripheral devices. + Platform-specific RTC drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> RTC peripheral devices.
    • @@ -5501,7 +5501,7 @@ for (i = 0; i <= nread - CAN_MSGLEN(0); i += msglen) The generic, "upper half" watchdog timer driver resides at drivers/timers/watchdog.c.
  • "Lower Half" Drivers. - Platform-specific watchdog timer drivers reside in arch/<architecture>/src/<chip> directory for the specific processor <architecture> and for the specific <chip> watchdog timer peripheral devices. + Platform-specific watchdog timer drivers reside in arch/<architecture>/src/<hardware> directory for the specific processor <architecture> and for the specific <chip> watchdog timer peripheral devices.
    • diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c index 46c23a53419..67c86deb2aa 100644 --- a/arch/arm/src/stm32/stm32_dma2d.c +++ b/arch/arm/src/stm32/stm32_dma2d.c @@ -60,7 +60,7 @@ #include "stm32.h" #include "hardware/stm32_ltdc.h" #include "hardware/stm32_dma2d.h" -#include "hardware/stm32_ccm.h" +#include "stm32_ccm.h" #include "stm32_dma2d.h" /**************************************************************************** diff --git a/arch/avr/src/xmega/chip/xmegac_memorymap.h b/arch/avr/src/xmega/hardware/xmegac_memorymap.h similarity index 96% rename from arch/avr/src/xmega/chip/xmegac_memorymap.h rename to arch/avr/src/xmega/hardware/xmegac_memorymap.h index 0a015c0a5a8..5cac21bc5da 100644 --- a/arch/avr/src/xmega/chip/xmegac_memorymap.h +++ b/arch/avr/src/xmega/hardware/xmegac_memorymap.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/avr/src/xmega/chip/xmegac_memorymap.h + * arch/avr/src/xmega/hardware/xmegac_memorymap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_AVR_SRC_XMEGA_CHIP_XMEGAC_MEMORYMAP_H -#define __ARCH_AVR_SRC_XMEGA_CHIP_XMEGAC_MEMORYMAP_H +#ifndef __ARCH_AVR_SRC_XMEGA_HARDWARE_XMEGAC_MEMORYMAP_H +#define __ARCH_AVR_SRC_XMEGA_HARDWARE_XMEGAC_MEMORYMAP_H /**************************************************************************** * Included Files @@ -102,4 +102,4 @@ #define XMEGA_TCF0_BASE 0x0b00 /* Timer/Counter 0 on port F */ #define XMEGA_USARTF0_BASE 0x0ba0 /* USART 0 on port F */ -#endif /* __ARCH_AVR_SRC_XMEGA_CHIP_XMEGAC_MEMORYMAP_H */ +#endif /* __ARCH_AVR_SRC_XMEGA_HARDWARE_XMEGAC_MEMORYMAP_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-dma.h b/arch/mips/src/pic32mz/hardware/pic32mz-dma.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mz-dma.h rename to arch/mips/src/pic32mz/hardware/pic32mz-dma.h index cc6367b7532..76095ca8ba7 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-dma.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-dma.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/pic32mz/pic32mz-dma.h + * arch/mips/src/pic32mz/hardware/pic32mz-dma.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_DMA_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_DMA_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_DMA_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_DMA_H /******************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include -#include "chip/pic32mz-memorymap.h" +#include "hardware/pic32mz-memorymap.h" #if CHIP_NDMACH > 0 @@ -797,4 +797,4 @@ extern "C" #endif /* __ASSEMBLY__ */ #endif /* CHIP_NDMACH > 0 */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_DMA_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_DMA_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-ethernet.h b/arch/mips/src/pic32mz/hardware/pic32mz-ethernet.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mz-ethernet.h rename to arch/mips/src/pic32mz/hardware/pic32mz-ethernet.h index ae0836589b7..0b497a991cb 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-ethernet.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-ethernet.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/mips/src/pic32mz/chip/pic32mz-ethernet.h + * arch/mips/src/pic32mz/hardware/pic32mz-ethernet.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_ETHERNET_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_ETHERNET_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_ETHERNET_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_ETHERNET_H /**************************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include -#include "chip/pic32mz-memorymap.h" +#include "hardware/pic32mz-memorymap.h" #if CHIP_NETHERNET > 0 @@ -998,4 +998,4 @@ extern "C" #endif /* __ASSEMBLY__ */ #endif /* CHIP_NETHERNET > 0 */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_ETHERNET_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_ETHERNET_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-features.h b/arch/mips/src/pic32mz/hardware/pic32mz-features.h similarity index 86% rename from arch/mips/src/pic32mz/chip/pic32mz-features.h rename to arch/mips/src/pic32mz/hardware/pic32mz-features.h index 6e80282a395..96bb7d62189 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-features.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-features.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/chip/pic32mz-features.h + * arch/mips/src/pic32mz/hardware/pic32mz-features.h * * Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_FEATURES_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_FEATURES_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_FEATURES_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_FEATURES_H /************************************************************************************ * Included Files @@ -43,11 +43,11 @@ #include #if defined(CONFIG_ARCH_CHIP_PIC32MZEC) -# include +# include "hardware/pic32mzec-features.h" #elif defined(CONFIG_ARCH_CHIP_PIC32MZEF) -# include +# include "hardware/pic32mzef-features.h" #else # error Unknown PIC32MZ family #endif -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_FEATURES_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_FEATURES_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-i2c.h b/arch/mips/src/pic32mz/hardware/pic32mz-i2c.h similarity index 98% rename from arch/mips/src/pic32mz/chip/pic32mz-i2c.h rename to arch/mips/src/pic32mz/hardware/pic32mz-i2c.h index ee064a466e4..d59c6c9ec2d 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-i2c.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-i2c.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/pic32mz-i2c.h + * arch/mips/src/pic32mz/hardware/pic32mz-i2c.h * * Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_I2C_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_I2C_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_I2C_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_I2C_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include -#include "chip/pic32mz-memorymap.h" +#include "hardware/pic32mz-memorymap.h" #if CHIP_NI2C > 0 @@ -371,4 +371,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_I2C_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_I2C_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-int.h b/arch/mips/src/pic32mz/hardware/pic32mz-int.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mz-int.h rename to arch/mips/src/pic32mz/hardware/pic32mz-int.h index 9c07b5f6baa..51e655e9834 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-int.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-int.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/mips/src/pic32mz/pic32mz-int.h + * arch/mips/src/pic32mz/hardware/pic32mz-int.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_INT_H -#define __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_INT_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_INT_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_INT_H /**************************************************************************** * Included Files @@ -1260,4 +1260,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_INT_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_INT_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-ioport.h b/arch/mips/src/pic32mz/hardware/pic32mz-ioport.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mz-ioport.h rename to arch/mips/src/pic32mz/hardware/pic32mz-ioport.h index 8e590a3c806..60adef40fa4 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-ioport.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-ioport.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/pic32mz/pic32mz-ioport.h + * arch/mips/src/pic32mz/hardware/pic32mz-ioport.h * * Copyright (C) 2015, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_IOPORT_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_IOPORT_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_IOPORT_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_IOPORT_H /******************************************************************************************** * Included Files @@ -906,4 +906,4 @@ extern "C" #endif /* __ASSEMBLY__ */ #endif /* CHIP_NPORTS > 0 */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_IOPORT_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_IOPORT_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-memorymap.h b/arch/mips/src/pic32mz/hardware/pic32mz-memorymap.h similarity index 86% rename from arch/mips/src/pic32mz/chip/pic32mz-memorymap.h rename to arch/mips/src/pic32mz/hardware/pic32mz-memorymap.h index cb50d344347..6ccfd667222 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-memorymap.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/chip/pic32mz-memorymap.h + * arch/mips/src/pic32mz/hardware/pic32mz-memorymap.h * * Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_MEMORYMAP_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_MEMORYMAP_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_MEMORYMAP_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_MEMORYMAP_H /************************************************************************************ * Included Files @@ -43,11 +43,11 @@ #include #if defined(CONFIG_ARCH_CHIP_PIC32MZEC) -# include "chip/pic32mzec-memorymap.h" +# include "hardware/pic32mzec-memorymap.h" #elif defined(CONFIG_ARCH_CHIP_PIC32MZEF) -# include "chip/pic32mzef-memorymap.h" +# include "hardware/pic32mzef-memorymap.h" #else # error Unknown PIC32MZ family #endif -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_MEMORYMAP_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_MEMORYMAP_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-osc.h b/arch/mips/src/pic32mz/hardware/pic32mz-osc.h similarity index 98% rename from arch/mips/src/pic32mz/chip/pic32mz-osc.h rename to arch/mips/src/pic32mz/hardware/pic32mz-osc.h index 7e5668d90f4..bffe84c93e3 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-osc.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-osc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/mips/src/pic32mz/chip/pic32mz-osc.h + * arch/mips/src/pic32mz/hardware/pic32mz-osc.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_OSC_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_OSC_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_OSC_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_OSC_H /**************************************************************************** * Included Files @@ -231,4 +231,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_OSC_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_OSC_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-pps.h b/arch/mips/src/pic32mz/hardware/pic32mz-pps.h similarity index 94% rename from arch/mips/src/pic32mz/chip/pic32mz-pps.h rename to arch/mips/src/pic32mz/hardware/pic32mz-pps.h index c59ebab6df1..d20815ba1be 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-pps.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-pps.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/pic32mz/pic32mz-pps.h + * arch/mips/src/pic32mz/hardware/pic32mz-pps.h * * Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_PPS_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_PPS_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_PPS_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_PPS_H /******************************************************************************************** * Included Files @@ -50,9 +50,9 @@ /* Depends on the peripherals supported by the particular device */ #if defined(CONFIG_ARCH_CHIP_PIC32MZEC) -# include "chip/pic32mzec-pps.h" +# include "hardware/pic32mzec-pps.h" #elif defined(CONFIG_ARCH_CHIP_PIC32MZEF) -# include "chip/pic32mzef-pps.h" +# include "hardware/pic32mzef-pps.h" #else # error Unknown PIC32MZ family #endif @@ -114,4 +114,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_PPS_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_PPS_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-prefetch.h b/arch/mips/src/pic32mz/hardware/pic32mz-prefetch.h similarity index 94% rename from arch/mips/src/pic32mz/chip/pic32mz-prefetch.h rename to arch/mips/src/pic32mz/hardware/pic32mz-prefetch.h index 1279451c7aa..5d3f380b0c0 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-prefetch.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-prefetch.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/pic32mz/chip/pic32mz-prefetch.h + * arch/mips/src/pic32mz/hardware/pic32mz-prefetch.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_PREFETCH_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_PREFETCH_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_PREFETCH_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_PREFETCH_H /******************************************************************************************** * Included Files @@ -79,4 +79,4 @@ #define PRESTAT_PFMSEC (1 << 26) /* Bit 26: Flash Single-bit Error Corrected Status */ #define PRESTAT_PFMDED (1 << 27) /* Bit 27: Flash Double-bit Error Detected Status */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_PREFETCH_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_PREFETCH_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-spi.h b/arch/mips/src/pic32mz/hardware/pic32mz-spi.h similarity index 98% rename from arch/mips/src/pic32mz/chip/pic32mz-spi.h rename to arch/mips/src/pic32mz/hardware/pic32mz-spi.h index c2359c0ae44..6939daba245 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-spi.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-spi.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/mips/src/pic32mz/chip/pic32mz-spi.h + * arch/mips/src/pic32mz/hardware/pic32mz-spi.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_SPI_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_SPI_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_SPI_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_SPI_H /**************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include -#include "chip/pic32mz-memorymap.h" +#include "hardware/pic32mz-memorymap.h" #if CHIP_NSPI > 0 @@ -329,4 +329,4 @@ extern "C" #endif /* __ASSEMBLY__ */ #endif /* CHIP_NSPI > 0 */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_SPI_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_SPI_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-timer.h b/arch/mips/src/pic32mz/hardware/pic32mz-timer.h similarity index 98% rename from arch/mips/src/pic32mz/chip/pic32mz-timer.h rename to arch/mips/src/pic32mz/hardware/pic32mz-timer.h index da54777ba9b..9350d0c3b6d 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-timer.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-timer.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/pic32mz-timer.h + * arch/mips/src/pic32mz/hardware/pic32mz-timer.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_TIMER_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_TIMER_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_TIMER_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_TIMER_H /************************************************************************************ * Included Files @@ -308,4 +308,4 @@ extern "C" #endif /* __ASSEMBLY__ */ #endif /* CHIP_NTIMERS > 0 */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZ_TIMER_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_TIMER_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mz-uart.h b/arch/mips/src/pic32mz/hardware/pic32mz-uart.h similarity index 98% rename from arch/mips/src/pic32mz/chip/pic32mz-uart.h rename to arch/mips/src/pic32mz/hardware/pic32mz-uart.h index 37affc2b89c..7f035e5668e 100644 --- a/arch/mips/src/pic32mz/chip/pic32mz-uart.h +++ b/arch/mips/src/pic32mz/hardware/pic32mz-uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic42mz/pic42mz-uart.h + * arch/mips/src/pic32mz/hardware/pic32mz-uart.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_CHIP_UART_H -#define __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_CHIP_UART_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_UART_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_UART_H /************************************************************************************ * Included Files @@ -43,7 +43,7 @@ #include #include -#include "chip/pic32mz-memorymap.h" +#include "hardware/pic32mz-memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -290,4 +290,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_CHIP_UART_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_UART_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mzec-features.h b/arch/mips/src/pic32mz/hardware/pic32mzec-features.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mzec-features.h rename to arch/mips/src/pic32mz/hardware/pic32mzec-features.h index 270f58d1768..a4b22dca37c 100644 --- a/arch/mips/src/pic32mz/chip/pic32mzec-features.h +++ b/arch/mips/src/pic32mz/hardware/pic32mzec-features.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/chip/pic32mzec-features.h + * arch/mips/src/pic32mz/hardware/pic32mzec-features.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_FEATURES_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_FEATURES_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_FEATURES_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_FEATURES_H /************************************************************************************ * Included Files @@ -511,4 +511,4 @@ /* Device Serial Number (Boot Flash PIC32MZ_DEVSN_K1BASE) */ /* Device serial number 0-1: 32-bit serial number data */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_FEATURES_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_FEATURES_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h b/arch/mips/src/pic32mz/hardware/pic32mzec-memorymap.h similarity index 97% rename from arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h rename to arch/mips/src/pic32mz/hardware/pic32mzec-memorymap.h index 54d95e49ba7..a72ef1a97ff 100644 --- a/arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h +++ b/arch/mips/src/pic32mz/hardware/pic32mzec-memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h + * arch/mips/src/pic32mz/hardware/pic32mzec-memorymap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_MEMORYMAP_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_MEMORYMAP_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_MEMORYMAP_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_MEMORYMAP_H /************************************************************************************ * Included Files @@ -146,4 +146,4 @@ #define PIC32MZ_SYSBUS_K1BASE (PIC32MZ_SFR_K1BASE + 0x000f0000) /* System Bus */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_MEMORYMAP_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_MEMORYMAP_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mzec-pps.h b/arch/mips/src/pic32mz/hardware/pic32mzec-pps.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mzec-pps.h rename to arch/mips/src/pic32mz/hardware/pic32mzec-pps.h index d8b3a12eed8..6c44ed9af1f 100644 --- a/arch/mips/src/pic32mz/chip/pic32mzec-pps.h +++ b/arch/mips/src/pic32mz/hardware/pic32mzec-pps.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/pic32mz/pic32mzec-pps.h + * arch/mips/src/pic32mz/hardware/pic32mzec-pps.h * * Copyright (C) 2015, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_PPS_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_PPS_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_PPS_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_PPS_H /******************************************************************************************** * Included Files @@ -1715,4 +1715,4 @@ #define U6TX_RPG6R 4, PIC32MZ_RPG6R #define U6TX_RPG9R 4, PIC32MZ_RPG9R -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_PPS_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEC_PPS_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mzef-features.h b/arch/mips/src/pic32mz/hardware/pic32mzef-features.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mzef-features.h rename to arch/mips/src/pic32mz/hardware/pic32mzef-features.h index 9a042287bf0..5d7fc8d524c 100644 --- a/arch/mips/src/pic32mz/chip/pic32mzef-features.h +++ b/arch/mips/src/pic32mz/hardware/pic32mzef-features.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/chip/pic32mzef-features.h + * arch/mips/src/pic32mz/hardware/pic32mzef-features.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_FEATURES_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_FEATURES_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_FEATURES_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_FEATURES_H /************************************************************************************ * Included Files @@ -537,4 +537,4 @@ /* Device Serial Number (Boot Flash PIC32MZ_DEVSN_K1BASE) */ /* Device serial number 0-1: 32-bit serial number data */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_FEATURES_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_FEATURES_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mzef-memorymap.h b/arch/mips/src/pic32mz/hardware/pic32mzef-memorymap.h similarity index 97% rename from arch/mips/src/pic32mz/chip/pic32mzef-memorymap.h rename to arch/mips/src/pic32mz/hardware/pic32mzef-memorymap.h index d54e7296bd5..0c407791e4c 100644 --- a/arch/mips/src/pic32mz/chip/pic32mzef-memorymap.h +++ b/arch/mips/src/pic32mz/hardware/pic32mzef-memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/mips/src/pic32mz/chip/pic32mzef-memorymap.h + * arch/mips/src/pic32mz/hardware/pic32mzef-memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_MEMORYMAP_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_MEMORYMAP_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_MEMORYMAP_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_MEMORYMAP_H /************************************************************************************ * Included Files @@ -144,4 +144,4 @@ #define PIC32MZ_SYSBUS_K1BASE (PIC32MZ_SFR_K1BASE + 0x000f0000) /* System Bus */ -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_MEMORYMAP_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_MEMORYMAP_H */ diff --git a/arch/mips/src/pic32mz/chip/pic32mzef-pps.h b/arch/mips/src/pic32mz/hardware/pic32mzef-pps.h similarity index 99% rename from arch/mips/src/pic32mz/chip/pic32mzef-pps.h rename to arch/mips/src/pic32mz/hardware/pic32mzef-pps.h index 89bc403f2bc..d26e24c844e 100644 --- a/arch/mips/src/pic32mz/chip/pic32mzef-pps.h +++ b/arch/mips/src/pic32mz/hardware/pic32mzef-pps.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/pic32mz/pic32mzef-pps.h + * arch/mips/src/pic32mz/hardware/pic32mzef-pps.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_PPS_H -#define __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_PPS_H +#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_PPS_H +#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_PPS_H /******************************************************************************************** * Included Files @@ -1716,4 +1716,4 @@ #define U6TX_RPG6R 4, PIC32MZ_RPG6R #define U6TX_RPG9R 4, PIC32MZ_RPG9R -#endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEF_PPS_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZEF_PPS_H */ diff --git a/arch/mips/src/pic32mz/pic32mz-decodeirq.c b/arch/mips/src/pic32mz/pic32mz-decodeirq.c index 14b980c3f56..a9e249be19e 100644 --- a/arch/mips/src/pic32mz/pic32mz-decodeirq.c +++ b/arch/mips/src/pic32mz/pic32mz-decodeirq.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/pic32mz-int.h" +#include "hardware/pic32mz-int.h" #include "group/group.h" diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index 866bf651e95..b9cecf62181 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -72,7 +72,7 @@ #include "up_internal.h" #include "pic32mz-config.h" -#include "chip/pic32mz-ethernet.h" +#include "hardware/pic32mz-ethernet.h" /* Does this chip have and Ethernet controller? */ diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c index 256010e910a..0c19918cf39 100644 --- a/arch/mips/src/pic32mz/pic32mz-exception.c +++ b/arch/mips/src/pic32mz/pic32mz-exception.c @@ -53,7 +53,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/pic32mz-int.h" +#include "hardware/pic32mz-int.h" /**************************************************************************** * Public Functions diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c index 466754fde23..7b12f0bcdd6 100644 --- a/arch/mips/src/pic32mz/pic32mz-gpio.c +++ b/arch/mips/src/pic32mz/pic32mz-gpio.c @@ -49,7 +49,7 @@ #include "up_arch.h" -#include "chip/pic32mz-ioport.h" +#include "hardware/pic32mz-ioport.h" #include "pic32mz-gpio.h" #if CHIP_NPORTS > 0 diff --git a/arch/mips/src/pic32mz/pic32mz-gpioirq.c b/arch/mips/src/pic32mz/pic32mz-gpioirq.c index 44911fd40b7..9d5b5f3ad23 100644 --- a/arch/mips/src/pic32mz/pic32mz-gpioirq.c +++ b/arch/mips/src/pic32mz/pic32mz-gpioirq.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/pic32mz-ioport.h" +#include "hardware/pic32mz-ioport.h" #include "pic32mz-gpio.h" #ifdef CONFIG_PIC32MZ_GPIOIRQ diff --git a/arch/mips/src/pic32mz/pic32mz-head.S b/arch/mips/src/pic32mz/pic32mz-head.S index 07cff97933c..424567074a7 100644 --- a/arch/mips/src/pic32mz/pic32mz-head.S +++ b/arch/mips/src/pic32mz/pic32mz-head.S @@ -43,7 +43,7 @@ #include #include "pic32mz-config.h" -#include "chip/pic32mz-features.h" +#include "hardware/pic32mz-features.h" #include "pic32mz-excptmacros.h" /**************************************************************************** diff --git a/arch/mips/src/pic32mz/pic32mz-i2c.c b/arch/mips/src/pic32mz/pic32mz-i2c.c index a03816053a5..195c840c38d 100644 --- a/arch/mips/src/pic32mz/pic32mz-i2c.c +++ b/arch/mips/src/pic32mz/pic32mz-i2c.c @@ -59,7 +59,7 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/pic32mz-i2c.h" +#include "hardware/pic32mz-i2c.h" #include "pic32mz-i2c.h" /* At least one I2C peripheral must be enabled */ diff --git a/arch/mips/src/pic32mz/pic32mz-irq.c b/arch/mips/src/pic32mz/pic32mz-irq.c index bb1fda5108e..9cceb5eac6f 100644 --- a/arch/mips/src/pic32mz/pic32mz-irq.c +++ b/arch/mips/src/pic32mz/pic32mz-irq.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/pic32mz-int.h" +#include "hardware/pic32mz-int.h" #include "pic32mz-gpio.h" /**************************************************************************** diff --git a/arch/mips/src/pic32mz/pic32mz-lowconsole.c b/arch/mips/src/pic32mz/pic32mz-lowconsole.c index d16e81631ab..ed582864c7a 100644 --- a/arch/mips/src/pic32mz/pic32mz-lowconsole.c +++ b/arch/mips/src/pic32mz/pic32mz-lowconsole.c @@ -48,8 +48,8 @@ #include "up_internal.h" #include "pic32mz-config.h" -#include "chip/pic32mz-uart.h" -#include "chip/pic32mz-pps.h" +#include "hardware/pic32mz-uart.h" +#include "hardware/pic32mz-pps.h" #include diff --git a/arch/mips/src/pic32mz/pic32mz-lowinit.c b/arch/mips/src/pic32mz/pic32mz-lowinit.c index 50306ca40c3..b74ce89fa3d 100644 --- a/arch/mips/src/pic32mz/pic32mz-lowinit.c +++ b/arch/mips/src/pic32mz/pic32mz-lowinit.c @@ -47,9 +47,9 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/pic32mz-features.h" -#include "chip/pic32mz-prefetch.h" -#include "chip/pic32mz-osc.h" +#include "hardware/pic32mz-features.h" +#include "hardware/pic32mz-prefetch.h" +#include "hardware/pic32mz-osc.h" #include "pic32mz-config.h" #include "pic32mz-lowconsole.h" diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c index e930232beaa..6728a3032b4 100644 --- a/arch/mips/src/pic32mz/pic32mz-serial.c +++ b/arch/mips/src/pic32mz/pic32mz-serial.c @@ -62,7 +62,7 @@ #include "up_internal.h" #include "pic32mz-config.h" -#include "chip/pic32mz-uart.h" +#include "hardware/pic32mz-uart.h" #include "pic32mz-lowconsole.h" /**************************************************************************** diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c index ea2f906cb91..58ca9f79fdb 100644 --- a/arch/mips/src/pic32mz/pic32mz-spi.c +++ b/arch/mips/src/pic32mz/pic32mz-spi.c @@ -54,8 +54,8 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/pic32mz-spi.h" -#include "chip/pic32mz-pps.h" +#include "hardware/pic32mz-spi.h" +#include "hardware/pic32mz-pps.h" #include "pic32mz-spi.h" #ifdef CONFIG_PIC32MZ_SPI diff --git a/arch/mips/src/pic32mz/pic32mz-timer.c b/arch/mips/src/pic32mz/pic32mz-timer.c index 8c814c2e97b..6ac854538cd 100644 --- a/arch/mips/src/pic32mz/pic32mz-timer.c +++ b/arch/mips/src/pic32mz/pic32mz-timer.c @@ -59,7 +59,7 @@ #include "up_internal.h" #include "up_arch.h" -#include "chip/pic32mz-timer.h" +#include "hardware/pic32mz-timer.h" #include "pic32mz-timer.h" #include "pic32mz-gpio.h" diff --git a/arch/mips/src/pic32mz/pic32mz-timerisr.c b/arch/mips/src/pic32mz/pic32mz-timerisr.c index 78e53ea89b8..6d93837453c 100644 --- a/arch/mips/src/pic32mz/pic32mz-timerisr.c +++ b/arch/mips/src/pic32mz/pic32mz-timerisr.c @@ -51,8 +51,8 @@ #include "up_arch.h" #include "pic32mz-config.h" -#include "chip/pic32mz-timer.h" -#include "chip/pic32mz-int.h" +#include "hardware/pic32mz-timer.h" +#include "hardware/pic32mz-int.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/or1k/src/mor1kx/chip/irq.h b/arch/or1k/src/mor1kx/hardware/irq.h similarity index 100% rename from arch/or1k/src/mor1kx/chip/irq.h rename to arch/or1k/src/mor1kx/hardware/irq.h diff --git a/arch/risc-v/src/nr5m100/chip.h b/arch/risc-v/src/nr5m100/chip.h index dbe9928c6f6..a9d670fcc10 100644 --- a/arch/risc-v/src/nr5m100/chip.h +++ b/arch/risc-v/src/nr5m100/chip.h @@ -45,7 +45,7 @@ #ifdef CONFIG_RV32IM_CMNVECTOR # if defined(CONFIG_NR5_NR5M1XX) -# include "chip/nr5m1xx_vectors.h" +# include "hardware/nr5m1xx_vectors.h" # else # error "No vector file for this NanoRisc5 family" # endif diff --git a/arch/risc-v/src/nr5m100/chip/nr5m1xx_epic.h b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_epic.h similarity index 97% rename from arch/risc-v/src/nr5m100/chip/nr5m1xx_epic.h rename to arch/risc-v/src/nr5m100/hardware/nr5m1xx_epic.h index 3fa13aed104..3aa3756f99a 100644 --- a/arch/risc-v/src/nr5m100/chip/nr5m1xx_epic.h +++ b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_epic.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/risc-v/src/nr5m100/chip/nr5_epic.h + * arch/risc-v/src/nr5m100/hardware/nr5_epic.h * * Copyright (C) 2016 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/arch/risc-v/src/nr5m100/chip/nr5m1xx_memorymap.h b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_memorymap.h similarity index 91% rename from arch/risc-v/src/nr5m100/chip/nr5m1xx_memorymap.h rename to arch/risc-v/src/nr5m100/hardware/nr5m1xx_memorymap.h index 4ebc6879d13..bffc90d426f 100644 --- a/arch/risc-v/src/nr5m100/chip/nr5m1xx_memorymap.h +++ b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/risc-v/src/nr5m100/chip/nr5m1xx_memorymap.h + * arch/risc-v/src/nr5m100/hardware/nr5m1xx_memorymap.h * * Copyright (C) 2016 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -30,8 +30,8 @@ * ************************************************************************************/ -#ifndef __ARCH_RISCV_SRC_NR5M100_CHIP_NR5M1XX_MEMORYMAP_H -#define __ARCH_RISCV_SRC_NR5M100_CHIP_NR5M1XX_MEMORYMAP_H +#ifndef __ARCH_RISCV_SRC_NR5M100_HARDWARE_NR5M1XX_MEMORYMAP_H +#define __ARCH_RISCV_SRC_NR5M100_HARDWARE_NR5M1XX_MEMORYMAP_H /************************************************************************************ * Pre-processor Definitions @@ -53,5 +53,5 @@ #define NR5_TIMER2_BASE 0x40005000 /* 0x40005000 - 0x40005fff: TIMER1 timer */ #define NR5_EXTMEM_BASE 0x40006000 /* 0x40006000 - 0x40006fff: EXTMEM Controller*/ -#endif /* __ARCH_RISCV_SRC_NR5M100_CHIP_NR5M1XX_MEMORYMAP_H */ +#endif /* __ARCH_RISCV_SRC_NR5M100_HARDWARE_NR5M1XX_MEMORYMAP_H */ diff --git a/arch/risc-v/src/nr5m100/chip/nr5m1xx_timer.h b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_timer.h similarity index 99% rename from arch/risc-v/src/nr5m100/chip/nr5m1xx_timer.h rename to arch/risc-v/src/nr5m100/hardware/nr5m1xx_timer.h index 98ea8aa8035..5884c2c303d 100644 --- a/arch/risc-v/src/nr5m100/chip/nr5m1xx_timer.h +++ b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_timer.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/risc-v/src/nr5m100/chip/nr5_timer.h + * arch/risc-v/src/nr5m100/hardware/nr5_timer.h * * Copyright (C) 2016 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/arch/risc-v/src/nr5m100/chip/nr5m1xx_uart.h b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_uart.h similarity index 98% rename from arch/risc-v/src/nr5m100/chip/nr5m1xx_uart.h rename to arch/risc-v/src/nr5m100/hardware/nr5m1xx_uart.h index 215f8916fee..ba9b7286525 100644 --- a/arch/risc-v/src/nr5m100/chip/nr5m1xx_uart.h +++ b/arch/risc-v/src/nr5m100/hardware/nr5m1xx_uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/risc-v/src/nr5m100/chip/nr5_uart.h + * arch/risc-v/src/nr5m100/hardware/nr5_uart.h * * Copyright (C) 2016 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/arch/risc-v/src/nr5m100/nr5_csr.h b/arch/risc-v/src/nr5m100/nr5_csr.h index 025a5098865..ddd6e8b046b 100644 --- a/arch/risc-v/src/nr5m100/nr5_csr.h +++ b/arch/risc-v/src/nr5m100/nr5_csr.h @@ -47,7 +47,7 @@ #endif #if defined(CONFIG_NR5_NR5M1XX) -# include "chip/nr5m1xx_epic.h" +# include "hardware/nr5m1xx_epic.h" #endif #include diff --git a/arch/risc-v/src/nr5m100/nr5_memorymap.h b/arch/risc-v/src/nr5m100/nr5_memorymap.h index 8ebcfedd685..b8aaeca62b4 100644 --- a/arch/risc-v/src/nr5m100/nr5_memorymap.h +++ b/arch/risc-v/src/nr5m100/nr5_memorymap.h @@ -36,7 +36,7 @@ //#include #ifdef CONFIG_NR5_NR5MXXX -#include "chip/nr5m1xx_memorymap.h" +#include "hardware/nr5m1xx_memorymap.h" #endif #endif /* _ARCH_RISCV_SRC_NR5M100_NR5_MEMORYMAP_H */ diff --git a/arch/risc-v/src/nr5m100/nr5_timer.h b/arch/risc-v/src/nr5m100/nr5_timer.h index 5994df9bee1..8bd36aec330 100644 --- a/arch/risc-v/src/nr5m100/nr5_timer.h +++ b/arch/risc-v/src/nr5m100/nr5_timer.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/nr5m1xx_timer.h" +#include "hardware/nr5m1xx_timer.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/risc-v/src/nr5m100/nr5_uart.h b/arch/risc-v/src/nr5m100/nr5_uart.h index 7f40dfc0ab3..7fe20348c43 100644 --- a/arch/risc-v/src/nr5m100/nr5_uart.h +++ b/arch/risc-v/src/nr5m100/nr5_uart.h @@ -36,7 +36,7 @@ #include #ifdef CONFIG_NR5_NR5M1XX -#include "chip/nr5m1xx_uart.h" +#include "hardware/nr5m1xx_uart.h" #endif void nr5_uart_init(int uart_num); diff --git a/arch/xtensa/src/esp32/esp32_cpuint.c b/arch/xtensa/src/esp32/esp32_cpuint.c index 8d43741ac03..fa2a7ee31d2 100644 --- a/arch/xtensa/src/esp32/esp32_cpuint.c +++ b/arch/xtensa/src/esp32/esp32_cpuint.c @@ -49,7 +49,7 @@ #include #include -#include "chip/esp32_dport.h" +#include "hardware/esp32_dport.h" #include "esp32_cpuint.h" #include "xtensa.h" diff --git a/arch/xtensa/src/esp32/esp32_cpustart.c b/arch/xtensa/src/esp32/esp32_cpustart.c index e79e7c3345b..cb233d29b85 100644 --- a/arch/xtensa/src/esp32/esp32_cpustart.c +++ b/arch/xtensa/src/esp32/esp32_cpustart.c @@ -51,8 +51,8 @@ #include "sched/sched.h" #include "xtensa.h" -#include "chip/esp32_dport.h" -#include "chip/esp32_rtccntl.h" +#include "hardware/esp32_dport.h" +#include "hardware/esp32_rtccntl.h" #include "esp32_region.h" #include "esp32_cpuint.h" #include "esp32_smp.h" diff --git a/arch/xtensa/src/esp32/esp32_gpio.c b/arch/xtensa/src/esp32/esp32_gpio.c index 15e431973da..d83eb2e63e2 100644 --- a/arch/xtensa/src/esp32/esp32_gpio.c +++ b/arch/xtensa/src/esp32/esp32_gpio.c @@ -39,8 +39,8 @@ #include #include "xtensa.h" -#include "chip/esp32_iomux.h" -#include "chip/esp32_gpio.h" +#include "hardware/esp32_iomux.h" +#include "hardware/esp32_gpio.h" #include "esp32_cpuint.h" #include "esp32_gpio.h" diff --git a/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c b/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c index ce27269f213..eade8e5ff4c 100644 --- a/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c +++ b/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c @@ -47,7 +47,7 @@ #include #include -#include "chip/esp32_dport.h" +#include "hardware/esp32_dport.h" #include "xtensa.h" #ifdef CONFIG_SMP diff --git a/arch/xtensa/src/esp32/esp32_serial.c b/arch/xtensa/src/esp32/esp32_serial.c index 7a4c5accf51..4c27dee8ee8 100644 --- a/arch/xtensa/src/esp32/esp32_serial.c +++ b/arch/xtensa/src/esp32/esp32_serial.c @@ -60,10 +60,10 @@ #include #include "xtensa.h" -#include "chip/esp32_soc.h" -#include "chip/esp32_iomux.h" -#include "chip/esp32_gpio_sigmap.h" -#include "chip/esp32_uart.h" +#include "hardware/esp32_soc.h" +#include "hardware/esp32_iomux.h" +#include "hardware/esp32_gpio_sigmap.h" +#include "hardware/esp32_uart.h" #include "rom/esp32_gpio.h" #include "esp32_config.h" #include "esp32_gpio.h" diff --git a/arch/xtensa/src/esp32/esp32_start.c b/arch/xtensa/src/esp32/esp32_start.c index 4f3e9e77032..8cca41fa320 100644 --- a/arch/xtensa/src/esp32/esp32_start.c +++ b/arch/xtensa/src/esp32/esp32_start.c @@ -38,8 +38,8 @@ #include "xtensa.h" #include "xtensa_attr.h" -#include "chip/esp32_dport.h" -#include "chip/esp32_rtccntl.h" +#include "hardware/esp32_dport.h" +#include "hardware/esp32_rtccntl.h" #include "esp32_clockconfig.h" #include "esp32_region.h" #include "esp32_start.h" diff --git a/arch/xtensa/src/esp32/chip/esp32_dport.h b/arch/xtensa/src/esp32/hardware/esp32_dport.h similarity index 99% rename from arch/xtensa/src/esp32/chip/esp32_dport.h rename to arch/xtensa/src/esp32/hardware/esp32_dport.h index 6175b29f0d3..b242c476c89 100644 --- a/arch/xtensa/src/esp32/chip/esp32_dport.h +++ b/arch/xtensa/src/esp32/hardware/esp32_dport.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/chip/esp32_dport.h + * arch/xtensa/src/esp32/hardware/esp32_dport.h * * Adapted from use in NuttX by: * @@ -24,14 +24,14 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_DPORT_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_DPORT_H +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_DPORT_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_DPORT_H /**************************************************************************** * Included Files ****************************************************************************/ -#include "chip/esp32_soc.h" +#include "hardware/esp32_soc.h" /**************************************************************************** * Pre-processor Definitions @@ -4859,4 +4859,5 @@ #define DPORT_DATE_S 0 #define DPORT_DPORT_DATE_VERSION 0x1605190 -#endif /*__ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_DPORT_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_DPORT_H */ + diff --git a/arch/xtensa/src/esp32/chip/esp32_gpio.h b/arch/xtensa/src/esp32/hardware/esp32_gpio.h similarity index 99% rename from arch/xtensa/src/esp32/chip/esp32_gpio.h rename to arch/xtensa/src/esp32/hardware/esp32_gpio.h index 17cc102ed4a..a69b38ba707 100644 --- a/arch/xtensa/src/esp32/chip/esp32_gpio.h +++ b/arch/xtensa/src/esp32/hardware/esp32_gpio.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/chip/esp32_gpio.h + * arch/xtensa/src/esp32/hardware/esp32_gpio.h * * Adapted from use in NuttX by: * @@ -24,14 +24,14 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_GPIO_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_GPIO_H +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_H /**************************************************************************** * Included Files ****************************************************************************/ -#include "chip/esp32_soc.h" +#include "hardware/esp32_soc.h" /**************************************************************************** * Pre-preprocessor Definitions @@ -11640,4 +11640,4 @@ #define GPIO_FUNC39_OUT_SEL_V 0x1FF #define GPIO_FUNC39_OUT_SEL_S 0 -#endif /* __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_GPIO_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_H */ diff --git a/arch/xtensa/src/esp32/chip/esp32_gpio_sigmap.h b/arch/xtensa/src/esp32/hardware/esp32_gpio_sigmap.h similarity index 98% rename from arch/xtensa/src/esp32/chip/esp32_gpio_sigmap.h rename to arch/xtensa/src/esp32/hardware/esp32_gpio_sigmap.h index f6a6ce7ba88..0999451f13e 100644 --- a/arch/xtensa/src/esp32/chip/esp32_gpio_sigmap.h +++ b/arch/xtensa/src/esp32/hardware/esp32_gpio_sigmap.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/chip/esp32_gpio_sigmap.h + * arch/xtensa/src/esp32/hardware/esp32_gpio_sigmap.h * * Adapted from use in NuttX by: * @@ -24,8 +24,8 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_GPIO_SIGMAP_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_GPIO_SIGMAP_H +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_SIGMAP_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_SIGMAP_H /**************************************************************************** * Pre-processor Definitions @@ -436,4 +436,4 @@ #define SIG_IN_FUNC227_IDX 227 #define SIG_IN_FUNC228_IDX 228 -#endif /* __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_GPIO_SIGMAP_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_SIGMAP_H */ diff --git a/arch/xtensa/src/esp32/chip/esp32_iomux.h b/arch/xtensa/src/esp32/hardware/esp32_iomux.h similarity index 97% rename from arch/xtensa/src/esp32/chip/esp32_iomux.h rename to arch/xtensa/src/esp32/hardware/esp32_iomux.h index f424fae1e2f..a741eb4b983 100644 --- a/arch/xtensa/src/esp32/chip/esp32_iomux.h +++ b/arch/xtensa/src/esp32/hardware/esp32_iomux.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/esp32_gpio.c + * arch/xtensa/src/esp32/hardware/esp32_gpio.c * * Developed for NuttX by: * @@ -24,14 +24,14 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_MUX_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_MUX_H 1 +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_MUX_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_MUX_H 1 /**************************************************************************** * Included Files ****************************************************************************/ -#include "chip/esp32_soc.h" +#include "hardware/esp32_soc.h" /**************************************************************************** * Pre-processor Definitions @@ -285,4 +285,4 @@ #define FUNC_GPIO39_GPIO39 2 #define FUNC_GPIO39_GPIO39_0 0 -#endif /* __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_MUX_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_MUX_H */ diff --git a/arch/xtensa/src/esp32/chip/esp32_rtccntl.h b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h similarity index 99% rename from arch/xtensa/src/esp32/chip/esp32_rtccntl.h rename to arch/xtensa/src/esp32/hardware/esp32_rtccntl.h index 23a0102234c..fd9d81f7710 100644 --- a/arch/xtensa/src/esp32/chip/esp32_rtccntl.h +++ b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/chip/esp32_rtccnt.h + * arch/xtensa/src/esp32/hardware/esp32_rtccnt.h * * Adapted from use in NuttX by: * @@ -24,14 +24,14 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_XTENSA_ESP32_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_XTENSA_ESP32_H +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_H /**************************************************************************** * Included Files ****************************************************************************/ -#include "chip/esp32_soc.h" +#include "hardware/esp32_soc.h" /**************************************************************************** * Pre-processor Definitions @@ -2001,4 +2001,4 @@ #define RTC_CNTL_CNTL_DATE_S 0 #define RTC_CNTL_RTC_CNTL_DATE_VERSION 0x1604280 -#endif /*__ARCH_XTENSA_SRC_ESP32_CHIP_XTENSA_ESP32_H */ +#endif /*__ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_H */ diff --git a/arch/xtensa/src/esp32/chip/esp32_soc.h b/arch/xtensa/src/esp32/hardware/esp32_soc.h similarity index 98% rename from arch/xtensa/src/esp32/chip/esp32_soc.h rename to arch/xtensa/src/esp32/hardware/esp32_soc.h index 0073508ab6a..a8597c1f807 100644 --- a/arch/xtensa/src/esp32/chip/esp32_soc.h +++ b/arch/xtensa/src/esp32/hardware/esp32_soc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/chip/esp32_soc.h + * arch/xtensa/src/esp32/hardware/esp32_soc.h * * Adapted from use in NuttX by: * @@ -24,8 +24,8 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_SOC_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_SOC_H +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_SOC_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_SOC_H /**************************************************************************** * Included Files @@ -354,4 +354,4 @@ /* Other interrupt numbers should be managed by the user */ -#endif /* __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_SOC_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_SOC_H */ diff --git a/arch/xtensa/src/esp32/chip/esp32_uart.h b/arch/xtensa/src/esp32/hardware/esp32_uart.h similarity index 99% rename from arch/xtensa/src/esp32/chip/esp32_uart.h rename to arch/xtensa/src/esp32/hardware/esp32_uart.h index 710ef41beb1..e6bcfdefd8b 100644 --- a/arch/xtensa/src/esp32/chip/esp32_uart.h +++ b/arch/xtensa/src/esp32/hardware/esp32_uart.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/xtensa/src/esp32/chip/esp32_uart.h + * arch/xtensa/src/esp32/hardware/esp32_uart.h * * Adapted from use in NuttX by: * @@ -24,14 +24,14 @@ * ****************************************************************************/ -#ifndef __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_UART_H -#define __ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_UART_H +#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_UART_H +#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_UART_H /**************************************************************************** * Included Files ****************************************************************************/ -#include "chip/esp32_soc.h" +#include "hardware/esp32_soc.h" /**************************************************************************** * Pre-processor Macros @@ -1695,4 +1695,5 @@ #define UART_ID_V 0xFFFFFFFF #define UART_ID_S 0 -#endif /*__ARCH_XTENSA_SRC_ESP32_CHIP_ESP32_UART_H */ +#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_UART_H */ + diff --git a/arch/xtensa/src/esp32/rom/esp32_gpio.h b/arch/xtensa/src/esp32/rom/esp32_gpio.h index 38eae27c80a..f4f278cb74c 100644 --- a/arch/xtensa/src/esp32/rom/esp32_gpio.h +++ b/arch/xtensa/src/esp32/rom/esp32_gpio.h @@ -36,7 +36,7 @@ #include #include -#include "chip/esp32_gpio.h" +#include "hardware/esp32_gpio.h" /**************************************************************************** * Pre-processor Definitions diff --git a/configs/nucleo-f446re/src/stm32_ajoystick.c b/configs/nucleo-f446re/src/stm32_ajoystick.c index 04fa8e6e9a3..6e51d0f0531 100644 --- a/configs/nucleo-f446re/src/stm32_ajoystick.c +++ b/configs/nucleo-f446re/src/stm32_ajoystick.c @@ -51,7 +51,7 @@ #include "stm32_gpio.h" #include "stm32_adc.h" -#include "chip/stm32_adc.h" +#include "hardware/stm32_adc.h" #include "nucleo-f446re.h" /**************************************************************************** diff --git a/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/configs/nucleo-f4x1re/src/stm32_ajoystick.c index fe4a1ade251..42fdc973318 100644 --- a/configs/nucleo-f4x1re/src/stm32_ajoystick.c +++ b/configs/nucleo-f4x1re/src/stm32_ajoystick.c @@ -51,7 +51,7 @@ #include "stm32_gpio.h" #include "stm32_adc.h" -#include "chip/stm32_adc.h" +#include "hardware/stm32_adc.h" #include "nucleo-f4x1re.h" /**************************************************************************** diff --git a/configs/nucleo-l432kc/include/board.h b/configs/nucleo-l432kc/include/board.h index af99458cfda..b7143bcb55e 100644 --- a/configs/nucleo-l432kc/include/board.h +++ b/configs/nucleo-l432kc/include/board.h @@ -64,7 +64,7 @@ * is we set aside more DMA channels/streams. */ -/* Values defined in arch/arm/src/stm32l4/chip/stm32l4x3xx_dma.h */ +/* Values defined in arch/arm/src/stm32l4/hardware/stm32l4x3xx_dma.h */ #define DMACHAN_SPI1_RX DMACHAN_SPI1_RX_1 /* 2 choices */ #define DMACHAN_SPI1_TX DMACHAN_SPI1_TX_1 /* 2 choices */ diff --git a/configs/nucleo-l452re/include/board.h b/configs/nucleo-l452re/include/board.h index 2fa0c52f7c0..f617e885e18 100644 --- a/configs/nucleo-l452re/include/board.h +++ b/configs/nucleo-l452re/include/board.h @@ -60,7 +60,7 @@ * is we set aside more DMA channels/streams. */ -/* Values defined in arch/arm/src/stm32l4/chip/stm32l4x3xx_dma.h */ +/* Values defined in arch/arm/src/stm32l4/hardware/stm32l4x3xx_dma.h */ #define DMACHAN_SDMMC DMACHAN_SDMMC_1 /* 2 choices */ diff --git a/configs/nucleo-l476rg/include/board.h b/configs/nucleo-l476rg/include/board.h index a9fa9bc1ac8..41937ff21d8 100644 --- a/configs/nucleo-l476rg/include/board.h +++ b/configs/nucleo-l476rg/include/board.h @@ -62,7 +62,7 @@ * is we set aside more DMA channels/streams. */ -/* Values defined in arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h */ +/* Values defined in arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h */ #define DMACHAN_SDMMC DMACHAN_SDMMC_1 /* 2 choices */ diff --git a/configs/stm32butterfly2/src/stm32_adc.c b/configs/stm32butterfly2/src/stm32_adc.c index eaac1722e71..6526338c22e 100644 --- a/configs/stm32butterfly2/src/stm32_adc.c +++ b/configs/stm32butterfly2/src/stm32_adc.c @@ -36,10 +36,10 @@ * Included Files ****************************************************************************/ -#include #include #include +#include "chip.h" #include "stm32_adc.h" /***************************************************************************** diff --git a/configs/stm32l476vg-disco/include/board.h b/configs/stm32l476vg-disco/include/board.h index 5713b402e8b..4765a663dd6 100644 --- a/configs/stm32l476vg-disco/include/board.h +++ b/configs/stm32l476vg-disco/include/board.h @@ -60,7 +60,7 @@ * is we set aside more DMA channels/streams. */ -/* Values defined in arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h */ +/* Values defined in arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h */ /* XXX are these used on disco? */ diff --git a/configs/stm32l4r9ai-disco/include/board.h b/configs/stm32l4r9ai-disco/include/board.h index 4aecf071f70..526d7202e6c 100644 --- a/configs/stm32l4r9ai-disco/include/board.h +++ b/configs/stm32l4r9ai-disco/include/board.h @@ -59,7 +59,7 @@ * is we set aside more DMA channels/streams. */ -/* Values defined in arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h */ +/* Values defined in arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h */ /* XXX are these used on disco? */