summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-08-11 19:53:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-08-11 19:53:18 +0000
commitb7d4d2abd9984e7b66056b8ad997813eac25b2c0 (patch)
tree6369bc25ea4b242d9cc92a45b6c52685af18d588
parent2000-08-11 Charles-Antoine Gauthier <charles.gauthier@nrc.ca> (diff)
downloadrtems-b7d4d2abd9984e7b66056b8ad997813eac25b2c0.tar.bz2
2000-08-11 Charles-Antoine Gauthier <charles.gauthier@nrc.ca>
* console.c(_BSP_output_char): Output CR after LF for printk.
-rw-r--r--c/src/lib/libbsp/m68k/mvme167/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme167/console/console.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index 3f6c8a3a65..1ddd7fc590 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,5 +1,9 @@
2000-08-11 Charles-Antoine Gauthier <charles.gauthier@nrc.ca>
+ * console.c(_BSP_output_char): Output CR after LF for printk.
+
+2000-08-11 Charles-Antoine Gauthier <charles.gauthier@nrc.ca>
+
* README: Updated
* console/console.c: Fix polled input.
Add support for shared printk.
@@ -24,6 +28,7 @@
* network/network.c: Cleanup of network driver to reduce warnings.
Addition of second parameter to uti596_attach.
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console.c b/c/src/lib/libbsp/m68k/mvme167/console/console.c
index 8794e51a99..f7a7935667 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/console.c
+++ b/c/src/lib/libbsp/m68k/mvme167/console/console.c
@@ -1451,6 +1451,7 @@ rtems_status_code do_poll_write(
void _BSP_output_char(char c)
{
rtems_device_minor_number printk_minor;
+ char cr ='\r';
/*
* Can't rely on console_initialize having been called before this function
@@ -1458,11 +1459,13 @@ void _BSP_output_char(char c)
*/
if ( NVRAM_CONFIGURE )
/* J1-4 is on, use NVRAM info for configuration */
- printk_minor = nvram->console_printk_port & 0x30;
+ printk_minor = (nvram->console_printk_port & 0x30) >> 4;
else
printk_minor = PRINTK_MINOR;
_167Bug_pollWrite(printk_minor, &c, 1);
+ if ( c == '\n' )
+ _167Bug_pollWrite(printk_minor, &cr, 1);
}