summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/tiva/tiva_gpio.c
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-10 11:23:50 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-10 11:23:50 -0600
commit7beb008424ae27e33eaf1e7b1e2caaa864a5a173 (patch)
treed016cd227e783c25c6c9c6960c7a77bdddf4f09d /nuttx/arch/arm/src/tiva/tiva_gpio.c
parent4472a64f3a42f64fd216da15191785f3fcdd3d9c (diff)
downloadnuttx-7beb008424ae27e33eaf1e7b1e2caaa864a5a173.tar.gz
nuttx-7beb008424ae27e33eaf1e7b1e2caaa864a5a173.tar.bz2
nuttx-7beb008424ae27e33eaf1e7b1e2caaa864a5a173.zip
Make sure that every reference to LM4F has corresponding logic for TM4C
Diffstat (limited to 'nuttx/arch/arm/src/tiva/tiva_gpio.c')
-rw-r--r--nuttx/arch/arm/src/tiva/tiva_gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/tiva/tiva_gpio.c b/nuttx/arch/arm/src/tiva/tiva_gpio.c
index f9c477ccb..335142ae9 100644
--- a/nuttx/arch/arm/src/tiva/tiva_gpio.c
+++ b/nuttx/arch/arm/src/tiva/tiva_gpio.c
@@ -348,7 +348,7 @@ static void tiva_gpiofunc(uint32_t base, uint32_t pinno,
* isolation circuitry for the corresponding GPIO signal.
*/
-#ifdef LM4F
+#if defined(LM4F) || defined(TM4C)
setbit = (((uint32_t)func->setbits >> AMSEL_SHIFT) & 1) << pinno;
clrbit = (((uint32_t)func->clrbits >> AMSEL_SHIFT) & 1) << pinno;
@@ -754,7 +754,7 @@ static inline void tiva_interrupt(uint32_t base, uint32_t pin, uint32_t cfgset)
*
****************************************************************************/
-#ifdef LM4F
+#if defined(LM4F) || defined(TM4C)
static inline void tiva_portcontrol(uint32_t base, uint32_t pinno,
uint32_t cfgset,
const struct gpio_func_s *func)