2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>

	PR 1917/bsps
	* Makefile.am, console/console-config.c, console/uart-bridge-master.c,
	console/uart-bridge-slave.c, startup/bspstart.c: Modifications to add
	dynamic tables for libchip serial drivers.

6 files changed, 23 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/powerpc/qoriq/ChangeLog b/c/src/lib/libbsp/powerpc/qoriq/ChangeLog
index 48fef8f869..496c803d27 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/qoriq/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-18	Jennifer Averett <Jennifer.Averett@OARcorp.com>
+
+	PR 1917/bsps
+	* Makefile.am, console/console-config.c, console/uart-bridge-master.c,
+	console/uart-bridge-slave.c, startup/bspstart.c: Modifications to add
+	dynamic tables for libchip serial drivers.
+
 2011-08-31	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* startup/linkcmds.base: Removed file.
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index c3eab579c1..88001465d1 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -94,9 +94,14 @@ libbsp_a_SOURCES += irq/irq.c \
 
 # Console
 libbsp_a_SOURCES += ../../shared/console.c \
+        ../../shared/console_select.c \
 	console/uart-bridge-master.c \
 	console/uart-bridge-slave.c \
-	console/console-config.c
+	console/console-config.c \
+        ../../shared/console_read.c \
+        ../../shared/console_write.c \
+        ../../shared/console_control.c
+
 
 # RTC
 libbsp_a_SOURCES += ../../shared/tod.c \
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c b/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
index d8545d42bb..b14c6bdd63 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
@@ -28,6 +28,7 @@
 
 #include <libchip/serial.h>
 #include <libchip/ns16550.h>
+#include "../../../shared/console_private.h"
 
 #include <bspopts.h>
 #include <bsp/irq.h>
@@ -116,13 +117,8 @@
   }
 #endif
 
-unsigned long Console_Port_Count = CONSOLE_COUNT;
-
-rtems_device_minor_number Console_Port_Minor;
-
-console_data Console_Port_Data [CONSOLE_COUNT];
-
-console_tbl Console_Port_Tbl [CONSOLE_COUNT] = {
+unsigned long Console_Configuration_Count = CONSOLE_COUNT;
+console_tbl Console_Configuration_Ports [CONSOLE_COUNT] = {
   #if QORIQ_UART_0_ENABLE
     {
       .sDeviceName = "/dev/ttyS0",
@@ -193,7 +189,7 @@ console_tbl Console_Port_Tbl [CONSOLE_COUNT] = {
 
 static void output_char(char c)
 {
-  const console_fns *con = Console_Port_Tbl [Console_Port_Minor].pDeviceFns;
+  const console_fns *con = Console_Port_Tbl [Console_Port_Minor]->pDeviceFns;
   
   if (c == '\n') {
     con->deviceWritePolled((int) Console_Port_Minor, '\r');
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c
index 881b617280..f956a52f4b 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c
@@ -150,7 +150,7 @@ static rtems_id create_task(
 
 static void initialize(int minor)
 {
-  console_tbl *ct = &Console_Port_Tbl [minor];
+  console_tbl *ct = Console_Port_Tbl [minor];
   uart_bridge_master_control *control = ct->pDeviceParams;
   intercom_type type = control->type;
 
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c
index 5a3ce39366..c9bdcf4f01 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c
@@ -129,7 +129,7 @@ static int first_open(int major, int minor, void *arg)
 {
   rtems_libio_open_close_args_t *oc = (rtems_libio_open_close_args_t *) arg;
   struct rtems_termios_tty *tty = (struct rtems_termios_tty *) oc->iop->data1;
-  console_tbl *ct = &Console_Port_Tbl [minor];
+  console_tbl *ct = Console_Port_Tbl[minor];
   console_data *cd = &Console_Port_Data [minor];
   uart_bridge_slave_control *control = ct->pDeviceParams;
   intercom_type type = control->type;
@@ -145,7 +145,7 @@ static int first_open(int major, int minor, void *arg)
 
 static int last_close(int major, int minor, void *arg)
 {
-  console_tbl *ct = &Console_Port_Tbl [minor];
+  console_tbl *ct = Console_Port_Tbl[minor];
   uart_bridge_slave_control *control = ct->pDeviceParams;
 
   qoriq_intercom_service_remove(control->type);
@@ -156,7 +156,7 @@ static int last_close(int major, int minor, void *arg)
 static ssize_t write_with_interrupts(int minor, const char *buf, size_t len)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
-  console_tbl *ct = &Console_Port_Tbl [minor];
+  console_tbl *ct = Console_Port_Tbl[minor];
   uart_bridge_slave_control *control = ct->pDeviceParams;
   intercom_packet *packet = qoriq_intercom_allocate_packet(
     control->type,
@@ -183,7 +183,7 @@ static ssize_t write_with_interrupts(int minor, const char *buf, size_t len)
 
 static void write_polled(int minor, char c)
 {
-  console_tbl *ct = &Console_Port_Tbl [minor];
+  console_tbl *ct = Console_Port_Tbl[minor];
   uart_bridge_slave_control *control = ct->pDeviceParams;
   intercom_packet *packet = qoriq_intercom_allocate_packet(
     control->type,
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c b/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
index 9333ff791e..d47bf7bc0a 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
@@ -95,7 +95,7 @@ void bsp_start(void)
 
   /* Initialize some console parameters */
   for (i = 0; i < Console_Port_Count; ++i) {
-    console_tbl *ct = &Console_Port_Tbl [i];
+    console_tbl *ct = &Console_Configuration_Ports[i];
 
     ct->ulClock = BSP_bus_frequency;