david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ESCC: swap the two CharDriverState arguments

Browse Source 
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 <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6284 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2009-01-13 19:08:18 +00:00
parent 6b4079f843
commit f5cbc474e8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/escc.c
View File

@ -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, int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chrA,
CharDriverState *chr2, int clock, int it_shift) CharDriverState *chrB, int clock, int it_shift)
{ {
int escc_io_memory, i; int escc_io_memory, i;
SerialState *s; SerialState *s;
@ -737,8 +737,8 @@ int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chr1,
escc_io_memory); escc_io_memory);
s->it_shift = it_shift; s->it_shift = it_shift;
s->chn[0].chr = chr1; s->chn[0].chr = chrB;
s->chn[1].chr = chr2; s->chn[1].chr = chrA;
s->chn[0].disabled = 0; s->chn[0].disabled = 0;
s->chn[1].disabled = 0; s->chn[1].disabled = 0;

4
hw/escc.h
View File

@ -1,7 +1,7 @@
/* escc.c */ /* escc.c */
#define ESCC_SIZE 4 #define ESCC_SIZE 4
int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chr1, int escc_init(target_phys_addr_t base, qemu_irq irq, CharDriverState *chrA,
CharDriverState *chr2, int clock, int it_shift); CharDriverState *chrB, int clock, int it_shift);
void slavio_serial_ms_kbd_init(target_phys_addr_t base, qemu_irq irq, void slavio_serial_ms_kbd_init(target_phys_addr_t base, qemu_irq irq,
int disabled, int clock, int it_shift); int disabled, int clock, int it_shift);

4
hw/sun4m.c
View File

@ -1564,8 +1564,8 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,
nographic, ESCC_CLOCK, 1); nographic, ESCC_CLOCK, 1);
// Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device
// Slavio TTYB (base+0, Linux ttyS1) is the second 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], escc_init(hwdef->serial_base, slavio_irq[hwdef->ser_irq], serial_hds[0],
serial_hds[0], ESCC_CLOCK, 1); serial_hds[1], ESCC_CLOCK, 1);
slavio_misc = slavio_misc_init(0, 0, hwdef->aux1_base, 0, slavio_misc = slavio_misc_init(0, 0, hwdef->aux1_base, 0,
slavio_irq[hwdef->me_irq], NULL, &fdc_tc); slavio_irq[hwdef->me_irq], NULL, &fdc_tc);