[Qemu-devel] [5585] Malta & OMAP: add a name to char devices

[Aurelien Jarno]

Revision: 5585
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5585
Author:   aurel32
Date:     2008-11-01 00:53:19 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
Malta & OMAP: add a name to char devices

(fixes regression introduced by r5575)

Signed-off-by: Aurelien Jarno <address@hidden>

Modified Paths:
--------------
    trunk/hw/mips_malta.c
    trunk/hw/omap1.c
    trunk/hw/omap2.c

Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c       2008-11-01 00:53:09 UTC (rev 5584)
+++ trunk/hw/mips_malta.c       2008-11-01 00:53:19 UTC (rev 5585)
@@ -435,7 +435,7 @@
     cpu_register_physical_memory(base, 0x900, malta);
     cpu_register_physical_memory(base + 0xa00, 0x100000 - 0xa00, malta);
 
-    s->display = qemu_chr_open("vc:320x200");
+    s->display = qemu_chr_open("fpga", "vc:320x200");
     qemu_chr_printf(s->display, "\e[HMalta LEDBAR\r\n");
     qemu_chr_printf(s->display, "+--------+\r\n");
     qemu_chr_printf(s->display, "+        +\r\n");
@@ -446,7 +446,7 @@
     qemu_chr_printf(s->display, "+        +\r\n");
     qemu_chr_printf(s->display, "+--------+\r\n");
 
-    uart_chr = qemu_chr_open("vc:80Cx24C");
+    uart_chr = qemu_chr_open("cbus", "vc:80Cx24C");
     qemu_chr_printf(uart_chr, "CBUS UART\r\n");
     s->uart =
         serial_mm_init(base + 0x900, 3, env->irq[2], 230400, uart_chr, 1);

Modified: trunk/hw/omap1.c
===================================================================
--- trunk/hw/omap1.c    2008-11-01 00:53:09 UTC (rev 5584)
+++ trunk/hw/omap1.c    2008-11-01 00:53:19 UTC (rev 5585)
@@ -2017,7 +2017,7 @@
     s->fclk = fclk;
     s->irq = irq;
     s->serial = serial_mm_init(base, 2, irq, omap_clk_getrate(fclk)/16,
-                               chr ?: qemu_chr_open("null"), 1);
+                               chr ?: qemu_chr_open("null", "null"), 1);
 
     return s;
 }
@@ -2128,7 +2128,7 @@
     /* TODO: Should reuse or destroy current s->serial */
     s->serial = serial_mm_init(s->base, 2, s->irq,
                     omap_clk_getrate(s->fclk) / 16,
-                    chr ?: qemu_chr_open("null"), 1);
+                    chr ?: qemu_chr_open("null", "null"), 1);
 }
 
 /* MPU Clock/Reset/Power Mode Control */

Modified: trunk/hw/omap2.c
===================================================================
--- trunk/hw/omap2.c    2008-11-01 00:53:09 UTC (rev 5584)
+++ trunk/hw/omap2.c    2008-11-01 00:53:19 UTC (rev 5585)
@@ -2185,7 +2185,7 @@
     s->irq = irq;
     omap_sti_reset(s);
 
-    s->chr = chr ?: qemu_chr_open("null");
+    s->chr = chr ?: qemu_chr_open("null", "null");
 
     iomemtype = l4_register_io_memory(0, omap_sti_readfn,
                     omap_sti_writefn, s);