[Xen-changelog] Make ns16550 rework on tiger4 box

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User fred@xxxxxxxxxxxxxxxxxxxxx
# Node ID 208a3afc9353b1127d0c6b88e61a1ee07aed4095
# Parent  34460b45204a6f5062b2b848d7919b4ed971da68
Make ns16550 rework on tiger4 box


Signed-off-by Kevin Tian <kevin.tian@xxxxxxxxx>

diff -r 34460b45204a -r 208a3afc9353 xen/arch/ia64/pcdp.c
--- a/xen/arch/ia64/pcdp.c      Thu Jul 28 15:29:12 2005
+++ b/xen/arch/ia64/pcdp.c      Thu Jul 28 15:33:34 2005
@@ -24,11 +24,11 @@
 setup_serial_console(struct pcdp_uart *uart)
 {
 #ifdef XEN
-       extern struct ns16550_defaults ns16550_com1;
-       ns16550_com1.baud = uart->baud;
-       ns16550_com1.io_base = uart->addr.address;
+       extern struct ns16550_defaults ns16550_com;
+       ns16550_com.baud = uart->baud;
+       ns16550_com.io_base = uart->addr.address;
        if (uart->bits)
-               ns16550_com1.data_bits = uart->bits;
+               ns16550_com.data_bits = uart->bits;
        return 0;
 #else
 #ifdef CONFIG_SERIAL_8250_CONSOLE
diff -r 34460b45204a -r 208a3afc9353 xen/arch/ia64/xensetup.c
--- a/xen/arch/ia64/xensetup.c  Thu Jul 28 15:29:12 2005
+++ b/xen/arch/ia64/xensetup.c  Thu Jul 28 15:33:34 2005
@@ -130,7 +130,7 @@
     return;
 }
 
-struct ns16550_defaults ns16550_com1 = {
+struct ns16550_defaults ns16550_com = {
     .data_bits = 8,
     .parity    = 'n',
     .stop_bits = 1
@@ -158,7 +158,14 @@
 
     /* We initialise the serial devices very early so we can get debugging. */
     if (running_on_sim) hpsim_serial_init();
-    else ns16550_init(0, &ns16550_com1);
+    else {
+       ns16550_com.io_base = 0x3f8;
+       ns16550_com.irq     = 4;
+       ns16550_init(0, &ns16550_com);
+       ns16550_com.io_base = 0x2f8;
+       ns16550_com.irq     = 3;
+       ns16550_init(1, &ns16550_com);
+    }
     serial_init_preirq();
 
     init_console();

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