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/sun4u.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'hw/sun4u.c') diff --git a/hw/sun4u.c b/hw/sun4u.c index f77714e..37e3dda 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -337,9 +337,6 @@ void cpu_tick_set_limit(void *opaque, uint64_t limit) ptimer_set_limit(opaque, -limit, 0); } -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 }; @@ -602,8 +599,7 @@ static void sun4uv_init(ram_addr_t RAM_size, } for(; i < MAX_SERIAL_PORTS; i++) { if (serial_hds[i]) { - serial_init(serial_io[i], NULL/*serial_irq[i]*/, 115200, - serial_hds[i]); + serial_isa_init(i, serial_hds[i]); } } -- cgit v1.1