diff options
| -rw-r--r-- | hw/escc.c | 8 | ||||
| -rw-r--r-- | hw/escc.h | 4 | ||||
| -rw-r--r-- | hw/sun4m.c | 4 |
3 files changed, 8 insertions, 8 deletions
@@ -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; @@ -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 bb44d4757e..fffd173ab7 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); |