From ac0be998009257f0368e25470bac4e85b694ceaf Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 22 Sep 2009 13:53:21 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/pc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index 071b887e4e..9c3e3c5b15 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1022,9 +1022,6 @@ static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 0x280, 0x380 }; static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; -static const int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; -static const int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; - static const int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; @@ -1332,8 +1329,7 @@ static void pc_init1(ram_addr_t ram_size, for(i = 0; i < MAX_SERIAL_PORTS; i++) { if (serial_hds[i]) { - serial_init(serial_io[i], isa_reserve_irq(serial_irq[i]), 115200, - serial_hds[i]); + serial_isa_init(i, serial_hds[i]); } } -- cgit v1.2.3