From cd66632f0bfb4075dc7130af8b698a4ff0112814 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Jul 2002 22:32:54 +0000 Subject: 2002-07-16 Eric Norum * console/console.c: Others on the rtems-users list have expressed concern about this run-time selection, so I've enclosed the changes in a #ifdef RTEMS_RUNTIME_CONSOLE_SELECT conditional. --- c/src/lib/libbsp/i386/pc386/ChangeLog | 6 ++++++ c/src/lib/libbsp/i386/pc386/console/console.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 29b83ad95d..b81b7caa15 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,9 @@ +2002-07-16 Eric Norum + + * console/console.c: Others on the rtems-users list have expressed + concern about this run-time selection, so I've enclosed the changes + in a #ifdef RTEMS_RUNTIME_CONSOLE_SELECT conditional. + 2002-07-04 Ralf Corsepius * wrapup/Makefile.am: Eliminate TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index 264eda12f0..b94713365b 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -196,6 +196,19 @@ console_initialize(rtems_device_major_number major, */ rtems_termios_initialize (); +#ifdef RTEMS_RUNTIME_CONSOLE_SELECT + /* + * If no video card, fall back to serial port console + */ +#include + if((BSPConsolePort == BSP_CONSOLE_PORT_CONSOLE) + && (*(unsigned char*) NB_MAX_ROW_ADDR == 0) + && (*(unsigned short*)NB_MAX_COL_ADDR == 0)) { + BSPConsolePort = BSP_UART_COM2; + BSPPrintkPort = BSP_UART_COM1; + } +#endif + /* * The video was initialized in the start.s code and does not need * to be reinitialized. -- cgit v1.2.3