Changeset 441b90e in rtems

Timestamp:

Feb 1, 2012, 8:32:28 PM (9 years ago)

Author:

Jennifer Averett <Jennifer.Averett@…>

Branches:

4.11, 5, master

Children:

d1887baf

Parents:

41572c4

git-author:

Jennifer Averett <Jennifer.Averett@…> (02/01/12 20:32:28)

git-committer:

Joel Sherrill <joel.sherrill@…> (02/01/12 20:32:28)

Message:

Correct run-time selection of console port.

This was broken by conversion of console driver to libchip style.

Location:

c/src/lib/libbsp/i386/pc386

Files:

• Makefile.am (modified) (1 diff)
• console/console.c (deleted)
• console/console_select.c (added)
• console/printk_support.c (modified) (2 diffs)
• include/bsp.h (modified) (1 diff)
• start/start.S (modified) (1 diff)

c/src/lib/libbsp/i386/pc386/Makefile.am

@@ -80 +80 @@
     console/kbd_parser.c console/serial_mouse_config.c \
     ../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c \
-    ../../shared/console.c ../../shared/console_select.c \
+    ../../shared/console.c console/console_select.c \
     ../../shared/console_read.c ../../shared/console_write.c \
     console/console_control.c console/conscfg.c console/printk_support.c \

c/src/lib/libbsp/i386/pc386/console/printk_support.c

@@ -23 +23 @@
 #include <libchip/serial.h>
 #include <libchip/ns16550.h>
-
-BSP_output_char_function_type     BSP_output_char = _IBMPC_outch;
-BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input;
+#include "../../../shared/console_private.h"
 
 rtems_device_minor_number         BSPPrintkPort = 0;
@@ -33 +31 @@
 );
 
-void BSP_com_outch(char ch)
+void BSP_outch(char ch);
+int BSP_inch(void);
+
+void BSP_outch(char ch)
 {
-  console_tbl                   *cptr;
+  if ( BSPPrintkPort == BSP_CONSOLE_VGA ) {
+    _IBMPC_outch( ch );
+  } else {
+    console_tbl *cptr;
 
-  cptr = &Console_Configuration_Ports[BSPPrintkPort];
-
-  return cptr->pDeviceFns->deviceWritePolled( BSPPrintkPort, ch );
+    cptr = &Console_Configuration_Ports[BSPPrintkPort];
+    cptr->pDeviceFns->deviceWritePolled( BSPPrintkPort, ch );
+  }
 }
 
-int BSP_com_inch( void ) 
+int BSP_inch(void) 
 {
   int           result;
-  console_tbl   *cptr;
 
-  cptr = &Console_Configuration_Ports[BSPPrintkPort];
-
-  do {
-    result = ns16550_inbyte_nonblocking_polled( BSPPrintkPort );
-  } while (result == -1);
-
+  if ( BSPPrintkPort == BSP_CONSOLE_VGA ) {
+    result = BSP_wait_polled_input();
+  } else {
+    do {
+      result = ns16550_inbyte_nonblocking_polled( BSPPrintkPort );
+    } while (result == -1);
+  }
   return result;
 }
 
+BSP_output_char_function_type     BSP_output_char = BSP_outch;
+BSP_polling_getchar_function_type BSP_poll_char = BSP_inch;
+

c/src/lib/libbsp/i386/pc386/include/bsp.h

@@ -135 +135 @@
 
 /*-------------------------------------------------------------------------+
+| Console Defines
+|      WARNING: These Values MUST match the order in 
+|               Console_Configuration_Ports
++--------------------------------------------------------------------------*/
+#define    BSP_CONSOLE_VGA            0
+#define    BSP_CONSOLE_COM1           1
+#define    BSP_CONSOLE_COM2           2
+
+/*-------------------------------------------------------------------------+
 | Macros
 +--------------------------------------------------------------------------*/

c/src/lib/libbsp/i386/pc386/start/start.S

@@ -69 +69 @@
         EXTERN (debugPollingGetChar)
         EXTERN (checkCPUtypeSetCr0)
-        EXTERN (BSP_console_select)
         EXTERN (printk)
 #ifdef __SSE__