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

stm3fl476-disco: Fix some incomplete removal of CC3000 logic.

Browse Source
This commit is contained in:
Gregory Nutt 2018-04-04 13:56:52 -06:00
parent af5bcc0c13
commit 318c7e11c3
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configs/stm32l476vg-disco/src/stm32_spi.c
View File

@ -61,11 +61,9 @@
/* Global driver instances */ /* Global driver instances */
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
xxx
struct spi_dev_s *g_spi1; struct spi_dev_s *g_spi1;
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32_SPI2
yyy
struct spi_dev_s *g_spi2; struct spi_dev_s *g_spi2;
#endif #endif
@ -85,7 +83,7 @@ struct spi_dev_s *g_spi2;
void weak_function stm32_spiinitialize(void) void weak_function stm32_spiinitialize(void)
{ {
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
/* Configure SPI-based devices */ /* Configure SPI-based devices on SPI1 */
g_spi1 = up_spiinitialize(1); g_spi1 = up_spiinitialize(1);
if (!g_spi1) if (!g_spi1)
@ -99,7 +97,7 @@ void weak_function stm32_spiinitialize(void)
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32_SPI2
/* Configure SPI-based devices */ /* Configure SPI-based devices on SPI2 */
g_spi2 = up_spiinitialize(2); g_spi2 = up_spiinitialize(2);
if (!g_spi2) if (!g_spi2)
@ -139,12 +137,6 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t 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");
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_SPI_CS_WIFI, !selected);
}
else
#endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD
if (devid == SPIDEV_MMCSD(0)) if (devid == SPIDEV_MMCSD(0))
{ {