diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-28 16:55:47 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-28 16:55:47 -0600 |
| commit | 69f8a485e014e5731d9d2b416b0a0db3dcb6acb2 (patch) | |
| tree | 53f47a0ff6181a0e85e39c7e8a547be612a6b1b3 /nuttx | |
| parent | 1388c01029aed0b367117395924bc3b8c2e7a6cf (diff) | |
| download | nuttx-69f8a485e014e5731d9d2b416b0a0db3dcb6acb2.tar.gz nuttx-69f8a485e014e5731d9d2b416b0a0db3dcb6acb2.tar.bz2 nuttx-69f8a485e014e5731d9d2b416b0a0db3dcb6acb2.zip | |
Tiva SSI: Fix some recent breakage to the Tiva SSI driver for the case where only one SSI modules is enabled
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_ssi.c | 20 | ||||
| -rw-r--r-- | nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/tiva/tiva_ssi.c b/nuttx/arch/arm/src/tiva/tiva_ssi.c index df0239822..8cd858290 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ssi.c +++ b/nuttx/arch/arm/src/tiva/tiva_ssi.c @@ -137,6 +137,26 @@ #if NSSI_ENABLED > 0 +/* Some special definitions if there is exactly one interface enabled */ + +#if NSSI_ENABLED < 2 +# if defined(CONFIG_TIVA_SSI0) +# define SSI_BASE TIVA_SSI0_BASE +# define SSI_IRQ TIVA_IRQ_SSI0 +# elif defined(CONFIG_TIVA_SSI0) +# define SSI_BASE TIVA_SSI1_BASE +# define SSI_IRQ TIVA_IRQ_SSI1 +# elif defined(CONFIG_TIVA_SSI0) +# define SSI_BASE TIVA_SSI2_BASE +# define SSI_IRQ TIVA_IRQ_SSI2 +# elif defined(CONFIG_TIVA_SSI0) +# define SSI_BASE TIVA_SSI3_BASE +# define SSI_IRQ TIVA_IRQ_SSI3 +# else +# error Help me... I am confused +# endif +#endif + /* The number of (16-bit) words that will fit in the Tx FIFO */ #define TIVA_TXFIFO_WORDS 8 diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c index 73d0acdcb..41f7d05d8 100644 --- a/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c +++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_boot.c @@ -49,7 +49,7 @@ #include "lmf4120-launchpad.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ @@ -65,7 +65,7 @@ * * Description: * All Stellaris architectures must provide the following entry point. This entry - * point is called early in the intitialization -- after all memory has been + * point is called early in the initialization -- after all memory has been * configured and mapped but before any devices have been initialized. * ************************************************************************************/ |