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
This commit is contained in:
parent
bd69c74e2e
commit
798a03457b
|
@ -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
|
||||
|
|
|
@ -41,8 +41,6 @@
|
|||
* Included Files
|
||||
************************************************************************************/
|
||||
|
||||
#include "lm3s_internal.h"
|
||||
|
||||
/************************************************************************************
|
||||
* Definitions
|
||||
************************************************************************************/
|
||||
|
|
|
@ -41,8 +41,6 @@
|
|||
* Included Files
|
||||
************************************************************************************/
|
||||
|
||||
#include "lm3s_internal.h"
|
||||
|
||||
/************************************************************************************
|
||||
* Definitions
|
||||
************************************************************************************/
|
||||
|
|
|
@ -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++)
|
||||
|
|
Loading…
Reference in New Issue