Nucleo L476RG: More naming fixes.

This commit is contained in:
Sebastien Lorquet 2017-03-29 07:16:27 -06:00 committed by Gregory Nutt
parent 5577f58458
commit 28e74ec058
3 changed files with 21 additions and 21 deletions

View File

@ -71,7 +71,7 @@
# undef HAVE_RTC_DRIVER # undef HAVE_RTC_DRIVER
#endif #endif
#if !defined(CONFIG_STM32_SDIO) || !defined(CONFIG_MMCSD) || \ #if !defined(CONFIG_STM32L4_SDIO) || !defined(CONFIG_MMCSD) || \
!defined(CONFIG_MMCSD_SDIO) !defined(CONFIG_MMCSD_SDIO)
# undef HAVE_MMCSD # undef HAVE_MMCSD
#endif #endif
@ -293,10 +293,10 @@
/* Global driver instances */ /* Global driver instances */
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32L4_SPI1
extern struct spi_dev_s *g_spi1; extern struct spi_dev_s *g_spi1;
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32L4_SPI2
extern struct spi_dev_s *g_spi2; extern struct spi_dev_s *g_spi2;
#endif #endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD
@ -308,27 +308,27 @@ extern struct sdio_dev_s *g_sdio;
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: stm32_spiinitialize * Name: stm32l4_spiinitialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins. * Called to configure SPI chip select GPIO pins.
* *
************************************************************************************/ ************************************************************************************/
void stm32_spiinitialize(void); void stm32l4_spiinitialize(void);
/************************************************************************************ /************************************************************************************
* Name: stm32_usbinitialize * Name: stm32l4_usbinitialize
* *
* Description: * Description:
* Called to setup USB-related GPIO pins. * Called to setup USB-related GPIO pins.
* *
************************************************************************************/ ************************************************************************************/
void stm32_usbinitialize(void); void stm32l4_usbinitialize(void);
/************************************************************************************ /************************************************************************************
* Name: stm32_pwm_setup * Name: stm32l4_pwm_setup
* *
* Description: * Description:
* Initialize PWM and register the PWM device. * Initialize PWM and register the PWM device.
@ -336,11 +336,11 @@ void stm32_usbinitialize(void);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_PWM #ifdef CONFIG_PWM
int stm32_pwm_setup(void); int stm32l4_pwm_setup(void);
#endif #endif
/************************************************************************************ /************************************************************************************
* Name: stm32_adc_setup * Name: stm32l4_adc_setup
* *
* Description: * Description:
* Initialize ADC and register the ADC driver. * Initialize ADC and register the ADC driver.
@ -348,7 +348,7 @@ int stm32_pwm_setup(void);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
int stm32_adc_setup(void); int stm32l4_adc_setup(void);
#endif #endif
/**************************************************************************** /****************************************************************************

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/nucleo-l476rg/src/stm32_appinit.c * configs/nucleo-l476rg/src/stm32l4_appinit.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -199,20 +199,20 @@ int board_app_initialize(uintptr_t arg)
#ifdef CONFIG_PWM #ifdef CONFIG_PWM
/* Initialize PWM and register the PWM device. */ /* Initialize PWM and register the PWM device. */
ret = stm32_pwm_setup(); ret = stm32l4_pwm_setup();
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret); syslog(LOG_ERR, "ERROR: stm32l4_pwm_setup() failed: %d\n", ret);
} }
#endif #endif
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
/* Initialize ADC and register the ADC driver. */ /* Initialize ADC and register the ADC driver. */
ret = stm32_adc_setup(); ret = stm32l4_adc_setup();
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR, "ERROR: stm32_adc_setup failed: %d\n", ret); syslog(LOG_ERR, "ERROR: stm32l4_adc_setup failed: %d\n", ret);
} }
#endif #endif

View File

@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/nucleo-l476rg/src/stm32_boot.c * configs/nucleo-l476rg/src/stm32l4_boot.c
* *
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -82,19 +82,19 @@ void stm32l4_boardinitialize(void)
#endif #endif
/* Configure SPI chip selects if 1) SP2 is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SP2 is not disabled, and 2) the weak function
* stm32_spiinitialize() has been brought into the link. * stm32l4_spiinitialize() has been brought into the link.
*/ */
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) #if defined(CONFIG_STM32L4_SPI1) || defined(CONFIG_STM32L4_SPI2) || defined(CONFIG_STM32L4_SPI3)
stm32l4_spiinitialize(); stm32l4_spiinitialize();
#endif #endif
/* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not
* disabled, and 3) the weak function stm32_usbinitialize() has been brought * disabled, and 3) the weak function stm32l4_usbinitialize() has been brought
* into the build. * into the build.
*/ */
#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB) #if defined(CONFIG_USBDEV) && defined(CONFIG_STM32L4_USB)
stm32l4_usbinitialize(); stm32l4_usbinitialize();
#endif #endif
} }