summaryrefslogtreecommitdiffstats
path: root/nuttx/arch/arm/src/lm3s
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2010-05-16 13:09:48 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2010-05-16 13:09:48 +0000
commit798a03457b48e7b7ad36462d77e0f3cfc80e19db (patch)
tree20eb254656f830306bff8de55c49451054d2001c /nuttx/arch/arm/src/lm3s
parentbd69c74e2e755d2697c4b71f847e503e145d7f9f (diff)
board.h should not include files in arch directory
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@2680 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/lm3s')
-rw-r--r--nuttx/arch/arm/src/lm3s/lm3s_gpio.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_gpio.c b/nuttx/arch/arm/src/lm3s/lm3s_gpio.c
index 305103143a..cc1f77c356 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_gpio.c
+++ b/nuttx/arch/arm/src/lm3s/lm3s_gpio.c
@@ -140,18 +140,19 @@ static const struct gpio_func_s g_funcbits[] =
{GPIO_INTERRUPT_SETBITS, GPIO_INTERRUPT_CLRBITS}, /* GPIO_FUNC_INTERRUPT */
};
-#ifdef LM3S_GPIOH_BASE
-{
- LM3S_GPIOA_BASE, LM3S_GPIOB_BASE, LM3S_GPIOC_BASE, LM3S_GPIOD_BASE,
- LM3S_GPIOE_BASE, LM3S_GPIOF_BASE, LM3S_GPIOG_BASE, LM3S_GPIOH_BASE,
-};
-#else
static const uint32_t g_gpiobase[] =
{
LM3S_GPIOA_BASE, LM3S_GPIOB_BASE, LM3S_GPIOC_BASE, LM3S_GPIOD_BASE,
- LM3S_GPIOE_BASE, LM3S_GPIOF_BASE, LM3S_GPIOG_BASE, 0,
-};
+ LM3S_GPIOE_BASE, LM3S_GPIOF_BASE, LM3S_GPIOG_BASE,
+
+ /* GPIOH exists on the LM3S6918, but not on the LM3S6965 */
+
+#ifdef LM3S_GPIOH_BASE
+ LM3S_GPIOH_BASE,
+#else
+ 0,
#endif
+};
/****************************************************************************
* Public Data