diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-05-21 07:20:09 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-05-21 07:20:09 -0600 |
| commit | b48c5ace4fff8cd1eeb65a76ae058f78e037bd49 (patch) | |
| tree | 2ef9dd6e0268360df12938632fe71f7d85375c5c | |
| parent | a555f5e571621b6baf343ccba91ee0a1030bb9a3 (diff) | |
| download | nuttx-b48c5ace4fff8cd1eeb65a76ae058f78e037bd49.tar.gz nuttx-b48c5ace4fff8cd1eeb65a76ae058f78e037bd49.tar.bz2 nuttx-b48c5ace4fff8cd1eeb65a76ae058f78e037bd49.zip | |
Configuration has CC3000_SPI_MODE settings but source uses CONFIG_CC3000_SPIMODE. From Jussi Kivilinna
| -rw-r--r-- | nuttx/drivers/wireless/cc3000/cc3000.c | 4 | ||||
| -rw-r--r-- | nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/drivers/wireless/cc3000/cc3000.c b/nuttx/drivers/wireless/cc3000/cc3000.c index 40394aad2..4f2115525 100644 --- a/nuttx/drivers/wireless/cc3000/cc3000.c +++ b/nuttx/drivers/wireless/cc3000/cc3000.c @@ -271,9 +271,9 @@ static void usdelay(long ustimeout) static inline void cc3000_configspi(FAR struct spi_dev_s *spi) { ndbg("Mode: %d Bits: 8 Frequency: %d\n", - CONFIG_CC3000_SPIMODE, CONFIG_CC3000_SPI_FREQUENCY); + CONFIG_CC3000_SPI_MODE, CONFIG_CC3000_SPI_FREQUENCY); - SPI_SETMODE(spi, CONFIG_CC3000_SPIMODE); + SPI_SETMODE(spi, CONFIG_CC3000_SPI_MODE); SPI_SETBITS(spi, 8); SPI_SETFREQUENCY(spi, CONFIG_CC3000_SPI_FREQUENCY); } diff --git a/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h b/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h index 235cfe7ec..baa144a20 100644 --- a/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h +++ b/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h @@ -75,12 +75,12 @@ # define CONFIG_CC3000_NPOLLWAITERS 2 #endif -#ifndef CONFIG_CC3000_SPIMODE +#ifndef CONFIG_CC3000_SPI_MODE /* CPOL = 0, CPHA = 1 Sample Data Falling Edge of Clock * See http://processors.wiki.ti.com/index.php/CC3000_Serial_Port_Interface_(SPI) */ -# define CONFIG_CC3000_SPIMODE SPIDEV_MODE1 +# define CONFIG_CC3000_SPI_MODE SPIDEV_MODE1 #endif /* Check for some required settings. This can save the user a lot of time |