From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMpZ9-0007ID-3G for qemu-devel@nongnu.org; Tue, 13 Jan 2009 15:08:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMpZ8-0007Gw-9w for qemu-devel@nongnu.org; Tue, 13 Jan 2009 15:08:46 -0500 Received: from [199.232.76.173] (port=32847 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMpZ8-0007Gg-2I for qemu-devel@nongnu.org; Tue, 13 Jan 2009 15:08:46 -0500 Received: from savannah.gnu.org ([199.232.41.3]:40206 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 1LMpZ7-0006qu-Ma for qemu-devel@nongnu.org; Tue, 13 Jan 2009 15:08:45 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LMpZ6-0005lw-MQ for qemu-devel@nongnu.org; Tue, 13 Jan 2009 20:08:44 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LMpZ6-0005lr-7W for qemu-devel@nongnu.org; Tue, 13 Jan 2009 20:08:44 +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: Tue, 13 Jan 2009 20:08:44 +0000 Subject: [Qemu-devel] [6290] sun4c/sun4d: also swap the CharDriverState of escc_init() 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: 6290 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6290 Author: aurel32 Date: 2009-01-13 20:08:43 +0000 (Tue, 13 Jan 2009) Log Message: ----------- sun4c/sun4d: also swap the CharDriverState of escc_init() Forgotten in r6284 Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/sun4m.c Modified: trunk/hw/sun4m.c =================================================================== --- trunk/hw/sun4m.c 2009-01-13 20:06:26 UTC (rev 6289) +++ trunk/hw/sun4m.c 2009-01-13 20:08:43 UTC (rev 6290) @@ -548,8 +548,8 @@ nographic, ESCC_CLOCK, 1); // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device - escc_init(hwdef->serial_base, slavio_irq[hwdef->ser_irq], serial_hds[1], - serial_hds[0], ESCC_CLOCK, 1); + escc_init(hwdef->serial_base, slavio_irq[hwdef->ser_irq], serial_hds[0], + serial_hds[1], ESCC_CLOCK, 1); cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1); slavio_misc = slavio_misc_init(hwdef->slavio_base, hwdef->apc_base, @@ -1331,8 +1331,8 @@ nographic, ESCC_CLOCK, 1); // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device - escc_init(hwdef->serial_base, sbi_irq[hwdef->ser_irq], serial_hds[1], - serial_hds[0], ESCC_CLOCK, 1); + escc_init(hwdef->serial_base, sbi_irq[hwdef->ser_irq], serial_hds[0], + serial_hds[1], ESCC_CLOCK, 1); if (drive_get_max_bus(IF_SCSI) > 0) { fprintf(stderr, "qemu: too many SCSI bus\n");