Rename arch/arm/src/stm32f7/chip to arch/arm/src/stm32f7/hardware.

2026-06-06 16:50:55 +08:00 · 2019-05-24 16:48:06 -06:00
parent cdf3dba418
commit 2cf0d6a3aa
95 changed files with 319 additions and 318 deletions
@@ -48,8 +48,8 @@

 #include <arch/irq.h>
 #include <arch/stm32f7/chip.h>
-#include "chip/stm32_pinmap.h"
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_pinmap.h"
+#include "hardware/stm32_memorymap.h"

 /* If the common ARMv7-M vector handling logic is used, then it expects the
 * following definition in this file that provides the number of supported external
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_adc.h
+ * arch/arm/src/stm32f7/hardware/stm32_adc.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ADC_H

 /****************************************************************************************************
 * Included Files
@@ -45,12 +45,12 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_adc.h"
+#  include "hardware/stm32f72xx73xx_adc.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
    defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_adc.h"
+#  include "hardware/stm32f74xx77xx_adc.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ADC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32/chip/stm32_can.h
+ * arch/arm/src/stm32f7/hardware/stm32_can.h
 *
 *   Copyright (C) 2009, 2011, 2013, 2019 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F7_CAN_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F7_CAN_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_CAN_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_CAN_H

 /************************************************************************************
 * Included Files
@@ -531,4 +531,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32_CAN_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_CAN_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32_dbgmcu.h
 *
 *   Copyright (C) 2016, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DBGMCU_H

 /****************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_dbgmcu.h"
+#  include "hardware/stm32f72xx73xx_dbgmcu.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_dbgmcu.h"
+#  include "hardware/stm32f74xx75xx_dbgmcu.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_dbgmcu.h"
+#  include "hardware/stm32f76xx77xx_dbgmcu.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DBGMCU_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32_dma.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_dma.h"
+#  include "hardware/stm32f72xx73xx_dma.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_dma.h"
+#  include "hardware/stm32f74xx75xx_dma.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_dma.h"
+#  include "hardware/stm32f76xx77xx_dma.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_dma2d.h
+ * arch/arm/src/stm32f7/hardware/stm32_dma2d.h
 *
 *   Copyright (C) 2014-2015 Marco Krahl. All rights reserved.
 *   Author: Marco Krahl <ocram.lhark@gmail.com>
@@ -33,15 +33,15 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA2D_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA2D_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA2D_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA2D_H

 /****************************************************************************
 * Included Files
 ****************************************************************************/

 #include <nuttx/config.h>
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"

 /****************************************************************************
 * Pre-processor Definitions
@@ -247,4 +247,4 @@
 * Public Types
 ****************************************************************************/

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA2D_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA2D_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_ethernet.h
+ * arch/arm/src/stm32f7/hardware/stm32_ethernet.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ETHERNET_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ETHERNET_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ETHERNET_H

 /****************************************************************************************************
 * Included Files
@@ -808,5 +808,5 @@ struct eth_rxdesc_s

 #endif /* __ASSEMBLY__ */
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX || CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ETHERNET_H */

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_exti.h
+ * arch/arm/src/stm32f7/hardware/stm32_exti.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_EXTI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_EXTI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_EXTI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_EXTI_H

 /************************************************************************************
 * Included Files
@@ -132,4 +132,4 @@
 #define EXTI_PR_MASK             STM32_EXTI_MASK

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX || CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_EXTI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_EXTI_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32_flash.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_FLASH_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_FLASH_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_FLASH_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_flash.h"
+#  include "hardware/stm32f72xx73xx_flash.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_flash.h"
+#  include "hardware/stm32f74xx75xx_flash.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_flash.h"
+#  include "hardware/stm32f76xx77xx_flash.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_FLASH_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32_gpio.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_GPIO_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_gpio.h"
+#  include "hardware/stm32f72xx73xx_gpio.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_gpio.h"
+#  include "hardware/stm32f74xx75xx_gpio.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_gpio.h"
+#  include "hardware/stm32f76xx77xx_gpio.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_GPIO_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_i2c.h
+ * arch/arm/src/stm32f7/hardware/stm32_i2c.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_I2C_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_I2C_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_I2C_H

 /************************************************************************************
 * Included Files
@@ -48,9 +48,9 @@
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX) || \
    defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
    defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_i2c.h"
+#  include "hardware/stm32f74xx77xx_i2c.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_I2C_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_ltdc.h
+ * arch/arm/src/stm32f7/hardware/stm32_ltdc.h
 *
 *   Copyright (C) 2013 Ken Pettit. All rights reserved.
 *   Author: Ken Pettit <pettitkd@gmail.com>
@@ -33,15 +33,15 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_LTDC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_LTDC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_LTDC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_LTDC_H

 /************************************************************************************
 * Included Files
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@@ -378,4 +378,4 @@
 * Public Types
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_LTDC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_LTDC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32_memorymap.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_memorymap.h"
+#  include "hardware/stm32f72xx73xx_memorymap.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_memorymap.h"
+#  include "hardware/stm32f74xx75xx_memorymap.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_memorymap.h"
+#  include "hardware/stm32f76xx77xx_memorymap.h"
 #else
 #  error "Unsupported STM32 F7 memory map"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f_otg.h
+ * arch/arm/src/stm32f7/hardware/stm32f_otg.h
 *
 *   Copyright (C) 2012, 2014-2016 Gregory Nutt. All rights reserved.
 *   Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved.
@@ -35,8 +35,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_OTG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_OTG_H

 /****************************************************************************************************
 * Included Files
@@ -952,4 +952,4 @@

 #define USBPHYC_LDO_ENABLE             (1 << 2)  /* Bit 2: Controls disable of the High Speed PHY's LDO. */

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_OTG_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32_pinmap.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PINMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PINMAP_H

 /************************************************************************************
 * Included Files
@@ -45,14 +45,14 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_pinmap.h"
+#  include "hardware/stm32f72xx73xx_pinmap.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_pinmap.h"
+#  include "hardware/stm32f74xx75xx_pinmap.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_pinmap.h"
+#  include "hardware/stm32f76xx77xx_pinmap.h"
 #else
 #  error "Unsupported STM32 F7 Pin map"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PINMAP_H */

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32_pwr.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PWR_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_pwr.h"
+#  include "hardware/stm32f72xx73xx_pwr.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_pwr.h"
+#  include "hardware/stm32f74xx75xx_pwr.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_pwr.h"
+#  include "hardware/stm32f76xx77xx_pwr.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PWR_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_qspi.h
+ * arch/arm/src/stm32f7/hardware/stm32_qspi.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Author: dev@ziggurat29.com
@@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F7_QSPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F7_QSPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H

 /****************************************************************************************
 * Included Files
@@ -236,6 +236,6 @@
 * Public Functions
 ****************************************************************************************/

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32L4_QSPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32L4_QSPI_H */


