diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-08 18:58:50 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-08 18:58:50 -0600 |
| commit | 807be52e319e99af4d26c2da634bf7076de11a93 (patch) | |
| tree | 954c941971f3ffa418db777d2245cad52d8eb917 /nuttx/arch/arm/src/lpc17xx | |
| parent | 06f824b36d8f1accc00cd66cb06697a9fe25b0b2 (diff) | |
| download | px4-nuttx-807be52e319e99af4d26c2da634bf7076de11a93.tar.gz px4-nuttx-807be52e319e99af4d26c2da634bf7076de11a93.tar.bz2 px4-nuttx-807be52e319e99af4d26c2da634bf7076de11a93.zip | |
Back out the LPC1788 GPIO typemask logic that was just checked in. This is not necessary
Diffstat (limited to 'nuttx/arch/arm/src/lpc17xx')
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c b/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c index 11a22bed5..19e70ee7b 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c @@ -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) { uint32_t typemask = IOCON_TYPE_D_MASK; @@ -206,7 +207,7 @@ static uint32_t lpc17_getioconmask(unsigned int port, unsigned int pin) return typemask; } - +#endif /**************************************************************************** * Name: lpc17_seti2cmode @@ -241,15 +242,12 @@ static void lpc17_setpinfunction(unsigned int port, unsigned int pin, { uint32_t regaddr; uint32_t regval; - uint32_t typemask; - typemask= lpc17_getioconmask(port,pin); regaddr = LPC17_IOCON_P(port, pin); regval = getreg32(regaddr); regval &= ~IOCON_FUNC_MASK; regval |= ((value << IOCON_FUNC_SHIFT) & IOCON_FUNC_MASK); - regval &= typemask; putreg32(regval, regaddr); } diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c b/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c index 4050356e4..4c479b363 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c @@ -569,7 +569,7 @@ int up_fbinitialize(void) regval |= LCD_CTRL_LCDTFT; #endif - /* Swap red and blue */ + /* Swap red and blue. The colors will be 0x00RRGGBB, not 0x00BBGGRR. */ regval |= LCD_CTRL_BGR; |