[Xen-changelog] [xen-3.1-testing] Fix serial output of carriage return when using high-bit stream muxing.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1198146547 0
# Node ID a543717caee8f354a832b9df13709bbadeb608fc
# Parent  0f3055da442efe4c60f99af4ab67d35f02ca4f63
Fix serial output of carriage return when using high-bit stream muxing.
Original patch by Dan Doucette.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   16641:b0c85bc56f9ef08a354499afea584c4b048068a3
xen-unstable date:        Wed Dec 19 15:02:05 2007 +0000
---
 xen/drivers/char/serial.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 0f3055da442e -r a543717caee8 xen/drivers/char/serial.c
--- a/xen/drivers/char/serial.c Thu Dec 20 10:25:52 2007 +0000
+++ b/xen/drivers/char/serial.c Thu Dec 20 10:29:07 2007 +0000
@@ -133,7 +133,7 @@ void serial_putc(int handle, char c)
     spin_lock_irqsave(&port->tx_lock, flags);
 
     if ( (c == '\n') && (handle & SERHND_COOKED) )
-        __serial_putc(port, '\r');
+        __serial_putc(port, '\r' | ((handle & SERHND_HI) ? 0x80 : 0x00));
 
     if ( handle & SERHND_HI )
         c |= 0x80;
@@ -159,7 +159,7 @@ void serial_puts(int handle, const char 
     while ( (c = *s++) != '\0' )
     {
         if ( (c == '\n') && (handle & SERHND_COOKED) )
-            __serial_putc(port, '\r');
+            __serial_putc(port, '\r' | ((handle & SERHND_HI) ? 0x80 : 0x00));
 
         if ( handle & SERHND_HI )
             c |= 0x80;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog