2011-04-20 Rohan Kangralkar <rkangral@ece.neu.edu>

	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.

4 files changed, 47 insertions, 17 deletions

diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog
index 0a371183ba..ecfe0e4adf 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog
@@ -1,3 +1,17 @@
+2011-04-20  Rohan Kangralkar <rkangral@ece.neu.edu>
+
+	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-04-20  Rohan Kangralkar <rkangral@ece.neu.edu>
+------------------------------------------------------------------------
+r36 | rkangral | 2011-03-15 16:59:39 -0400 (Tue, 15 Mar 2011) | 1 line
+  * 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-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
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
 
diff --git a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog
index 0905476382..35f3e6d6c3 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog
+++ b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-20  Rohan Kangralkar <rkangral@ece.neu.edu>
+
+	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-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff --git a/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c b/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
index e9e3937e62..bf996baa3c 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
+++ b/c/src/lib/libbsp/bfin/eZKit533/console/console-io.c
@@ -26,14 +26,18 @@
 
 static bfin_uart_channel_t channels[] = {
   {"/dev/console",
-   (char *) UART0_BASE_ADDRESS,
+   UART0_BASE_ADDRESS,
+   0,
+   0,
    CONSOLE_USE_INTERRUPTS,
+   0,
 #ifdef CONSOLE_FORCE_BAUD
    CONSOLE_FORCE_BAUD,
 #else
    0,
 #endif
    NULL,
+   0,
    0}
 };
 
@@ -45,8 +49,8 @@ static bfin_uart_config_t config = {
 
 #if CONSOLE_USE_INTERRUPTS
 static bfin_isr_t bfinUARTISRs[] = {
-  {SIC_DMA6_UART0_RX_VECTOR, bfin_uart_isr, 0, 0, NULL},
-  {SIC_DMA7_UART0_TX_VECTOR, bfin_uart_isr, 0, 0, NULL},
+  {SIC_DMA6_UART0_RX_VECTOR, bfinUart_rxIsr, 0, 0, NULL},
+  {SIC_DMA7_UART0_TX_VECTOR, bfinUart_txIsr, 0, 0, NULL},
 };
 #endif