From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMocg-0005tI-O2 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:08:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMocg-0005sd-1f for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:08:22 -0500 Received: from [199.232.76.173] (port=49768 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMocf-0005sH-PX for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:08:21 -0500 Received: from savannah.gnu.org ([199.232.41.3]:40644 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 1LMocd-0007ar-DX for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:08:19 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LMocc-0005is-TW for qemu-devel@nongnu.org; Tue, 13 Jan 2009 19:08:18 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LMocc-0005io-MB for qemu-devel@nongnu.org; Tue, 13 Jan 2009 19:08:18 +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 19:08:18 +0000 Subject: [Qemu-devel] [6284] ESCC: swap the two CharDriverState arguments 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: 6284 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6284 Author: aurel32 Date: 2009-01-13 19:08:18 +0000 (Tue, 13 Jan 2009) Log Message: ----------- ESCC: swap the two CharDriverState arguments Swap the two CharDriverState arguments so that the first argument corresponds to the channel A and the second argument to the channel B. Modify hw/sun4m.c accordingly. This fixes the order of the serial ports on the PPC machines. Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/escc.c trunk/hw/escc.h trunk/hw/sun4m.c Modified: trunk/hw/escc.c =================================================================== --- trunk/hw/escc.c 2009-01-13 19:08:10 UTC (rev 6283) +++ trunk/hw/escc.c 2009-01-13 19:08:18 UTC (rev 6284) @@ -719,8 +719,8 @@ } -int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chr1, - CharDriverState *chr2, int clock, int it_shift) +int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chrA, + CharDriverState *chrB, int clock, int it_shift) { int escc_io_memory, i; SerialState *s; @@ -737,8 +737,8 @@ escc_io_memory); s->it_shift = it_shift; - s->chn[0].chr = chr1; - s->chn[1].chr = chr2; + s->chn[0].chr = chrB; + s->chn[1].chr = chrA; s->chn[0].disabled = 0; s->chn[1].disabled = 0; Modified: trunk/hw/escc.h =================================================================== --- trunk/hw/escc.h 2009-01-13 19:08:10 UTC (rev 6283) +++ trunk/hw/escc.h 2009-01-13 19:08:18 UTC (rev 6284) @@ -1,7 +1,7 @@ /* escc.c */ #define ESCC_SIZE 4 -int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chr1, - CharDriverState *chr2, int clock, int it_shift); +int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chrA, + CharDriverState *chrB, int clock, int it_shift); void slavio_serial_ms_kbd_init(target_phys_addr_t base, qemu_irq irq, int disabled, int clock, int it_shift); Modified: trunk/hw/sun4m.c =================================================================== --- trunk/hw/sun4m.c 2009-01-13 19:08:10 UTC (rev 6283) +++ trunk/hw/sun4m.c 2009-01-13 19:08:18 UTC (rev 6284) @@ -1564,8 +1564,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); slavio_misc = slavio_misc_init(0, 0, hwdef->aux1_base, 0, slavio_irq[hwdef->me_irq], NULL, &fdc_tc);