summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-01-11 09:27:50 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-01-11 14:50:44 +0100
commitb1d10212009ceb2cc5c093f8a9990b95d47a713f (patch)
tree512819c3b2dd3675f7fe88dbc85636c6fc4455fb
parentcpukit: Fix many Doxygen warnings (diff)
downloadrtems-b1d10212009ceb2cc5c093f8a9990b95d47a713f.tar.bz2
bsp/lpc32xx: Bypass the IrDA modem for UART6
-rw-r--r--c/src/lib/libbsp/arm/lpc32xx/console/console-config.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c b/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c
index 738f5d86de..1134bf118b 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c
@@ -45,7 +45,7 @@ static void lpc32xx_uart_set_register(uintptr_t addr, uint8_t i, uint8_t val)
#ifdef LPC32XX_UART_3_BAUD
static bool lpc32xx_uart_probe_3(int minor)
{
- LPC32XX_UARTCLK_CTRL |= 1U << 0;
+ LPC32XX_UARTCLK_CTRL |= BSP_BIT32(0);
LPC32XX_U3CLK = LPC32XX_CONFIG_U3CLK;
LPC32XX_UART_CLKMODE = BSP_FLD32SET(LPC32XX_UART_CLKMODE, 0x2, 4, 5);
@@ -64,7 +64,7 @@ static void lpc32xx_uart_set_register(uintptr_t addr, uint8_t i, uint8_t val)
*/
gpio->p2_mux_set = BSP_BIT32(2);
- LPC32XX_UARTCLK_CTRL |= 1U << 1;
+ LPC32XX_UARTCLK_CTRL |= BSP_BIT32(1);
LPC32XX_U4CLK = LPC32XX_CONFIG_U4CLK;
LPC32XX_UART_CLKMODE = BSP_FLD32SET(LPC32XX_UART_CLKMODE, 0x2, 6, 7);
@@ -75,7 +75,10 @@ static void lpc32xx_uart_set_register(uintptr_t addr, uint8_t i, uint8_t val)
#ifdef LPC32XX_UART_6_BAUD
static bool lpc32xx_uart_probe_6(int minor)
{
- LPC32XX_UARTCLK_CTRL |= 1U << 3;
+ /* Bypass the IrDA modulator/demodulator */
+ LPC32XX_UART_CTRL |= BSP_BIT32(5);
+
+ LPC32XX_UARTCLK_CTRL |= BSP_BIT32(3);
LPC32XX_U6CLK = LPC32XX_CONFIG_U6CLK;
LPC32XX_UART_CLKMODE = BSP_FLD32SET(LPC32XX_UART_CLKMODE, 0x2, 10, 11);