diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-16 13:09:48 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-16 13:09:48 +0000 |
| commit | 5634f4a9b27ec9601e8dc807dd54bc26f06f1cf6 (patch) | |
| tree | 20eb254656f830306bff8de55c49451054d2001c /nuttx | |
| parent | 5283175cecbed16f3cecb315ac7db84d283ac451 (diff) | |
| download | px4-nuttx-5634f4a9b27ec9601e8dc807dd54bc26f06f1cf6.tar.gz px4-nuttx-5634f4a9b27ec9601e8dc807dd54bc26f06f1cf6.tar.bz2 px4-nuttx-5634f4a9b27ec9601e8dc807dd54bc26f06f1cf6.zip | |
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
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_gpio.c | 17 | ||||
| -rw-r--r-- | nuttx/configs/eagle100/include/board.h | 2 | ||||
| -rwxr-xr-x | nuttx/configs/lm3s6965-ek/include/board.h | 2 | ||||
| -rw-r--r-- | nuttx/examples/nx/nx_kbdin.c | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_gpio.c b/nuttx/arch/arm/src/lm3s/lm3s_gpio.c index 305103143..cc1f77c35 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 diff --git a/nuttx/configs/eagle100/include/board.h b/nuttx/configs/eagle100/include/board.h index 09d695938..af7cc6be8 100644 --- a/nuttx/configs/eagle100/include/board.h +++ b/nuttx/configs/eagle100/include/board.h @@ -41,8 +41,6 @@ * Included Files ************************************************************************************/ -#include "lm3s_internal.h" - /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/configs/lm3s6965-ek/include/board.h b/nuttx/configs/lm3s6965-ek/include/board.h index eeb6c6f8c..45fa0dfb0 100755 --- a/nuttx/configs/lm3s6965-ek/include/board.h +++ b/nuttx/configs/lm3s6965-ek/include/board.h @@ -41,8 +41,6 @@ * Included Files ************************************************************************************/ -#include "lm3s_internal.h" - /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/examples/nx/nx_kbdin.c b/nuttx/examples/nx/nx_kbdin.c index 057f725d2..7d3bcc5fe 100644 --- a/nuttx/examples/nx/nx_kbdin.c +++ b/nuttx/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++) |