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

Tiva SSI: Fix some recent breakage to the Tiva SSI driver for the case where only one SSI modules is enabled

Browse Source
This commit is contained in:
Gregory Nutt 2014-12-28 16:55:47 -06:00
parent ef73e1ca03
commit 788541aecf
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/src/tiva/tiva_ssi.c
View File

@ -137,6 +137,26 @@
#if NSSI_ENABLED > 0 #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 */ /* The number of (16-bit) words that will fit in the Tx FIFO */
#define TIVA_TXFIFO_WORDS 8 #define TIVA_TXFIFO_WORDS 8

4
configs/lm4f120-launchpad/src/lm4f_boot.c
View File

@ -49,7 +49,7 @@
#include "lmf4120-launchpad.h" #include "lmf4120-launchpad.h"
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
@ -65,7 +65,7 @@
* *
* Description: * Description:
* All Stellaris architectures must provide the following entry point. This entry * 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. * configured and mapped but before any devices have been initialized.
* *
************************************************************************************/ ************************************************************************************/