From 6541fa26bf22856366a6150212bb5f15461b5242 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 16 May 2010 13:09:48 +0000
Subject: [PATCH] board.h should not include files in arch directory

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2680 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/arm/src/lm3s/lm3s_gpio.c       | 17 +++++++++--------
 configs/eagle100/include/board.h    |  2 --
 configs/lm3s6965-ek/include/board.h |  2 --
 examples/nx/nx_kbdin.c              |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/arch/arm/src/lm3s/lm3s_gpio.c b/arch/arm/src/lm3s/lm3s_gpio.c
index 305103143a5..cc1f77c3562 100644
--- a/arch/arm/src/lm3s/lm3s_gpio.c
+++ b/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
diff --git a/configs/eagle100/include/board.h b/configs/eagle100/include/board.h
index 09d695938bd..af7cc6be8a8 100644
--- a/configs/eagle100/include/board.h
+++ b/configs/eagle100/include/board.h
@@ -41,8 +41,6 @@
  * Included Files
  ************************************************************************************/
 
-#include "lm3s_internal.h"
-
 /************************************************************************************
  * Definitions
  ************************************************************************************/
diff --git a/configs/lm3s6965-ek/include/board.h b/configs/lm3s6965-ek/include/board.h
index eeb6c6f8c3c..45fa0dfb049 100755
--- a/configs/lm3s6965-ek/include/board.h
+++ b/configs/lm3s6965-ek/include/board.h
@@ -41,8 +41,6 @@
  * Included Files
  ************************************************************************************/
 
-#include "lm3s_internal.h"
-
 /************************************************************************************
  * Definitions
  ************************************************************************************/
diff --git a/examples/nx/nx_kbdin.c b/examples/nx/nx_kbdin.c
index 057f725d2fe..7d3bcc5fe62 100644
--- a/examples/nx/nx_kbdin.c
+++ b/examples/nx/nx_kbdin.c
@@ -205,7 +205,7 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
           /* Pack 4-bit nibbles into a byte */
 
           pixel &= 0x0f;
-          pixel  = (pixel) << 4 |pixel;
+          pixel  = (pixel) << 4 | pixel;
 
           ptr    = (FAR nxgl_mxpixel_t *)glyph->bitmap;
           for (row = 0; row < glyph->height; row++)