Spark: Certain combinations of conditional compilation results in compilation errors

This commit is contained in:
Gregory Nutt 2015-01-17 14:19:25 -06:00
parent 764b5075bc
commit 3a0812508b

View File

@ -157,14 +157,17 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_MTD_SST25)
if (devid == SPIDEV_FLASH)
{
stm32_gpiowrite(GPIO_MEM_CS, !selected);
}
if defined(CONFIG_WL_CC3000)
else
#endif
#endif
#if defined(CONFIG_WL_CC3000)
if (devid == SPIDEV_WIRELESS)