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

board.h should not include files in arch directory

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2680 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-05-16 13:09:48 +00:00
parent 2023634f84
commit 6541fa26bf
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/src/lm3s/lm3s_gpio.c
View File

@ -140,18 +140,19 @@ static const struct gpio_func_s g_funcbits[] =
{GPIO_INTERRUPT_SETBITS, GPIO_INTERRUPT_CLRBITS}, /* GPIO_FUNC_INTERRUPT */ {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[] = static const uint32_t g_gpiobase[] =
{ {
LM3S_GPIOA_BASE, LM3S_GPIOB_BASE, LM3S_GPIOC_BASE, LM3S_GPIOD_BASE, 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 #endif
};
/**************************************************************************** /****************************************************************************
* Public Data * Public Data

2
configs/eagle100/include/board.h
View File

@ -41,8 +41,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#include "lm3s_internal.h"
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/

2
configs/lm3s6965-ek/include/board.h
View File

@ -41,8 +41,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#include "lm3s_internal.h"
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/

2
examples/nx/nx_kbdin.c
View File

@ -205,7 +205,7 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
/* Pack 4-bit nibbles into a byte */ /* Pack 4-bit nibbles into a byte */
pixel &= 0x0f; pixel &= 0x0f;
pixel = (pixel) << 4 |pixel; pixel = (pixel) << 4 | pixel;
ptr = (FAR nxgl_mxpixel_t *)glyph->bitmap; ptr = (FAR nxgl_mxpixel_t *)glyph->bitmap;
for (row = 0; row < glyph->height; row++) for (row = 0; row < glyph->height; row++)