From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kw4jy-00017o-3I for qemu-devel@nongnu.org; Fri, 31 Oct 2008 20:53:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kw4jx-00017V-In for qemu-devel@nongnu.org; Fri, 31 Oct 2008 20:53:21 -0400 Received: from [199.232.76.173] (port=48017 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kw4jx-00017P-Aw for qemu-devel@nongnu.org; Fri, 31 Oct 2008 20:53:21 -0400 Received: from savannah.gnu.org ([199.232.41.3]:36602 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kw4jx-0002v1-NK for qemu-devel@nongnu.org; Fri, 31 Oct 2008 20:53:21 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1Kw4jw-0001Ll-7V for qemu-devel@nongnu.org; Sat, 01 Nov 2008 00:53:20 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1Kw4jv-0001Lg-PP for qemu-devel@nongnu.org; Sat, 01 Nov 2008 00:53:19 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Sat, 01 Nov 2008 00:53:19 +0000 Subject: [Qemu-devel] [5585] Malta & OMAP: add a name to char devices Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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);