@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32_rcc.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RCC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RCC_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_rcc.h"
+#  include "hardware/stm32f72xx73xx_rcc.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_rcc.h"
+#  include "hardware/stm32f74xx75xx_rcc.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_rcc.h"
+#  include "hardware/stm32f76xx77xx_rcc.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RCC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rng.h
+ * arch/arm/src/stm32f7/hardware/stm32_rng.h
 *
 *   Copyright (C) 2012 Max Holtzberg. All rights reserved.
 *   Author: Max Holtzberg <mh@uvc.de>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_STC_STM32F7_CHIP_STM32_RNG_H
-#define __ARCH_ARM_STC_STM32F7_CHIP_STM32_RNG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RNG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RNG_H

 /************************************************************************************
 * Included Files
@@ -74,4 +74,4 @@
 #define RNG_SR_CEIS               (1 << 5) /* Bit 5: Clock error interrupt status */
 #define RNG_SR_SEIS               (1 << 6) /* Bit 6: Seed error interrupt status */

-#endif /* __ARCH_ARM_STC_STM32F7_CHIP_STM32_RNG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RNG_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rtcc.h
+ * arch/arm/src/stm32f7/hardware/stm32_rtcc.h
 *
 *   Copyright (C) 2011-2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RTCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RTCC_H

 /************************************************************************************
 * Pre-processor Definitions
@@ -402,4 +402,4 @@
 #define RTC_OR_RTC_ALARM_TYPE     (1 << 3) /* RTC_ALARM on PC13 output type */


