diff --git a/arch/arm/src/stm32l4/chip.h b/arch/arm/src/stm32l4/chip.h index 2d19fa59e2..fb5ae336d5 100644 --- a/arch/arm/src/stm32l4/chip.h +++ b/arch/arm/src/stm32l4/chip.h @@ -48,8 +48,8 @@ #include #include -#include "chip/stm32l4_pinmap.h" -#include "chip/stm32l4_memorymap.h" +#include "hardware/stm32l4_pinmap.h" +#include "hardware/stm32l4_memorymap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/chip/stm32l4_adc.h b/arch/arm/src/stm32l4/hardware/stm32l4_adc.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_adc.h rename to arch/arm/src/stm32l4/hardware/stm32l4_adc.h index 657dfac82e..99e71f764f 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_adc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_adc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_adc.h + * arch/arm/src/stm32l4/hardware/stm32l4_adc.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_ADC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_ADC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_ADC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_ADC_H /************************************************************************************ * Included Files @@ -594,4 +594,4 @@ # define ADC_CDR_RDATA_SLV_MASK (0xffff << ADC_CDR_RDATA_SLV_SHIFT) #endif -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_ADC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_ADC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_can.h b/arch/arm/src/stm32l4/hardware/stm32l4_can.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_can.h rename to arch/arm/src/stm32l4/hardware/stm32l4_can.h index 6319282e48..2eca71947d 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_can.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_can.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_can.h + * arch/arm/src/stm32l4/hardware/stm32l4_can.h * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_CAN_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_CAN_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_CAN_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_CAN_H /************************************************************************************ * Included Files @@ -426,4 +426,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_CAN_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_CAN_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_comp.h b/arch/arm/src/stm32l4/hardware/stm32l4_comp.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4_comp.h rename to arch/arm/src/stm32l4/hardware/stm32l4_comp.h index 61355abbf3..3501b88fb4 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_comp.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_comp.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_COMP_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_COMP_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_COMP_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_COMP_H /**************************************************************************************************** * Pre-processor Definitions @@ -121,4 +121,4 @@ # define COMP_CSR_LOCK_RW (0) # define COMP_CSR_LOCK_RO COMP_CSR_LOCK_MASK -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_COMP_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_COMP_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_crs.h b/arch/arm/src/stm32l4/hardware/stm32l4_crs.h similarity index 96% rename from arch/arm/src/stm32l4/chip/stm32l4_crs.h rename to arch/arm/src/stm32l4/hardware/stm32l4_crs.h index df7830fb0d..57a95ef875 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_crs.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_crs.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_crs.h + * arch/arm/src/stm32l4/hardware/stm32l4_crs.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_CRS_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_CRS_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_CRS_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_CRS_H /************************************************************************************ * Pre-processor Definitions @@ -112,4 +112,4 @@ #define CRS_ICR_ERRC (1 << 2) /* Bit 2: Error clear flag */ #define CRS_ICR_ESYNCC (1 << 3) /* Bit 3: Expected SYNC clear flag */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_CRS_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_CRS_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_dac.h b/arch/arm/src/stm32l4/hardware/stm32l4_dac.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_dac.h rename to arch/arm/src/stm32l4/hardware/stm32l4_dac.h index 234bdfd272..2c2fb81c50 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_dac.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_dac.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_dac.h + * arch/arm/src/stm32l4/hardware/stm32l4_dac.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_DAC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_DAC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_DAC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_DAC_H /************************************************************************************ * Included Files @@ -338,4 +338,4 @@ #define DAC_SHRR_TREFRESH2_SHIFT (16) /* Bits 16-23: DAC channel 2 refresh time */ #define DAC_SHRR_TREFRESH2_MASK (0xff << DAC_SHRR_TREFRESH2_SHIFT) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_DAC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_DAC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_dfsdm.h b/arch/arm/src/stm32l4/hardware/stm32l4_dfsdm.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_dfsdm.h rename to arch/arm/src/stm32l4/hardware/stm32l4_dfsdm.h index 2f67832c6b..0d0f564a03 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_dfsdm.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_dfsdm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_dfsdm.h + * arch/arm/src/stm32l4/hardware/stm32l4_dfsdm.h * * Copyright (C) 2017-2018 Haltian Ltd. All rights reserved. * Author: Juha Niskanen @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_DFSDM_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_DFSDM_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_DFSDM_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_DFSDM_H /************************************************************************************ * Included Files @@ -470,4 +470,4 @@ #define DFSDM_CNVTIMR_CNVCNT_SHIFT (4) /* Bits 4-31: 28-bit timer counting conversion time t = CNVCNT[27:0] / fDFSDMCLK */ #define DFSDM_CNVTIMR_CNVCNT_MASK (~0xfu) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_DFSDM_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_DFSDM_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_exti.h b/arch/arm/src/stm32l4/hardware/stm32l4_exti.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4_exti.h rename to arch/arm/src/stm32l4/hardware/stm32l4_exti.h index 4af53eb347..05970c9739 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_exti.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_exti.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_exti.h + * arch/arm/src/stm32l4/hardware/stm32l4_exti.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_EXTI_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_EXTI_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_EXTI_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_EXTI_H /************************************************************************************ * Included Files @@ -176,5 +176,5 @@ #define EXTI_PR2_SHIFT (0) /* Bits 0-X: Pending bit for all lines */ #define EXTI_PR2_MASK STM32L4_EXTI2_MASK -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_EXTI_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_EXTI_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_flash.h b/arch/arm/src/stm32l4/hardware/stm32l4_flash.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_flash.h rename to arch/arm/src/stm32l4/hardware/stm32l4_flash.h index 8bdb73c828..23f48add23 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_flash.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_flash.h + * arch/arm/src/stm32l4/hardware/stm32l4_flash.h * * Copyright (C) 2009, 2011, 2015, 2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_FLASH_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_FLASH_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_FLASH_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_FLASH_H /************************************************************************************ * Included Files @@ -293,4 +293,4 @@ # define FLASH_CFGR_LVEN (1 << 0) /* Bit 0: Low voltage enable */ #endif -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_FLASH_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_FLASH_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_gpio.h b/arch/arm/src/stm32l4/hardware/stm32l4_gpio.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_gpio.h rename to arch/arm/src/stm32l4/hardware/stm32l4_gpio.h index 08e0e9e519..6e91d67f04 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_gpio.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_gpio.h + * arch/arm/src/stm32l4/hardware/stm32l4_gpio.h * * Copyright (C) 2016, Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_GPIO_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_GPIO_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_GPIO_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_GPIO_H /************************************************************************************ * Included Files @@ -371,5 +371,5 @@ #define GPIO_AFRH15_SHIFT (28) #define GPIO_AFRH15_MASK (15 << GPIO_AFRH15_SHIFT) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_GPIO_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_GPIO_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_i2c.h b/arch/arm/src/stm32l4/hardware/stm32l4_i2c.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_i2c.h rename to arch/arm/src/stm32l4/hardware/stm32l4_i2c.h index 398073514a..4720c00254 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_i2c.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_i2c.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_i2c.h + * arch/arm/src/stm32l4/hardware/stm32l4_i2c.h * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_I2C_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_I2C_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_I2C_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_I2C_H /************************************************************************************ * Pre-processor Definitions @@ -259,5 +259,5 @@ #define I2C_TXDR_MASK (0xff) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_I2C_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_I2C_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_lptim.h b/arch/arm/src/stm32l4/hardware/stm32l4_lptim.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4_lptim.h rename to arch/arm/src/stm32l4/hardware/stm32l4_lptim.h index 1822effec4..325373bb3f 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_lptim.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_lptim.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_LPTIM_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_LPTIM_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_LPTIM_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_LPTIM_H /**************************************************************************************************** * Pre-processor Definitions @@ -114,4 +114,4 @@ #define LPTIM_CR_SNGSTRT (1 << 1) /* Bit 1: Single Mode */ #define LPTIM_CR_CNTSTRT (1 << 2) /* Bit 2: Continuous Mode */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_LPTIM_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_LPTIM_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_memorymap.h b/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_memorymap.h rename to arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h index aeab28e2fb..3b1631ad48 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_memorymap.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_memorymap.h + * arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/stm32l4/chip/stm32l4_pinmap.h b/arch/arm/src/stm32l4/hardware/stm32l4_pinmap.h similarity index 85% rename from arch/arm/src/stm32l4/chip/stm32l4_pinmap.h rename to arch/arm/src/stm32l4/hardware/stm32l4_pinmap.h index cf6fd5c2e7..77e053f2fb 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_pinmap.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_pinmap.h + * arch/arm/src/stm32l4/hardware/stm32l4_pinmap.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved. @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_PINMAP_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_PINMAP_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_PINMAP_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_PINMAP_H /************************************************************************************ * Included Files @@ -45,16 +45,16 @@ #include "chip.h" #if defined(CONFIG_STM32L4_STM32L4X3) -# include "chip/stm32l4x3xx_pinmap.h" +# include "hardware/stm32l4x3xx_pinmap.h" #elif defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_pinmap.h" +# include "hardware/stm32l4x5xx_pinmap.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_pinmap.h" +# include "hardware/stm32l4x6xx_pinmap.h" #elif defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4xrxx_pinmap.h" +# include "hardware/stm32l4xrxx_pinmap.h" #else # error "Unsupported STM32 L4 pin map" #endif -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_PINMAP_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_pwr.h b/arch/arm/src/stm32l4/hardware/stm32l4_pwr.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_pwr.h rename to arch/arm/src/stm32l4/hardware/stm32l4_pwr.h index fbcf9a6a16..bd0367b338 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_pwr.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_pwr.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_pwr.h + * arch/arm/src/stm32l4/hardware/stm32l4_pwr.h * * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_PWR_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_PWR_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_PWR_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_PWR_H /************************************************************************************ * Included Files @@ -202,4 +202,4 @@ /* Port X pull-up/down registers have one bit per port line, with a few exceptions */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_PWR_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_PWR_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_qspi.h b/arch/arm/src/stm32l4/hardware/stm32l4_qspi.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_qspi.h rename to arch/arm/src/stm32l4/hardware/stm32l4_qspi.h index ecb6c927af..33e771d9dd 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_qspi.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_qspi.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4_qspi.h + * arch/arm/src/stm32l4/hardware/stm32l4_qspi.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: dev@ziggurat29.com @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_QSPI_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_QSPI_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_QSPI_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_QSPI_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include -#include "chip/stm32l4_memorymap.h" +#include "hardware/stm32l4_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -234,6 +234,6 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_QSPI_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_QSPI_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_rng.h b/arch/arm/src/stm32l4/hardware/stm32l4_rng.h similarity index 94% rename from arch/arm/src/stm32l4/chip/stm32l4_rng.h rename to arch/arm/src/stm32l4/hardware/stm32l4_rng.h index 7812110b62..094ed66b28 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_rng.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_rng.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32/chip/stm32l4_rng.h + * arch/arm/src/stm32l4/hardware/stm32l4_rng.h * * Copyright (C) 2012 Max Holtzberg. All rights reserved. * Author: Max Holtzberg @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_STC_STM32L4_CHIP_STM32L4_RNG_H -#define __ARCH_ARM_STC_STM32L4_CHIP_STM32L4_RNG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_RNG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_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_STM32L4_CHIP_STM32L4_RNG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_RNG_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_rtcc.h b/arch/arm/src/stm32l4/hardware/stm32l4_rtcc.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_rtcc.h rename to arch/arm/src/stm32l4/hardware/stm32l4_rtcc.h index 2014ae1316..4853936a8b 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_rtcc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_rtcc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_rtcc.h + * arch/arm/src/stm32l4/hardware/stm32l4_rtcc.h * * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Author: dev@ziggurat29.com @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_RTCC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_RTCC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_RTCC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_RTCC_H /************************************************************************************ * Pre-processor Definitions @@ -398,4 +398,4 @@ #define RTC_OR_OUTRMP (1 << 1) /* Bit 1: remap output to PB14 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_RTCC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_RTCC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_sai.h b/arch/arm/src/stm32l4/hardware/stm32l4_sai.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_sai.h rename to arch/arm/src/stm32l4/hardware/stm32l4_sai.h index f411fb72ba..59d8033259 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_sai.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_sai.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32/chip/stm32l4_sai.h + * arch/arm/src/stm32l4/hardware/stm32l4_sai.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_STC_STM32L4_CHIP_STM32L4_SAI_H -#define __ARCH_ARM_STC_STM32L4_CHIP_STM32L4_SAI_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SAI_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SAI_H /************************************************************************************ * Included Files @@ -256,4 +256,4 @@ /* SAI Data Register (32-bit data) */ -#endif /* __ARCH_ARM_STC_STM32L4_CHIP_STM32L4_SAI_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SAI_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_sdmmc.h b/arch/arm/src/stm32l4/hardware/stm32l4_sdmmc.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_sdmmc.h rename to arch/arm/src/stm32l4/hardware/stm32l4_sdmmc.h index ad15be57f7..f68a6a9366 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_sdmmc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_sdmmc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_sdmmc.h + * arch/arm/src/stm32l4/hardware/stm32l4_sdmmc.h * * Copyright (C) 2009, 2011-2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SDMMC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SDMMC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SDMMC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SDMMC_H /************************************************************************************ * Pre-processor Definitions @@ -215,5 +215,5 @@ #define STM32_SDMMC_FIFOCNT_SHIFT (0) #define STM32_SDMMC_FIFOCNT_MASK (0x0ffffff << STM32_SDMMC_FIFOCNT_SHIFT) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L46XX_SDMMC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L46XX_SDMMC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_spi.h b/arch/arm/src/stm32l4/hardware/stm32l4_spi.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4_spi.h rename to arch/arm/src/stm32l4/hardware/stm32l4_spi.h index c9a1a03ef2..4bc10ab893 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_spi.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_spi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_spi.h + * arch/arm/src/stm32l4/hardware/stm32l4_spi.h * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SPI_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SPI_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SPI_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SPI_H /************************************************************************************ * Included Files @@ -177,5 +177,5 @@ # define SPI_SR_FTLVL_HALF (2 << SPI_SR_FTLVL_SHIFT) /* 1/2 FIFO */ # define SPI_SR_FTLVL_FULL (3 << SPI_SR_FTLVL_SHIFT) /* FIFO full */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SPI_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SPI_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_syscfg.h b/arch/arm/src/stm32l4/hardware/stm32l4_syscfg.h similarity index 84% rename from arch/arm/src/stm32l4/chip/stm32l4_syscfg.h rename to arch/arm/src/stm32l4/hardware/stm32l4_syscfg.h index 74c3c1851e..4537397c45 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_syscfg.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_syscfg.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_syscfg.h + * arch/arm/src/stm32l4/hardware/stm32l4_syscfg.h * * Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SYSCFG_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SYSCFG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SYSCFG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SYSCFG_H /************************************************************************************ * Included Files @@ -44,15 +44,15 @@ #include "chip.h" #if defined(CONFIG_STM32L4_STM32L4X3) -# include "chip/stm32l4x3xx_syscfg.h" +# include "hardware/stm32l4x3xx_syscfg.h" #elif defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_syscfg.h" +# include "hardware/stm32l4x5xx_syscfg.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_syscfg.h" +# include "hardware/stm32l4x6xx_syscfg.h" #elif defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4xrxx_syscfg.h" +# include "hardware/stm32l4xrxx_syscfg.h" #else # error "Unsupported STM32 L4 chip" #endif -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_SYSCFG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_SYSCFG_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_tim.h b/arch/arm/src/stm32l4/hardware/stm32l4_tim.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4_tim.h rename to arch/arm/src/stm32l4/hardware/stm32l4_tim.h index 78d5004f55..329ea556fd 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_tim.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_tim.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_tim.h + * arch/arm/src/stm32l4/hardware/stm32l4_tim.h * * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_TIM_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_TIM_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_TIM_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_TIM_H /************************************************************************************ * Pre-processor Definitions @@ -1119,4 +1119,4 @@ #define BTIM_EGR_UG (1 << 0) /* Bit 0: Update generation */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_TIM_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_TIM_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_uart.h b/arch/arm/src/stm32l4/hardware/stm32l4_uart.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_uart.h rename to arch/arm/src/stm32l4/hardware/stm32l4_uart.h index c7605ab8ad..efd5a95a3b 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_uart.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_uart.h + * arch/arm/src/stm32l4/hardware/stm32l4_uart.h * * Copyright (C) 2009, 2011-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_UART_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_UART_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_UART_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_UART_H /************************************************************************************ * Included Files @@ -314,5 +314,5 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_STC_STM32L4_CHIP_STM32L4_UART_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_UART_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_usbdev.h b/arch/arm/src/stm32l4/hardware/stm32l4_usbdev.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4_usbdev.h rename to arch/arm/src/stm32l4/hardware/stm32l4_usbdev.h index 2365bf22c2..75144352e9 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_usbdev.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_usbdev.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_usbdev.h + * arch/arm/src/stm32l4/hardware/stm32l4_usbdev.h * * Copyright (C) 2009, 2011, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_USBDEV_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_USBDEV_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_USBDEV_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_USBDEV_H /************************************************************************************ * Included Files @@ -261,5 +261,5 @@ #define USB_BCDR_DPPU (1 << 15) /* Bit 15: DP pull-up control */ #endif /* CONFIG_STM32L4_STM32L4X2 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_USBDEV_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_USBDEV_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4_wdg.h b/arch/arm/src/stm32l4/hardware/stm32l4_wdg.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4_wdg.h rename to arch/arm/src/stm32l4/hardware/stm32l4_wdg.h index 9c381f790a..38831acaeb 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_wdg.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4_wdg.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4_wdg.h + * arch/arm/src/stm32l4/hardware/stm32l4_wdg.h * * Copyright (C) 2009, 2011-2013, 2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_WDG_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_WDG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_WDG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_WDG_H /************************************************************************************ * Included Files @@ -151,4 +151,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_WDG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_WDG_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x3xx_dbgmcu.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h similarity index 95% rename from arch/arm/src/stm32l4/chip/stm32l4x3xx_dbgmcu.h rename to arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h index aaf9c780da..f4ce46bd54 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x3xx_dbgmcu.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x3xx_dbgmcu.h + * arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DBGMCU_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DBGMCU_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DBGMCU_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DBGMCU_H /**************************************************************************** * Included Files @@ -105,4 +105,4 @@ #define DBGMCU_APB2_TIM15STOP (1 << 16) /* Bit 16: TIM15 stopped when core is halted */ #define DBGMCU_APB2_TIM16STOP (1 << 17) /* Bit 17: TIM16 stopped when core is halted */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XXDBGMCU_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XXDBGMCU_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x3xx_dma.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dma.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x3xx_dma.h rename to arch/arm/src/stm32l4/hardware/stm32l4x3xx_dma.h index a00945deb9..bcefef8ca8 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x3xx_dma.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dma.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x3xx_dma.h + * arch/arm/src/stm32l4/hardware/stm32l4x3xx_dma.h * * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_DMA_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_DMA_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_DMA_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_DMA_H /************************************************************************************ * Pre-processor Definitions @@ -460,4 +460,4 @@ #define DMACHAN_LPUART_RX DMACHAN_SETTING(STM32L4_DMA2_CHAN7, 4) #define DMACHAN_LPUART_TX DMACHAN_SETTING(STM32L4_DMA2_CHAN6, 4) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_DMA_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_DMA_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x3xx_firewall.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_firewall.h similarity index 94% rename from arch/arm/src/stm32l4/chip/stm32l4x3xx_firewall.h rename to arch/arm/src/stm32l4/hardware/stm32l4x3xx_firewall.h index 6dbd4cd99d..dcd754e293 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x3xx_firewall.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_firewall.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x3xx_firewall.h + * arch/arm/src/stm32l4/hardware/stm32l4x3xx_firewall.h * * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_FIREWALL_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_FIREWALL_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_FIREWALL_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_FIREWALL_H /************************************************************************************ * Included Files @@ -100,4 +100,4 @@ #define FIREWALL_CR_VDS (1 << 1) /* Bit 1: Volatile data shared */ #define FIREWALL_CR_VDE (1 << 2) /* Bit 2: Volatile data execution */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_FIREWALL_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_FIREWALL_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x3xx_pinmap.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_pinmap.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x3xx_pinmap.h rename to arch/arm/src/stm32l4/hardware/stm32l4x3xx_pinmap.h index cdad82515e..4495e9836a 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x3xx_pinmap.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x3xx_pinmap.h + * arch/arm/src/stm32l4/hardware/stm32l4x3xx_pinmap.h * * Copyright (C) 2015-2016 Sebastien Lorquet. All rights reserved. * Authors: Sebastien Lorquet @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_PINMAP_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_PINMAP_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_PINMAP_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_PINMAP_H /************************************************************************************ * Included Files @@ -603,4 +603,4 @@ #define GPIO_USB_DM (GPIO_ALT|GPIO_AF10|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_PORTA|GPIO_PIN11) #define GPIO_USB_DP (GPIO_ALT|GPIO_AF10|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_PORTA|GPIO_PIN12) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_PINMAP_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x3xx_rcc.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_rcc.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x3xx_rcc.h rename to arch/arm/src/stm32l4/hardware/stm32l4x3xx_rcc.h index f01d85e7dd..fb6570e116 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x3xx_rcc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_rcc.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x3xx_rcc.h + * arch/arm/src/stm32l4/hardware/stm32l4x3xx_rcc.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. @@ -36,8 +36,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_RCC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_RCC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_RCC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_RCC_H /**************************************************************************************************** * Included Files @@ -786,4 +786,4 @@ #define RCC_CRRCR_HSI48RDY (1 << 1) /* Bit 1: HSI48 clock ready flag */ #endif /* CONFIG_STM32L4_STM32L4X3 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_RCC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_RCC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x3xx_syscfg.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_syscfg.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4x3xx_syscfg.h rename to arch/arm/src/stm32l4/hardware/stm32l4x3xx_syscfg.h index 446ce1811a..e3c41fb2c0 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x3xx_syscfg.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_syscfg.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x3xx_syscfg.h + * arch/arm/src/stm32l4/hardware/stm32l4x3xx_syscfg.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_SYSCFG_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_SYSCFG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_SYSCFG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_SYSCFG_H /**************************************************************************************************** * Included Files @@ -179,4 +179,4 @@ #define SYSCFG_SKR_MASK (0xFF << SYSCFG_SKR_SHIFT) #endif /* CONFIG_STM32L4_STM32L4X3 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X3XX_SYSCFG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_SYSCFG_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_dbgmcu.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_dbgmcu.h similarity index 96% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_dbgmcu.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_dbgmcu.h index 27afd39fe6..5c89eee319 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_dbgmcu.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_dbgmcu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x5xx_dbgmcu.h + * arch/arm/src/stm32l4/hardware/stm32l4x5xx_dbgmcu.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_DBGMCU_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_DBGMCU_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_DBGMCU_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_DBGMCU_H /**************************************************************************** * Included Files @@ -110,4 +110,4 @@ #define DBGMCU_APB2_TIM16STOP (1 << 17) /* Bit 17: TIM16 stopped when core is halted */ #define DBGMCU_APB2_TIM17STOP (1 << 18) /* Bit 18: TIM17 stopped when core is halted */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XXDBGMCU_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XXDBGMCU_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_dma.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_dma.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_dma.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_dma.h index 2eceae8292..2c3fa4fd7c 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_dma.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_dma.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_DMA_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_DMA_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_DMA_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_DMA_H /************************************************************************************ * Pre-processor Definitions @@ -482,4 +482,4 @@ #define DMACHAN_LPUART_RX DMACHAN_SETTING(STM32L4_DMA2_CHAN7, 4) #define DMACHAN_LPUART_TX DMACHAN_SETTING(STM32L4_DMA2_CHAN6, 4) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_DMA_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_DMA_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_firewall.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_firewall.h similarity index 95% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_firewall.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_firewall.h index 878a04ee68..6cd2433c97 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_firewall.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_firewall.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x5xx_firewall.h + * arch/arm/src/stm32l4/hardware/stm32l4x5xx_firewall.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_FIREWALL_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_FIREWALL_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_FIREWALL_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_FIREWALL_H /************************************************************************************ * Included Files @@ -109,4 +109,4 @@ #define FIREWALL_CR_VDS (1 << 1) /* Bit 1: Volatile data shared */ #define FIREWALL_CR_VDE (1 << 2) /* Bit 2: Volatile data execution */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_FIREWALL_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_FIREWALL_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_otgfs.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_otgfs.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_otgfs.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_otgfs.h index efdde6fcc1..e2af3a17d6 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_otgfs.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_otgfs.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x5xx_otgfs.h + * arch/arm/src/stm32l4/hardware/stm32l4x5xx_otgfs.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. @@ -36,8 +36,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_OTGFS_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_OTGFS_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_OTGFS_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_OTGFS_H /**************************************************************************************************** * Included Files @@ -944,4 +944,4 @@ #define OTGFS_PCGCCTL_SUSP (1 << 7) /* Bit 7: Deep Sleep */ /* Bits 8-31: Reserved, must be kept at reset value */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_OTGFS_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_OTGFS_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_pinmap.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_pinmap.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_pinmap.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_pinmap.h index 93b48fb559..0047657efc 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_pinmap.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x5xx_pinmap.h + * arch/arm/src/stm32l4/hardware/stm32l4x5xx_pinmap.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2015-2016 Sebastien Lorquet. All rights reserved. @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_PINMAP_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_PINMAP_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_PINMAP_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_PINMAP_H /************************************************************************************ * Included Files @@ -784,4 +784,4 @@ #define GPIO_LPUART1_RTS_DE_1 (GPIO_ALT|GPIO_AF8 |GPIO_PORTB|GPIO_PIN12) #define GPIO_LPUART1_RTS_DE_2 (GPIO_ALT|GPIO_AF8 |GPIO_PORTG|GPIO_PIN6) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_PINMAP_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_rcc.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_rcc.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_rcc.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_rcc.h index 412c786883..42e36229a0 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_rcc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_rcc.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x6xx_rcc.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_rcc.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. @@ -35,8 +35,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_RCC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_RCC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_RCC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_RCC_H /**************************************************************************************************** * Included Files @@ -707,4 +707,4 @@ #define RCC_CSR_LPWRRSTF (1 << 31) /* Bit 31: Low-Power reset flag */ #endif /* CONFIG_STM32L4_STM32L4X5 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_RCC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_RCC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x5xx_syscfg.h b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_syscfg.h similarity index 97% rename from arch/arm/src/stm32l4/chip/stm32l4x5xx_syscfg.h rename to arch/arm/src/stm32l4/hardware/stm32l4x5xx_syscfg.h index 2078261227..f1bf322e34 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x5xx_syscfg.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x5xx_syscfg.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x5xx_syscfg.h + * arch/arm/src/stm32l4/hardware/stm32l4x5xx_syscfg.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_SYSCFG_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_SYSCFG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_SYSCFG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_SYSCFG_H /**************************************************************************************************** * Included Files @@ -174,4 +174,4 @@ #define SYSCFG_CFGR2_SPF (1 << 8) /* Bit 8: SRAM2 parity error flag */ #endif /* CONFIG_STM32L4_STM32L4X5 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X5XX_SYSCFG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X5XX_SYSCFG_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_dbgmcu.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_dbgmcu.h similarity index 96% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_dbgmcu.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_dbgmcu.h index 09438cda7b..4e8acff1ba 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_dbgmcu.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_dbgmcu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x6xx_dbgmcu.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_dbgmcu.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DBGMCU_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DBGMCU_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DBGMCU_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DBGMCU_H /**************************************************************************** * Included Files @@ -116,4 +116,4 @@ #define DBGMCU_APB2_TIM16STOP (1 << 17) /* Bit 17: TIM16 stopped when core is halted */ #define DBGMCU_APB2_TIM17STOP (1 << 18) /* Bit 18: TIM17 stopped when core is halted */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XXDBGMCU_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XXDBGMCU_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h index cf90c3e18d..3ff7e3cbee 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x6xx_dma.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_dma.h * * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DMA_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DMA_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DMA_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DMA_H /************************************************************************************ * Pre-processor Definitions @@ -501,4 +501,4 @@ #define DMACHAN_LPUART_RX DMACHAN_SETTING(STM32L4_DMA2_CHAN7, 4) #define DMACHAN_LPUART_TX DMACHAN_SETTING(STM32L4_DMA2_CHAN6, 4) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_DMA_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DMA_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_firewall.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_firewall.h similarity index 95% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_firewall.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_firewall.h index 5a422d419f..c6cb47c802 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_firewall.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_firewall.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x6xx_firewall.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_firewall.h * * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_FIREWALL_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_FIREWALL_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_FIREWALL_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_FIREWALL_H /************************************************************************************ * Included Files @@ -115,4 +115,4 @@ #define FIREWALL_CR_VDS (1 << 1) /* Bit 1: Volatile data shared */ #define FIREWALL_CR_VDE (1 << 2) /* Bit 2: Volatile data execution */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_FIREWALL_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_FIREWALL_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_otgfs.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_otgfs.h index b2843a0b4a..1eb229d297 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_otgfs.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_otgfs.h * * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. @@ -36,8 +36,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_OTGFS_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_OTGFS_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_OTGFS_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_OTGFS_H /**************************************************************************************************** * Included Files @@ -949,4 +949,4 @@ #define OTGFS_PCGCCTL_SUSP (1 << 7) /* Bit 7: Deep Sleep */ /* Bits 8-31: Reserved, must be kept at reset value */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_OTGFS_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_OTGFS_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_pinmap.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_pinmap.h index 13e659eee5..9a1022bb4e 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_pinmap.h * * Copyright (C) 2015-2016 Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_PINMAP_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_PINMAP_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_PINMAP_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_PINMAP_H /************************************************************************************ * Included Files @@ -902,4 +902,4 @@ #define GPIO_LPUART1_RTS_DE_1 (GPIO_ALT|GPIO_AF8 |GPIO_PORTB|GPIO_PIN12) #define GPIO_LPUART1_RTS_DE_2 (GPIO_ALT|GPIO_AF8 |GPIO_PORTG|GPIO_PIN6) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_PINMAP_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_rcc.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_rcc.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_rcc.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_rcc.h index 9b60a684b8..eea6a8a68e 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_rcc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_rcc.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x6xx_rcc.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_rcc.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. @@ -35,8 +35,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_RCC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_RCC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H /**************************************************************************************************** * Included Files @@ -811,4 +811,4 @@ # define RCC_CCIPR2_I2C4SEL_HSI (2 << RCC_CCIPR2_I2C4SEL_SHIFT) #endif /* CONFIG_STM32L4_STM32L4X6 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_RCC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_syscfg.h b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_syscfg.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4x6xx_syscfg.h rename to arch/arm/src/stm32l4/hardware/stm32l4x6xx_syscfg.h index e7446cfb29..4625ac8a29 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_syscfg.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4x6xx_syscfg.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x6xx_syscfg.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_syscfg.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_SYSCFG_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_SYSCFG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_SYSCFG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_SYSCFG_H /**************************************************************************************************** * Included Files @@ -188,4 +188,4 @@ /* There is one bit per SRAM2 page (32 to 63) */ #endif /* CONFIG_STM32L4_STM32L4X6 */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_SYSCFG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_SYSCFG_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4xrxx_dbgmcu.h b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_dbgmcu.h similarity index 96% rename from arch/arm/src/stm32l4/chip/stm32l4xrxx_dbgmcu.h rename to arch/arm/src/stm32l4/hardware/stm32l4xrxx_dbgmcu.h index fdc5a54cee..2e92797159 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4xrxx_dbgmcu.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_dbgmcu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4xrxx_dbgmcu.h + * arch/arm/src/stm32l4/hardware/stm32l4xrxx_dbgmcu.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_DBGMCU_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_DBGMCU_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_DBGMCU_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_DBGMCU_H /**************************************************************************** * Included Files @@ -110,4 +110,4 @@ #define DBGMCU_APB2_TIM16STOP (1 << 17) /* Bit 17: TIM16 stopped when core is halted */ #define DBGMCU_APB2_TIM17STOP (1 << 18) /* Bit 18: TIM17 stopped when core is halted */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXXDBGMCU_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXXDBGMCU_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4xrxx_dma.h b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_dma.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4xrxx_dma.h rename to arch/arm/src/stm32l4/hardware/stm32l4xrxx_dma.h index c0bba35c67..2c82fd4eb3 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4xrxx_dma.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_dma.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4xrxx_dma.h + * arch/arm/src/stm32l4/hardware/stm32l4xrxx_dma.h * * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_DMA_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_DMA_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_DMA_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_DMA_H /************************************************************************************ * Pre-processor Definitions @@ -504,4 +504,4 @@ #define DMACHAN_LPUART_RX DMACHAN_SETTING(STM32L4_DMA2_CHAN7, 4) #define DMACHAN_LPUART_TX DMACHAN_SETTING(STM32L4_DMA2_CHAN6, 4) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_DMA_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_DMA_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4xrxx_firewall.h b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_firewall.h similarity index 94% rename from arch/arm/src/stm32l4/chip/stm32l4xrxx_firewall.h rename to arch/arm/src/stm32l4/hardware/stm32l4xrxx_firewall.h index 07714edc87..f16208cdc0 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4xrxx_firewall.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_firewall.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4xrxx_firewall.h + * arch/arm/src/stm32l4/hardware/stm32l4xrxx_firewall.h * * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_FIREWALL_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_FIREWALL_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_FIREWALL_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_FIREWALL_H /************************************************************************************ * Included Files @@ -107,4 +107,4 @@ #define FIREWALL_CR_VDS (1 << 1) /* Bit 1: Volatile data shared */ #define FIREWALL_CR_VDE (1 << 2) /* Bit 2: Volatile data execution */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_FIREWALL_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_FIREWALL_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4xrxx_pinmap.h b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_pinmap.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4xrxx_pinmap.h rename to arch/arm/src/stm32l4/hardware/stm32l4xrxx_pinmap.h index af862623df..6e64725f82 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4xrxx_pinmap.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/stm32l4/chip/stm32l4xrxx_pinmap.h + * arch/arm/src/stm32l4/hardware/stm32l4xrxx_pinmap.h * * Copyright (C) 2015-2016 Sebastien Lorquet. All rights reserved. * Author: Sebastien Lorquet @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_PINMAP_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_PINMAP_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_PINMAP_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_PINMAP_H /************************************************************************************ * Included Files @@ -847,4 +847,4 @@ #define GPIO_LPUART1_RTS_DE_1 (GPIO_ALT|GPIO_AF8 |GPIO_PORTB|GPIO_PIN12) #define GPIO_LPUART1_RTS_DE_2 (GPIO_ALT|GPIO_AF8 |GPIO_PORTG|GPIO_PIN6) -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_PINMAP_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4xrxx_rcc.h b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h similarity index 99% rename from arch/arm/src/stm32l4/chip/stm32l4xrxx_rcc.h rename to arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h index 4168469ae9..49b080c6f1 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4xrxx_rcc.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_rcc.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4x6xx_rcc.h + * arch/arm/src/stm32l4/hardware/stm32l4x6xx_rcc.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Sebastien Lorquet. All rights reserved. @@ -36,8 +36,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_RCC_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_RCC_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_RCC_H /**************************************************************************************************** * Included Files @@ -863,4 +863,4 @@ #endif /* CONFIG_STM32L4_STM32L4XR */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_RCC_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_RCC_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4xrxx_syscfg.h b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_syscfg.h similarity index 98% rename from arch/arm/src/stm32l4/chip/stm32l4xrxx_syscfg.h rename to arch/arm/src/stm32l4/hardware/stm32l4xrxx_syscfg.h index f9142e4dad..d92924e240 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4xrxx_syscfg.h +++ b/arch/arm/src/stm32l4/hardware/stm32l4xrxx_syscfg.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/stm32l4/chip/stm32l4xrxx_syscfg.h + * arch/arm/src/stm32l4/hardware/stm32l4xrxx_syscfg.h * * Copyright (C) 2014-2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_SYSCFG_H -#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_SYSCFG_H +#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_SYSCFG_H +#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_SYSCFG_H /**************************************************************************************************** * Included Files @@ -190,4 +190,4 @@ /* There is one bit per SRAM2 page (32 to 63) */ #endif /* CONFIG_STM32L4_STM32L4XR */ -#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4XRXX_SYSCFG_H */ +#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4XRXX_SYSCFG_H */ diff --git a/arch/arm/src/stm32l4/stm32l4_adc.h b/arch/arm/src/stm32l4/stm32l4_adc.h index d75aad0d39..bd03f3669f 100644 --- a/arch/arm/src/stm32l4/stm32l4_adc.h +++ b/arch/arm/src/stm32l4/stm32l4_adc.h @@ -46,7 +46,7 @@ #include #include #include "chip.h" -#include "chip/stm32l4_adc.h" +#include "hardware/stm32l4_adc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_can.h b/arch/arm/src/stm32l4/stm32l4_can.h index 53aeea817d..a493743bc4 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.h +++ b/arch/arm/src/stm32l4/stm32l4_can.h @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/stm32l4_can.h" +#include "hardware/stm32l4_can.h" #include diff --git a/arch/arm/src/stm32l4/stm32l4_comp.h b/arch/arm/src/stm32l4/stm32l4_comp.h index 36cbcfc6c1..939b983140 100644 --- a/arch/arm/src/stm32l4/stm32l4_comp.h +++ b/arch/arm/src/stm32l4/stm32l4_comp.h @@ -44,7 +44,7 @@ #include -#include "chip/stm32l4_comp.h" +#include "hardware/stm32l4_comp.h" /************************************************************************************ * Public Types diff --git a/arch/arm/src/stm32l4/stm32l4_dac.h b/arch/arm/src/stm32l4/stm32l4_dac.h index b6e370f0e0..3886724599 100644 --- a/arch/arm/src/stm32l4/stm32l4_dac.h +++ b/arch/arm/src/stm32l4/stm32l4_dac.h @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/stm32l4_dac.h" +#include "hardware/stm32l4_dac.h" #include diff --git a/arch/arm/src/stm32l4/stm32l4_dbgmcu.h b/arch/arm/src/stm32l4/stm32l4_dbgmcu.h index e698354b9e..2dbb6792b7 100644 --- a/arch/arm/src/stm32l4/stm32l4_dbgmcu.h +++ b/arch/arm/src/stm32l4/stm32l4_dbgmcu.h @@ -46,13 +46,13 @@ #include "chip.h" #if defined(CONFIG_STM32L4_STM32L4X3) -# include "chip/stm32l4x3xx_dbgmcu.h" +# include "hardware/stm32l4x3xx_dbgmcu.h" #elif defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_dbgmcu.h" +# include "hardware/stm32l4x5xx_dbgmcu.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_dbgmcu.h" +# include "hardware/stm32l4x6xx_dbgmcu.h" #elif defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4xrxx_dbgmcu.h" +# include "hardware/stm32l4xrxx_dbgmcu.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_dfsdm.h b/arch/arm/src/stm32l4/stm32l4_dfsdm.h index b751f18776..ed53a89199 100644 --- a/arch/arm/src/stm32l4/stm32l4_dfsdm.h +++ b/arch/arm/src/stm32l4/stm32l4_dfsdm.h @@ -43,7 +43,7 @@ #include #include #include "chip.h" -#include "chip/stm32l4_dfsdm.h" +#include "hardware/stm32l4_dfsdm.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_dma.h b/arch/arm/src/stm32l4/stm32l4_dma.h index 06f4210f35..be5dc34fad 100644 --- a/arch/arm/src/stm32l4/stm32l4_dma.h +++ b/arch/arm/src/stm32l4/stm32l4_dma.h @@ -50,13 +50,13 @@ /* Include the correct DMA register definitions for this STM32 family */ #if defined(CONFIG_STM32L4_STM32L4X3) -# include "chip/stm32l4x3xx_dma.h" +# include "hardware/stm32l4x3xx_dma.h" #elif defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_dma.h" +# include "hardware/stm32l4x5xx_dma.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_dma.h" +# include "hardware/stm32l4x6xx_dma.h" #elif defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4xrxx_dma.h" +# include "hardware/stm32l4xrxx_dma.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_exti.h b/arch/arm/src/stm32l4/stm32l4_exti.h index d50e9e48a6..49a8fe3206 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti.h +++ b/arch/arm/src/stm32l4/stm32l4_exti.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/stm32l4_exti.h" +#include "hardware/stm32l4_exti.h" /************************************************************************************ * Public Data diff --git a/arch/arm/src/stm32l4/stm32l4_exti_comp.c b/arch/arm/src/stm32l4/stm32l4_exti_comp.c index 6cc2d8048d..e4cb7e15d1 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti_comp.c +++ b/arch/arm/src/stm32l4/stm32l4_exti_comp.c @@ -45,7 +45,7 @@ #include "up_arch.h" #include "stm32l4_comp.h" #include "stm32l4_exti.h" -#include "chip/stm32l4_exti.h" +#include "hardware/stm32l4_exti.h" /**************************************************************************** * Private Types diff --git a/arch/arm/src/stm32l4/stm32l4_firewall.c b/arch/arm/src/stm32l4/stm32l4_firewall.c index 810acfd3f1..30378c858f 100644 --- a/arch/arm/src/stm32l4/stm32l4_firewall.c +++ b/arch/arm/src/stm32l4/stm32l4_firewall.c @@ -44,7 +44,7 @@ #include #include "up_arch.h" -#include "chip/stm32l4_syscfg.h" +#include "hardware/stm32l4_syscfg.h" #include "stm32l4_firewall.h" diff --git a/arch/arm/src/stm32l4/stm32l4_firewall.h b/arch/arm/src/stm32l4/stm32l4_firewall.h index 3f8f585acf..7ef3a19a21 100644 --- a/arch/arm/src/stm32l4/stm32l4_firewall.h +++ b/arch/arm/src/stm32l4/stm32l4_firewall.h @@ -48,13 +48,13 @@ /* Include the correct firewall register definitions for this STM32L4 family */ #if defined(CONFIG_STM32L4_STM32L4X3) -# include "chip/stm32l4x3xx_firewall.h" +# include "hardware/stm32l4x3xx_firewall.h" #elif defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_firewall.h" +# include "hardware/stm32l4x5xx_firewall.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_firewall.h" +# include "hardware/stm32l4x6xx_firewall.h" #elif defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4xrxx_firewall.h" +# include "hardware/stm32l4xrxx_firewall.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_flash.h b/arch/arm/src/stm32l4/stm32l4_flash.h index 6316232cab..b33c28704b 100644 --- a/arch/arm/src/stm32l4/stm32l4_flash.h +++ b/arch/arm/src/stm32l4/stm32l4_flash.h @@ -43,7 +43,7 @@ ************************************************************************************/ #include -#include "chip/stm32l4_flash.h" +#include "hardware/stm32l4_flash.h" /************************************************************************************ * Public Functions diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.c b/arch/arm/src/stm32l4/stm32l4_gpio.c index a33b88c08f..8715b90574 100644 --- a/arch/arm/src/stm32l4/stm32l4_gpio.c +++ b/arch/arm/src/stm32l4/stm32l4_gpio.c @@ -55,7 +55,7 @@ #include "chip.h" #include "stm32l4_gpio.h" -#include "chip/stm32l4_syscfg.h" +#include "hardware/stm32l4_syscfg.h" /**************************************************************************** * Public Data diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.h b/arch/arm/src/stm32l4/stm32l4_gpio.h index d9c20e67ca..c7ceb75a62 100644 --- a/arch/arm/src/stm32l4/stm32l4_gpio.h +++ b/arch/arm/src/stm32l4/stm32l4_gpio.h @@ -56,7 +56,7 @@ #if defined(CONFIG_STM32L4_STM32L4X3) || defined(CONFIG_STM32L4_STM32L4X5) || \ defined(CONFIG_STM32L4_STM32L4X6) || defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4_gpio.h" +# include "hardware/stm32l4_gpio.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_hsi48.c b/arch/arm/src/stm32l4/stm32l4_hsi48.c index 80ab3450fb..527076c1ae 100644 --- a/arch/arm/src/stm32l4/stm32l4_hsi48.c +++ b/arch/arm/src/stm32l4/stm32l4_hsi48.c @@ -41,8 +41,8 @@ #include "up_arch.h" #include "chip.h" -#include "chip/stm32l4_rcc.h" -#include "chip/stm32l4_crs.h" +#include "hardware/stm32l4_rcc.h" +#include "hardware/stm32l4_crs.h" #include "stm32l4_hsi48.h" diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.h b/arch/arm/src/stm32l4/stm32l4_i2c.h index 3a38cc14bd..6a88b0b97d 100644 --- a/arch/arm/src/stm32l4/stm32l4_i2c.h +++ b/arch/arm/src/stm32l4/stm32l4_i2c.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/stm32l4_i2c.h" +#include "hardware/stm32l4_i2c.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_iwdg.c b/arch/arm/src/stm32l4/stm32l4_iwdg.c index bfabd4bb52..3c2a152c55 100644 --- a/arch/arm/src/stm32l4/stm32l4_iwdg.c +++ b/arch/arm/src/stm32l4/stm32l4_iwdg.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "stm32l4_rcc.h" -#include "chip/stm32l4_dbgmcu.h" +#include "hardware/stm32l4_dbgmcu.h" #include "stm32l4_wdg.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32L4_IWDG) diff --git a/arch/arm/src/stm32l4/stm32l4_lptim.h b/arch/arm/src/stm32l4/stm32l4_lptim.h index 90e0cb0d3b..150b20fcc3 100644 --- a/arch/arm/src/stm32l4/stm32l4_lptim.h +++ b/arch/arm/src/stm32l4/stm32l4_lptim.h @@ -78,7 +78,7 @@ #include #include "chip.h" -#include "chip/stm32l4_lptim.h" +#include "hardware/stm32l4_lptim.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_otgfs.h b/arch/arm/src/stm32l4/stm32l4_otgfs.h index da4e6673cd..bb3122de77 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfs.h +++ b/arch/arm/src/stm32l4/stm32l4_otgfs.h @@ -50,9 +50,9 @@ #if defined(CONFIG_STM32L4_OTGFS) #if defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_otgfs.h" +# include "hardware/stm32l4x5xx_otgfs.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_otgfs.h" +# include "hardware/stm32l4x6xx_otgfs.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.h b/arch/arm/src/stm32l4/stm32l4_pwm.h index ff98f6e509..2abe8be255 100644 --- a/arch/arm/src/stm32l4/stm32l4_pwm.h +++ b/arch/arm/src/stm32l4/stm32l4_pwm.h @@ -104,7 +104,7 @@ defined(CONFIG_STM32L4_TIM17_PWM) #include -#include "chip/stm32l4_tim.h" +#include "hardware/stm32l4_tim.h" #ifdef CONFIG_PWM_MULTICHAN diff --git a/arch/arm/src/stm32l4/stm32l4_pwr.h b/arch/arm/src/stm32l4/stm32l4_pwr.h index 77d87b3dfe..e709a3f733 100644 --- a/arch/arm/src/stm32l4/stm32l4_pwr.h +++ b/arch/arm/src/stm32l4/stm32l4_pwr.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/stm32l4_pwr.h" +#include "hardware/stm32l4_pwr.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index d240968ad1..b3bb57c76a 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -66,8 +66,8 @@ #include "stm32l4_dma.h" #include "stm32l4_qspi.h" #include "stm32l4_rcc.h" -#include "chip/stm32l4_qspi.h" -#include "chip/stm32l4_pinmap.h" +#include "hardware/stm32l4_qspi.h" +#include "hardware/stm32l4_pinmap.h" #ifdef CONFIG_STM32L4_QSPI diff --git a/arch/arm/src/stm32l4/stm32l4_rcc.h b/arch/arm/src/stm32l4/stm32l4_rcc.h index 0909a1d6be..360a686da6 100644 --- a/arch/arm/src/stm32l4/stm32l4_rcc.h +++ b/arch/arm/src/stm32l4/stm32l4_rcc.h @@ -46,13 +46,13 @@ #include "chip.h" #if defined(CONFIG_STM32L4_STM32L4X3) -# include "chip/stm32l4x3xx_rcc.h" +# include "hardware/stm32l4x3xx_rcc.h" #elif defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_rcc.h" +# include "hardware/stm32l4x5xx_rcc.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_rcc.h" +# include "hardware/stm32l4x6xx_rcc.h" #elif defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4xrxx_rcc.h" +# include "hardware/stm32l4xrxx_rcc.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c index 45cf33ae6b..84b6fdd5ff 100644 --- a/arch/arm/src/stm32l4/stm32l4_rng.c +++ b/arch/arm/src/stm32l4/stm32l4_rng.c @@ -52,7 +52,7 @@ #include #include "up_arch.h" -#include "chip/stm32l4_rng.h" +#include "hardware/stm32l4_rng.h" #include "up_internal.h" #if defined(CONFIG_STM32L4_RNG) diff --git a/arch/arm/src/stm32l4/stm32l4_rtc.h b/arch/arm/src/stm32l4/stm32l4_rtc.h index 51c0e51dae..bb43de875e 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtc.h +++ b/arch/arm/src/stm32l4/stm32l4_rtc.h @@ -48,7 +48,7 @@ #include "chip.h" -#include "chip/stm32l4_rtcc.h" +#include "hardware/stm32l4_rtcc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_sai.h b/arch/arm/src/stm32l4/stm32l4_sai.h index b1b4955185..8f6bab98a9 100644 --- a/arch/arm/src/stm32l4/stm32l4_sai.h +++ b/arch/arm/src/stm32l4/stm32l4_sai.h @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/stm32l4_sai.h" +#include "hardware/stm32l4_sai.h" #include diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.h b/arch/arm/src/stm32l4/stm32l4_sdmmc.h index 0882acbb74..8ebe679328 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.h +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.h @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "chip/stm32l4_sdmmc.h" +#include "hardware/stm32l4_sdmmc.h" /************************************************************************************ diff --git a/arch/arm/src/stm32l4/stm32l4_spi.h b/arch/arm/src/stm32l4/stm32l4_spi.h index 5d9f74db70..f554086058 100644 --- a/arch/arm/src/stm32l4/stm32l4_spi.h +++ b/arch/arm/src/stm32l4/stm32l4_spi.h @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/stm32l4_spi.h" +#include "hardware/stm32l4_spi.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_tim.h b/arch/arm/src/stm32l4/stm32l4_tim.h index 0caf411cf1..b5b939051b 100644 --- a/arch/arm/src/stm32l4/stm32l4_tim.h +++ b/arch/arm/src/stm32l4/stm32l4_tim.h @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "chip/stm32l4_tim.h" +#include "hardware/stm32l4_tim.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_uart.h b/arch/arm/src/stm32l4/stm32l4_uart.h index 5c5b381530..4948b90c63 100644 --- a/arch/arm/src/stm32l4/stm32l4_uart.h +++ b/arch/arm/src/stm32l4/stm32l4_uart.h @@ -47,7 +47,7 @@ #if defined(CONFIG_STM32L4_STM32L4X3) || defined(CONFIG_STM32L4_STM32L4X5) || \ defined(CONFIG_STM32L4_STM32L4X6) || defined(CONFIG_STM32L4_STM32L4XR) -# include "chip/stm32l4_uart.h" +# include "hardware/stm32l4_uart.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_uid.c b/arch/arm/src/stm32l4/stm32l4_uid.c index 4547dcc456..007d007623 100644 --- a/arch/arm/src/stm32l4/stm32l4_uid.c +++ b/arch/arm/src/stm32l4/stm32l4_uid.c @@ -40,8 +40,7 @@ #include -#include - +#include "hardware/stm32l4_memorymap.h" #include "stm32l4_uid.h" #ifdef STM32L4_SYSMEM_UID diff --git a/arch/arm/src/stm32l4/stm32l4_usbdev.h b/arch/arm/src/stm32l4/stm32l4_usbdev.h index 281d992dae..08b9220041 100644 --- a/arch/arm/src/stm32l4/stm32l4_usbdev.h +++ b/arch/arm/src/stm32l4/stm32l4_usbdev.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/stm32l4_usbdev.h" +#include "hardware/stm32l4_usbdev.h" /************************************************************************************ * Public Functions diff --git a/arch/arm/src/stm32l4/stm32l4_usbhost.h b/arch/arm/src/stm32l4/stm32l4_usbhost.h index 6c695ece1f..27280620d3 100644 --- a/arch/arm/src/stm32l4/stm32l4_usbhost.h +++ b/arch/arm/src/stm32l4/stm32l4_usbhost.h @@ -51,9 +51,9 @@ #if defined(CONFIG_STM32L4_OTGFS) && defined(CONFIG_USBHOST) #if defined(CONFIG_STM32L4_STM32L4X5) -# include "chip/stm32l4x5xx_otgfs.h" +# include "hardware/stm32l4x5xx_otgfs.h" #elif defined(CONFIG_STM32L4_STM32L4X6) -# include "chip/stm32l4x6xx_otgfs.h" +# include "hardware/stm32l4x6xx_otgfs.h" #else # error "Unsupported STM32L4 chip" #endif diff --git a/arch/arm/src/stm32l4/stm32l4_wdg.h b/arch/arm/src/stm32l4/stm32l4_wdg.h index 0d2b003253..c78f337b53 100644 --- a/arch/arm/src/stm32l4/stm32l4_wdg.h +++ b/arch/arm/src/stm32l4/stm32l4_wdg.h @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/stm32l4_wdg.h" +#include "hardware/stm32l4_wdg.h" #ifdef CONFIG_WATCHDOG diff --git a/configs/nucleo-l432kc/src/stm32_dac7571.c b/configs/nucleo-l432kc/src/stm32_dac7571.c index 2eb48366e8..c51cec7d42 100644 --- a/configs/nucleo-l432kc/src/stm32_dac7571.c +++ b/configs/nucleo-l432kc/src/stm32_dac7571.c @@ -1,129 +1,129 @@ -/************************************************************************************ - * configs/nucleo-l432kc/src/stm32_dac7571.c - * - * Copyright (C) 2018 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ************************************************************************************/ - -/************************************************************************************ - * Included Files - ************************************************************************************/ - -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#if defined(CONFIG_I2C) && defined(CONFIG_STM32L4_I2C1) && defined(CONFIG_DAC7571) - -/************************************************************************************ - * Preprocessor definitions - ************************************************************************************/ - -#if !defined(CONFIG_DAC7571_ADDR) -# define CONFIG_DAC7571_ADDR 0x4C /* A0 tied to ground */ -#endif - -/************************************************************************************ - * Private Data - ************************************************************************************/ - -static struct dac_dev_s *g_dac; - -/************************************************************************************ - * Public Functions - ************************************************************************************/ - -/************************************************************************************ - * Name: stm32_dac7571initialize - * - * Description: - * Initialize and register the DAC7571 DAC driver. - * - * Input Parameters: - * devpath - The full path to the driver to register. E.g., "/dev/dac0" - * - * Returned Value: - * Zero (OK) on success; a negated errno value on failure. - * - ************************************************************************************/ - -int stm32_dac7571initialize(FAR const char *devpath) -{ - FAR struct i2c_master_s *i2c; - int ret; - - /* Configure D4(PA5) and D5(PA6) as input floating */ - - stm32l4_configgpio(GPIO_I2C1_D4); - stm32l4_configgpio(GPIO_I2C1_D5); - - /* Get an instance of the I2C1 interface */ - - i2c = stm32l4_i2cbus_initialize(1); - if (!i2c) - { - return -ENODEV; - } - - /* Then initialize and register DAC7571 */ - - g_dac = dac7571_initialize(i2c, CONFIG_DAC7571_ADDR); - if (!g_dac) - { - ret = -ENODEV; - goto error; - } - - ret = dac_register(devpath, g_dac); - if (ret < 0) - { - aerr("ERROR: dac_register failed: %d\n", ret); - goto error; - } - - return OK; - -error: - (void)stm32l4_i2cbus_uninitialize(i2c); - return ret; -} - -#endif /* defined(CONFIG_I2C) && defined(CONFIG_STM32_I2C1) && defined(CONFIG_DAC7571) */ +/************************************************************************************ + * configs/nucleo-l432kc/src/stm32_dac7571.c + * + * Copyright (C) 2018 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include +#include +#include +#include + +#include +#include +#include + +#include "chip.h" +#include + +#if defined(CONFIG_I2C) && defined(CONFIG_STM32L4_I2C1) && defined(CONFIG_DAC7571) + +/************************************************************************************ + * Preprocessor definitions + ************************************************************************************/ + +#if !defined(CONFIG_DAC7571_ADDR) +# define CONFIG_DAC7571_ADDR 0x4C /* A0 tied to ground */ +#endif + +/************************************************************************************ + * Private Data + ************************************************************************************/ + +static struct dac_dev_s *g_dac; + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: stm32_dac7571initialize + * + * Description: + * Initialize and register the DAC7571 DAC driver. + * + * Input Parameters: + * devpath - The full path to the driver to register. E.g., "/dev/dac0" + * + * Returned Value: + * Zero (OK) on success; a negated errno value on failure. + * + ************************************************************************************/ + +int stm32_dac7571initialize(FAR const char *devpath) +{ + FAR struct i2c_master_s *i2c; + int ret; + + /* Configure D4(PA5) and D5(PA6) as input floating */ + + stm32l4_configgpio(GPIO_I2C1_D4); + stm32l4_configgpio(GPIO_I2C1_D5); + + /* Get an instance of the I2C1 interface */ + + i2c = stm32l4_i2cbus_initialize(1); + if (!i2c) + { + return -ENODEV; + } + + /* Then initialize and register DAC7571 */ + + g_dac = dac7571_initialize(i2c, CONFIG_DAC7571_ADDR); + if (!g_dac) + { + ret = -ENODEV; + goto error; + } + + ret = dac_register(devpath, g_dac); + if (ret < 0) + { + aerr("ERROR: dac_register failed: %d\n", ret); + goto error; + } + + return OK; + +error: + (void)stm32l4_i2cbus_uninitialize(i2c); + return ret; +} + +#endif /* defined(CONFIG_I2C) && defined(CONFIG_STM32_I2C1) && defined(CONFIG_DAC7571) */ diff --git a/configs/nucleo-l432kc/src/stm32_ina226.c b/configs/nucleo-l432kc/src/stm32_ina226.c index f008017b47..263acf8a04 100644 --- a/configs/nucleo-l432kc/src/stm32_ina226.c +++ b/configs/nucleo-l432kc/src/stm32_ina226.c @@ -48,7 +48,7 @@ #include #include -#include +#include "chip.h" #include #if defined(CONFIG_I2C) && defined(CONFIG_STM32L4_I2C1) && defined(CONFIG_SENSORS_INA226) diff --git a/configs/nucleo-l432kc/src/stm32_spi.c b/configs/nucleo-l432kc/src/stm32_spi.c index 77599af814..396735148d 100644 --- a/configs/nucleo-l432kc/src/stm32_spi.c +++ b/configs/nucleo-l432kc/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include "chip.h" #include #include "nucleo-l432kc.h" diff --git a/configs/nucleo-l452re/src/stm32_spi.c b/configs/nucleo-l452re/src/stm32_spi.c index 70c0642452..2748508730 100644 --- a/configs/nucleo-l452re/src/stm32_spi.c +++ b/configs/nucleo-l452re/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include +#include "chip.h" #include #include "nucleo-l452re.h" diff --git a/configs/nucleo-l476rg/src/stm32_ajoystick.c b/configs/nucleo-l476rg/src/stm32_ajoystick.c index 2daeaf01db..e1f825fae4 100644 --- a/configs/nucleo-l476rg/src/stm32_ajoystick.c +++ b/configs/nucleo-l476rg/src/stm32_ajoystick.c @@ -50,7 +50,7 @@ #include "stm32l4_gpio.h" #include "stm32l4_adc.h" -#include "chip/stm32l4_adc.h" +#include "hardware/stm32l4_adc.h" #include "nucleo-l476rg.h" /**************************************************************************** diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c index 48e90e9f3d..205104b105 100644 --- a/configs/nucleo-l476rg/src/stm32_spi.c +++ b/configs/nucleo-l476rg/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include "chip.h" #include #include "nucleo-l476rg.h" diff --git a/configs/stm32l476-mdk/src/stm32_spi.c b/configs/stm32l476-mdk/src/stm32_spi.c index ae13e9e59d..d40b8ad381 100644 --- a/configs/stm32l476-mdk/src/stm32_spi.c +++ b/configs/stm32l476-mdk/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include "chip.h" #include #include "stm32l476-mdk.h" diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c index 38c71247a9..096615102b 100644 --- a/configs/stm32l476vg-disco/src/stm32_spi.c +++ b/configs/stm32l476vg-disco/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include "chip.h" #include #include "stm32l476vg-disco.h" diff --git a/configs/stm32l4r9ai-disco/src/stm32_spi.c b/configs/stm32l4r9ai-disco/src/stm32_spi.c index bb62454e77..b57b9cc71d 100644 --- a/configs/stm32l4r9ai-disco/src/stm32_spi.c +++ b/configs/stm32l4r9ai-disco/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include "chip.h" #include #include "stm32l4r9ai-disco.h"