[Xen-changelog] [xen-unstable] [IA64] Other Intel IPF platforms use COM1

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1207067081 21600
# Node ID e5244d14486cd9491ff5d0eb2a145830723c3bf3
# Parent  408fcc50fd35cca38d9a1440cad2da76a1c6acdc
[IA64] Other Intel IPF platforms use COM1

Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>
---
 xen/arch/ia64/linux-xen/setup.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff -r 408fcc50fd35 -r e5244d14486c xen/arch/ia64/linux-xen/setup.c
--- a/xen/arch/ia64/linux-xen/setup.c   Tue Apr 01 09:42:52 2008 -0600
+++ b/xen/arch/ia64/linux-xen/setup.c   Tue Apr 01 10:24:41 2008 -0600
@@ -405,16 +405,21 @@ acpi_oem_console_setup(void)
         * Tiger 2: SR870BH2
         * Tiger 4: SR870BN4
         */
-       if (strncmp(hdr->oem_id, "INTEL", 5) ||
-           (!strncmp(hdr->oem_table_id, "SR870BH2", 8) &&
-            !strncmp(hdr->oem_table_id, "SR870BN4", 8)))
-               return -ENODEV;
-
-       ns16550_com1.baud = BAUD_AUTO;
-       ns16550_com1.io_base = 0x2f8;
-       ns16550_com1.irq = 3;
-
-       return 0;
+       if (!strncmp(hdr->oem_id, "INTEL", 5)) {
+               if (!strncmp(hdr->oem_table_id, "SR870BH2", 8) ||
+                   !strncmp(hdr->oem_table_id, "SR870BN4", 8)) {
+                       ns16550_com1.baud = BAUD_AUTO;
+                       ns16550_com1.io_base = 0x2f8;
+                       ns16550_com1.irq = 3;
+                       return 0;
+               } else {
+                       ns16550_com1.baud = BAUD_AUTO;
+                       ns16550_com1.io_base = 0x3f8;
+                       ns16550_com1.irq = ns16550_com1_gsi = 4;
+                       return 0;
+               }
+       }
+       return -ENODEV;
 }
 #endif
 

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