-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RTCC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_sdmmc.h
+ * arch/arm/src/stm32f7/hardware/stm32_sdmmc.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SDMMC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SDMMC_H

 /************************************************************************************
 * Included Files
@@ -54,4 +54,4 @@
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SDMMC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_spi.h
+ * arch/arm/src/stm32f7/hardware/stm32_spi.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SPI_H

 /************************************************************************************
 * Included Files
@@ -46,11 +46,11 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_spi.h"
+#  include "hardware/stm32f72xx73xx_spi.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
    defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_spi.h"
+#  include "hardware/stm32f74xx77xx_spi.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SPI_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32_syscfg.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SYSCFG_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_syscfg.h"
+#  include "hardware/stm32f72xx73xx_syscfg.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_syscfg.h"
+#  include "hardware/stm32f74xx75xx_syscfg.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_syscfg.h"
+#  include "hardware/stm32f76xx77xx_syscfg.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SYSCFG_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32_tim.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_TIM_H

 /************************************************************************************
 * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_tim.h"
+#  include "hardware/stm32f72xx73xx_tim.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_tim.h"
+#  include "hardware/stm32f74xx75xx_tim.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_tim.h"
+#  include "hardware/stm32f76xx77xx_tim.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_TIM_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_uart.h
+ * arch/arm/src/stm32f7/hardware/stm32_uart.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_UART_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_UART_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_UART_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_UART_H

 /************************************************************************************
 * Included Files
@@ -45,12 +45,12 @@
 #include "chip.h"

 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_uart.h"
+#  include "hardware/stm32f72xx73xx_uart.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
    defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_uart.h"
+#  include "hardware/stm32f74xx77xx_uart.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_UART_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_adc.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H

 /****************************************************************************************************
 * Included Files
@@ -482,4 +482,4 @@
 * Public Function Prototypes
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
 *
 *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XXDBGMCU_H

 /****************************************************************************
 * Included Files
@@ -105,4 +105,4 @@
 #define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
 #define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX74XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX74XXDBGMCU_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
 *
 *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H

 /************************************************************************************
 * Included Files
@@ -543,4 +543,4 @@
 #define DMAMAP_SDMMC2_2            STM32_DMA_MAP(DMA2,DMA_STREAM5,DMA_CHAN11)

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xxx73xx_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xxx73xx_gpio.h
 *
 *   Copyright (C) 2005 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_GPIO_H

 /************************************************************************************
 * Included Files
@@ -401,4 +401,4 @@
 #define GPIO_AFRH15_MASK           (15 << GPIO_AFRH15_SHIFT)

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_GPIO_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/chip/stm32f72xx73xx_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XXX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XXX_MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -202,4 +202,4 @@
 #define STM32_DEBUGMCU_BASE 0xe0042000

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pinmap.h
 *
 *   Copyright (C) 2014-2015, 2017-2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_PINMAP_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PINMAP_H

 /************************************************************************************
 * Included Files
@@ -937,4 +937,4 @@
 #define GPIO_UART8_TX         (GPIO_ALT|GPIO_AF8|GPIO_PULLUP|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTE|GPIO_PIN1)

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PINMAP_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pwr.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PWR_H

 /************************************************************************************
 * Included Files
@@ -158,4 +158,4 @@
 #define PWR_CSR2_EWUP6           (1 << 13) /* Bit 13: Enable wakeup pin for PI11 */

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PWR_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_rcc.h
 *
 *   Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_RCC_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_RCC_H

 /****************************************************************************************************
 * Included Files
@@ -666,4 +666,4 @@
 #  define RCC_DCKCFGR2_SDMMC2SEL_SYSCLK  (1 << RCC_DCKCFGR2_SDMMC2SEL_SHIFT)  /* System clock is selected as SDMMC clock */

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H */
@@ -1,4 +1,4 @@
- /* arch/arm/src/stm32f7/chip/stm32f72xx73xx_sdmmc.h
+ /* arch/arm/src/stm32f7/hardware/stm32f72xx73xx_sdmmc.h
 *
 *   Copyright (C) 2009, 2011-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SDMMC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SDMMC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SDMMC_H

 /************************************************************************************
 * Pre-processor Definitions
@@ -221,4 +221,4 @@
 #define STM32_SDMMC_FIFOCNT_SHIFT             (0)
 #define STM32_SDMMC_FIFOCNT_MASK              (0x0ffffff << STM32_SDMMC_FIFOCNT_SHIFT)

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SDMMC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_spi.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_spi.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SPI_H

 /************************************************************************************
 * Included Files
@@ -252,4 +252,4 @@
 #define SPI_I2SPR_ODD             (1 << 8)  /* Bit 8: Odd factor for the prescaler */
 #define SPI_I2SPR_MCKOE           (1 << 9)  /* Bit 9: Master clock output enable */

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SPI_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx74xx_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx74xx_syscfg.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SYSCFG_H

 /****************************************************************************************************
 * Included Files
@@ -159,4 +159,4 @@
 #define SYSCFG_CMPCR_READY            (1 << 8)  /* Bit 8: Compensation cell ready flag */

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SYSCFG_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_TIM_H

 /****************************************************************************************************
 * Pre-processor Definitions
@@ -1127,4 +1127,4 @@

 #define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xxf77xx_uart.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxf77xx_uart.h
 *
 *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_UART_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_UART_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_UART_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_UART_H

 /************************************************************************************
 * Included Files
@@ -368,4 +368,4 @@
 #define USART_TDR_MASK            (0x1ff << USART_TDR_SHIFT)

 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_UART_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H

 /****************************************************************************
 * Included Files
@@ -109,4 +109,4 @@
 #define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
 #define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H

 /************************************************************************************
 * Included Files
@@ -548,4 +548,4 @@
 #define DMAMAP_TIM8_COM            STM32_DMA_MAP(DMA2,DMA_STREAM7,DMA_CHAN7)

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xxx75xx_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxx75xx_gpio.h
 *
 *   Copyright (C) 2005 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_GPIO_H

 /************************************************************************************
 * Included Files
@@ -400,4 +400,4 @@
 #define GPIO_AFRH15_MASK           (15 << GPIO_AFRH15_SHIFT)

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_GPIO_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm3fr2/chip/stm32f74xxx75xxx_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxx75xxx_memorymap.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -213,4 +213,4 @@
 #define STM32_DEBUGMCU_BASE 0xe0042000

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pinmap.h
 *
 *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_PINMAP_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PINMAP_H

 /************************************************************************************
 * Included Files
@@ -1184,4 +1184,4 @@
 #define GPIO_UART8_TX         (GPIO_ALT|GPIO_AF8|GPIO_PULLUP|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTE|GPIO_PIN1)

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PINMAP_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pwr.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PWR_H

 /************************************************************************************
 * Included Files
@@ -157,4 +157,4 @@
 #define PWR_CSR2_EWUP6           (1 << 13) /* Bit 13: Enable wakeup pin for PI11 */

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PWR_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_rcc.h
 *
 *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H

 /****************************************************************************************************
 * Included Files
@@ -709,4 +709,4 @@
 #  define RCC_DCKCFGR2_SDMMCSEL_SYSCLK  (1 << RCC_DCKCFGR2_SDMMCSEL_SHIFT)  /* System clock is selected as SDMMC clock */

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_syscfg.h
 *
 *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_SYSCFG_H

 /****************************************************************************************************
 * Included Files
@@ -156,4 +156,4 @@
 #define SYSCFG_CMPCR_READY            (1 << 8)  /* Bit 8: Compensation cell ready flag */

 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_SYSCFG_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H

 /****************************************************************************************************
 * Pre-processor Definitions
@@ -1126,4 +1126,4 @@

 #define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx77xx_adc.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx77xx_adc.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H

 /****************************************************************************************************
 * Included Files
@@ -481,4 +481,4 @@
 * Public Function Prototypes
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H */
--- a/Show More
+++ b/Show More