4 files changed, 31 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
index 9d74127f55..fcd7af8daa 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-20	Joel Sherrill <joel@OARcorp.com>
+
+	* console/console.c: Add mbx8xx_console_get_configuration() which
+	returns either nvram configuration or a static equivalent.
+
 2000-09-29	Charles-Antoine Gauthier <charles.gauthier@nrc.ca>
 
 	* startup/linkcmds: Added lines so DWARF debug information
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/console.c b/c/src/lib/libbsp/powerpc/eth_comm/console/console.c
index 972803658b..7118cbcd3e 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/console/console.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/console/console.c
@@ -227,3 +227,21 @@ rtems_device_driver console_control(rtems_device_major_number major,
 #endif
 }
 
+/*
+ *  Support routine for console-generic
+ */
+
+int mbx8xx_console_get_configuration(void)
+{
+#if NVRAM_CONFIGURE == 1
+  return nvram->console_mode;
+#else
+#if UARTS_IO_MODE == 1
+  return 0x02;
+#else
+  return 0;
+#endif
+#endif
+
+}
+
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 49935cc27d..8324e399f3 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-20	Joel Sherrill <joel@OARcorp.com>
+
+	* console/console.c: Add mbx8xx_console_get_configuration() which
+	returns either nvram configuration or a static equivalent.
+
 2000-10-18	Joel Sherrill <joel@OARcorp.com>
 
 	* console/console.c: Added BSP dependent routine
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
index 011dae7227..a601572703 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
@@ -885,16 +885,13 @@ rtems_device_driver console_control(
  *  Support routine for console-generic
  */
 
-int mbx8xx_console_use_maximum_buffer_size(void)
+int mbx8xx_console_get_configuration(void)
 {
 #if NVRAM_CONFIGURE == 1
-  if ( (nvram->console_mode & 0x06) == 0x02 )
-    return 1;
-  else
-    return 0;
+  return nvram->console_mode;
 #else
 #if UARTS_IO_MODE == 1
-  return 1;
+  return 0x02;
 #else
   return 0;
 #endif