diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-22 13:53:21 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:50 -0500 |
| commit | ac0be998009257f0368e25470bac4e85b694ceaf (patch) | |
| tree | e6ff10fce45bd25890688a871758a428fb5cbcaf /hw/mips_r4k.c | |
| parent | 41b5e892b7dbf553b356b51004a6966233e71a6d (diff) | |
| download | qemu-ac0be998009257f0368e25470bac4e85b694ceaf.tar.gz qemu-ac0be998009257f0368e25470bac4e85b694ceaf.tar.bz2 qemu-ac0be998009257f0368e25470bac4e85b694ceaf.zip | |
serial: convert isa to qdev
Everything using standard isa I/O ports and IRQ windup is considerd
being an actual isa device. That are all serial_init() users except
mips_mipssim() which seems to have a non-standard IRQ windup.
baud rate is fixed at 115200 now as no caller passed in something else.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_r4k.c')
| -rw-r--r-- | hw/mips_r4k.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index b3abc61551..d7b301a9cc 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -31,9 +31,6 @@ static const int ide_iobase[2] = { 0x1f0, 0x170 }; static const int ide_iobase2[2] = { 0x3f6, 0x376 }; static const int ide_irq[2] = { 14, 15 }; -static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; -static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; - static PITState *pit; /* PIT i8254 */ /* i8254 PIT is attached to the IRQ0 at PIC i8259 */ @@ -262,8 +259,7 @@ void mips_r4k_init (ram_addr_t ram_size, for(i = 0; i < MAX_SERIAL_PORTS; i++) { if (serial_hds[i]) { - serial_init(serial_io[i], i8259[serial_irq[i]], 115200, - serial_hds[i]); + serial_isa_init(i, serial_hds[i]); } } |