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

Back out the LPC1788 GPIO typemask logic that was just checked in. This is not necessary

Browse Source
This commit is contained in:
Gregory Nutt 2013-04-08 18:58:50 -06:00
parent b5d74f80ac
commit 7a3cc22417
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/lpc17xx/lpc178x_gpio.c
View File

@ -132,6 +132,7 @@ const uint32_t g_intbase[GPIO_NPORTS] =
* *
****************************************************************************/ ****************************************************************************/
#if 0 /* Not used */
static uint32_t lpc17_getioconmask(unsigned int port, unsigned int pin) static uint32_t lpc17_getioconmask(unsigned int port, unsigned int pin)
{ {
uint32_t typemask = IOCON_TYPE_D_MASK; uint32_t typemask = IOCON_TYPE_D_MASK;
@ -206,7 +207,7 @@ static uint32_t lpc17_getioconmask(unsigned int port, unsigned int pin)
return typemask; return typemask;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: lpc17_seti2cmode * Name: lpc17_seti2cmode
@ -241,15 +242,12 @@ static void lpc17_setpinfunction(unsigned int port, unsigned int pin,
{ {
uint32_t regaddr; uint32_t regaddr;
uint32_t regval; uint32_t regval;
uint32_t typemask;
typemask= lpc17_getioconmask(port,pin);
regaddr = LPC17_IOCON_P(port, pin); regaddr = LPC17_IOCON_P(port, pin);
regval = getreg32(regaddr); regval = getreg32(regaddr);
regval &= ~IOCON_FUNC_MASK; regval &= ~IOCON_FUNC_MASK;
regval |= ((value << IOCON_FUNC_SHIFT) & IOCON_FUNC_MASK); regval |= ((value << IOCON_FUNC_SHIFT) & IOCON_FUNC_MASK);
regval &= typemask;
putreg32(regval, regaddr); putreg32(regval, regaddr);
} }

2
arch/arm/src/lpc17xx/lpc17_lcd.c
View File

@ -569,7 +569,7 @@ int up_fbinitialize(void)
regval |= LCD_CTRL_LCDTFT; regval |= LCD_CTRL_LCDTFT;
#endif #endif
/* Swap red and blue */ /* Swap red and blue. The colors will be 0x00RRGGBB, not 0x00BBGGRR. */
regval |= LCD_CTRL_BGR; regval |= LCD_CTRL_BGR;