diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-17 14:36:16 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-17 14:36:16 -0600 |
| commit | ffb5807d85fcdbf26083043d172d82187403e7bb (patch) | |
| tree | 640e634d2993573b64ddcbdd104c2cd694c2a28a /nuttx | |
| parent | d6f6b0d751679da7be88486a71da4b579bc96771 (diff) | |
| parent | 31d1354a55cb564a0c9ea19082935fca07743ea1 (diff) | |
| download | px4-nuttx-ffb5807d85fcdbf26083043d172d82187403e7bb.tar.gz px4-nuttx-ffb5807d85fcdbf26083043d172d82187403e7bb.tar.bz2 px4-nuttx-ffb5807d85fcdbf26083043d172d82187403e7bb.zip | |
Merge remote-tracking branch 'origin/master' into ipv6
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/spark/src/up_spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nuttx/configs/spark/src/up_spi.c b/nuttx/configs/spark/src/up_spi.c index c24c2caeb..5c2492c23 100644 --- a/nuttx/configs/spark/src/up_spi.c +++ b/nuttx/configs/spark/src/up_spi.c @@ -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) |