summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-20 13:31:31 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-20 13:31:31 +0000
commit6a04140780d878b7dcc92807d3be508f8c0cfcb5 (patch)
tree736a85718c1ada6897cdacba08d2977b642de795
parentcf5be833ffea75c5e21ae248bf9bece95edaf9ea (diff)
downloadrtems-6a04140780d878b7dcc92807d3be508f8c0cfcb5.tar.bz2
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.
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/console/console.c18
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/console/console.c9
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