From 5eb50f38e943e831f528d68eb0d09910cf2548ae Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 20 Apr 2011 20:20:17 +0000 Subject: 2011-04-20 Rohan Kangralkar PR 1781/bsps * console/console-io.c: The UART RX and TX are different ISR now. So the array containing the registeration changes. The change is due to change in the libcup uart function. --- c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog | 7 +++++ c/src/lib/libbsp/bfin/bf537Stamp/console/console.c | 33 +++++++++++++--------- 2 files changed, 26 insertions(+), 14 deletions(-) (limited to 'c/src/lib/libbsp/bfin') diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog index ecc6ae9aa5..ec729b2e80 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog +++ b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog @@ -1,3 +1,10 @@ +2011-04-20 Rohan Kangralkar + + PR 1781/bsps + * console/console-io.c: The UART RX and TX are different ISR + now. So the array containing the registeration changes. The + change is due to change in the libcup uart function. + 2011-02-15 Joel Sherrill * ChangeLog, start/start.S: Add HLT instruction on exit. diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c b/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c index fcf824bdf1..c539e0f5ae 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c +++ b/c/src/lib/libbsp/bfin/bf537Stamp/console/console.c @@ -26,16 +26,21 @@ */ static bfin_uart_channel_t channels[] = { - {"/dev/console", - (char *) UART0_BASE_ADDRESS, - CONSOLE_USE_INTERRUPTS, -#ifdef CONSOLE_FORCE_BAUD - CONSOLE_FORCE_BAUD, -#else - 0, -#endif - NULL, - 0} + {"/dev/console", + UART0_BASE_ADDRESS, + 0, + 0, + CONSOLE_USE_INTERRUPTS, + 0, + #ifdef CONSOLE_FORCE_BAUD + CONSOLE_FORCE_BAUD, + #else + 0, + #endif + NULL, + 0, + 0} + }; #if (!BFIN_ON_SKYEYE) , @@ -56,10 +61,10 @@ static bfin_uart_config_t config = { #if CONSOLE_USE_INTERRUPTS static bfin_isr_t bfinUARTISRs[] = { - {SIC_DMA8_UART0_RX_VECTOR, bfin_uart_isr, 0, 0, NULL}, - {SIC_DMA10_UART1_RX_VECTOR, bfin_uart_isr, 0, 0, NULL}, - {SIC_DMA9_UART0_TX_VECTOR, bfin_uart_isr, 0, 0, NULL}, - {SIC_DMA11_UART1_TX_VECTOR, bfin_uart_isr, 0, 0, NULL} + {SIC_DMA8_UART0_RX_VECTOR, bfinUart_rxIsr, 0, 0, NULL}, + {SIC_DMA10_UART1_RX_VECTOR, bfinUart_rxIsr, 0, 0, NULL}, + {SIC_DMA9_UART0_TX_VECTOR, bfinUart_txIsr, 0, 0, NULL}, + {SIC_DMA11_UART1_TX_VECTOR, bfinUart_txIsr, 0, 0, NULL} }; #endif -- cgit v1.2.3