From 5ca78e8e792d7e68c2f143312b0626bf7a155016 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Tue, 13 Jan 2009 19:08:18 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6284 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/escc.c | 8 ++++---- hw/escc.h | 4 ++-- hw/sun4m.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/escc.c b/hw/escc.c index 06e9823..d68f90b 100644 --- a/hw/escc.c +++ b/hw/escc.c @@ -719,8 +719,8 @@ static int escc_load(QEMUFile *f, void *opaque, int version_id) } -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 @@ int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chr1, 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; diff --git a/hw/escc.h b/hw/escc.h index cb710eb..2f3ae31 100644 --- a/hw/escc.h +++ b/hw/escc.h @@ -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); diff --git a/hw/sun4m.c b/hw/sun4m.c index bb44d47..fffd173 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -1564,8 +1564,8 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, 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); -- 2.7.4