This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit fe64ed54b96ea574de487f7bb763ca2a33dcea6b Author: Alin Jerpelea <[email protected]> AuthorDate: Sun Mar 21 22:16:40 2021 +0100 boards: arm: stm32: fix Mixed case identifier Mixed case identifier fix to pass CI Signed-off-by: Alin Jerpelea <[email protected]> --- boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h | 6 +++--- boards/arm/stm32/olimexino-stm32/src/stm32_spi.c | 8 ++++---- boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h b/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h index 1fa4d01..30d4ebb 100644 --- a/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h +++ b/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h @@ -99,7 +99,7 @@ */ #define GPIO_USB_VBUS (GPIO_INPUT | GPIO_CNF_INFLOAT | GPIO_PORTC | GPIO_PIN11) -#define GPIO_USB_PULLUPn (GPIO_OUTPUT | GPIO_CNF_OUTPP | GPIO_MODE_50MHz | \ +#define GPIO_USB_PULLUPN (GPIO_OUTPUT | GPIO_CNF_OUTPP | GPIO_MODE_50MHz | \ GPIO_PORTC | GPIO_PIN12 | GPIO_OUTPUT_SET) /* SPI ********************************************************************** @@ -114,11 +114,11 @@ #define GPIO_SPI1_SSn (GPIO_OUTPUT | GPIO_CNF_OUTPP | GPIO_MODE_50MHz | \ GPIO_PORTC | GPIO_PIN9 | GPIO_OUTPUT_SET) -#define USER_CSn GPIO_SPI1_SSn +#define USER_CSN GPIO_SPI1_SSn #define GPIO_SPI2_SSn (GPIO_OUTPUT | GPIO_CNF_OUTPP | GPIO_MODE_50MHz | \ GPIO_PORTD | GPIO_PIN2 | GPIO_OUTPUT_SET) -#define MMCSD_CSn GPIO_SPI2_SSn +#define MMCSD_CSN GPIO_SPI2_SSn /**************************************************************************** * Public Types diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_spi.c b/boards/arm/stm32/olimexino-stm32/src/stm32_spi.c index f171a8e..fba745b 100644 --- a/boards/arm/stm32/olimexino-stm32/src/stm32_spi.c +++ b/boards/arm/stm32/olimexino-stm32/src/stm32_spi.c @@ -56,11 +56,11 @@ void weak_function stm32_spidev_initialize(void) /* Setup CS */ #ifdef CONFIG_STM32_SPI1 - stm32_configgpio(USER_CSn); + stm32_configgpio(USER_CSN); #endif #ifdef CONFIG_STM32_SPI2 - stm32_configgpio(MMCSD_CSn); + stm32_configgpio(MMCSD_CSN); #endif } @@ -98,7 +98,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, (int)devid, selected ? "assert" : "de-assert"); if (devid == SPIDEV_USER(0)) { - stm32_gpiowrite(USER_CSn, !selected); + stm32_gpiowrite(USER_CSN, !selected); } } @@ -117,7 +117,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, #if defined(CONFIG_MMCSD) if (devid == SPIDEV_MMCSD(0)) { - stm32_gpiowrite(MMCSD_CSn, !selected); + stm32_gpiowrite(MMCSD_CSN, !selected); } #endif } diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c b/boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c index 570de4d..9d922b6 100644 --- a/boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c +++ b/boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c @@ -79,7 +79,7 @@ void stm32_usbinitialize(void) /* USB Soft Connect Pullup */ - stm32_configgpio(GPIO_USB_PULLUPn); + stm32_configgpio(GPIO_USB_PULLUPN); } /**************************************************************************** @@ -98,7 +98,7 @@ void stm32_usbinitialize(void) int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) { usbtrace(TRACE_DEVPULLUP, (uint16_t)enable); - stm32_gpiowrite(GPIO_USB_PULLUPn, !enable); + stm32_gpiowrite(GPIO_USB_PULLUPN, !enable); return OK; }
