sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32 L4: More SPI clean-up. Lower case replacements.

Browse Source
This commit is contained in:
Sebastien Lorquet 2017-03-28 08:58:43 -06:00 committed by Gregory Nutt
parent 45a0af8c03
commit db8b38f848
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
configs/nucleo-l476rg/src/stm32_spi.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/nucleo-l476rg/src/stm32_spi.c * configs/nucleo-l476rg/src/stm32l4_spi.c
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -72,7 +72,7 @@ struct spi_dev_s *g_spi2;
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: stm32_spiinitialize * Name: stm32l4_spiinitialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the Nucleo-F401RE and * Called to configure SPI chip select GPIO pins for the Nucleo-F401RE and
@ -80,7 +80,7 @@ struct spi_dev_s *g_spi2;
* *
************************************************************************************/ ************************************************************************************/
void weak_function stm32_spiinitialize(void) void weak_function stm32l4_spiinitialize(void)
{ {
#ifdef CONFIG_STM32L4_SPI1 #ifdef CONFIG_STM32L4_SPI1
/* Configure SPI-based devices */ /* Configure SPI-based devices */
@ -92,11 +92,11 @@ void weak_function stm32_spiinitialize(void)
} }
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
stm32_configgpio(GPIO_SPI_CS_WIFI); stm32l4_configgpio(GPIO_SPI_CS_WIFI);
#endif #endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD
stm32_configgpio(GPIO_SPI_CS_SD_CARD); stm32l4_configgpio(GPIO_SPI_CS_SD_CARD);
#endif #endif
#endif #endif
@ -108,27 +108,27 @@ void weak_function stm32_spiinitialize(void)
/* Setup CS, EN & IRQ line IOs */ /* Setup CS, EN & IRQ line IOs */
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
stm32_configgpio(GPIO_WIFI_CS); stm32l4_configgpio(GPIO_WIFI_CS);
stm32_configgpio(GPIO_WIFI_EN); stm32l4_configgpio(GPIO_WIFI_EN);
stm32_configgpio(GPIO_WIFI_INT); stm32l4_configgpio(GPIO_WIFI_INT);
#endif #endif
#endif #endif
} }
/**************************************************************************** /****************************************************************************
* Name: stm32_spi1/2/3select and stm32_spi1/2/3status * Name: stm32l4_spi1/2/3select and stm32l4_spi1/2/3status
* *
* Description: * Description:
* The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * The external functions, stm32l4_spi1/2/3select and stm32l4_spi1/2/3status must be
* provided by board-specific logic. They are implementations of the select * provided by board-specific logic. They are implementations of the select
* and status methods of the SPI interface defined by struct spi_ops_s (see * and status methods of the SPI interface defined by struct spi_ops_s (see
* include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
* are provided by common STM32 logic. To use this common SPI logic on your * are provided by common STM32 logic. To use this common SPI logic on your
* board: * board:
* *
* 1. Provide logic in stm32_boardinitialize() to configure SPI chip select * 1. Provide logic in stm32l4_boardinitialize() to configure SPI chip select
* pins. * pins.
* 2. Provide stm32_spi1/2/3select() and stm32_spi1/2/3status() functions in your * 2. Provide stm32l4_spi1/2/3select() and stm32l4_spi1/2/3status() functions in your
* board-specific logic. These functions will perform chip selection and * board-specific logic. These functions will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 3. Add a calls to up_spiinitialize() in your low level application * 3. Add a calls to up_spiinitialize() in your low level application
@ -141,64 +141,64 @@ void weak_function stm32_spiinitialize(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32L4_SPI1 #ifdef CONFIG_STM32L4_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void stm32l4_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS) if (devid == SPIDEV_WIRELESS)
{ {
stm32_gpiowrite(GPIO_SPI_CS_WIFI, !selected); stm32l4_gpiowrite(GPIO_SPI_CS_WIFI, !selected);
} }
else else
#endif #endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD
if (devid == SPIDEV_MMCSD) if (devid == SPIDEV_MMCSD)
{ {
stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected); stm32l4_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected);
} }
#endif #endif
} }
uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
return 0; return 0;
} }
#endif #endif
#ifdef CONFIG_STM32L4_SPI2 #ifdef CONFIG_STM32L4_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void stm32l4_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS) if (devid == SPIDEV_WIRELESS)
{ {
stm32_gpiowrite(GPIO_WIFI_CS, !selected); stm32l4_gpiowrite(GPIO_WIFI_CS, !selected);
} }
#endif #endif
} }
uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
return 0; return 0;
} }
#endif #endif
#ifdef CONFIG_STM32L4_SPI3 #ifdef CONFIG_STM32L4_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void stm32l4_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
} }
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
return 0; return 0;
} }
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: stm32_spi1cmddata * Name: stm32l4_spi1cmddata
* *
* Description: * Description:
* Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true) * Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true)
@ -222,21 +222,21 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
#ifdef CONFIG_STM32L4_SPI1 #ifdef CONFIG_STM32L4_SPI1
int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
{ {
return OK; return OK;
} }
#endif #endif
#ifdef CONFIG_STM32L4_SPI2 #ifdef CONFIG_STM32L4_SPI2
int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
{ {
return OK; return OK;
} }
#endif #endif
#ifdef CONFIG_STM32L4_SPI3 #ifdef CONFIG_STM32L4_SPI3
int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
{ {
return OK; return OK;
} }