diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
| commit | 4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c (patch) | |
| tree | a764e6ea07f06acf51df4d62790cdf9ae922d55d /hw/mips_mipssim.c | |
| parent | 475363176c80feedb8feb5e335ba64de68c7b055 (diff) | |
| parent | 582299336879504353e60c7937fbc70fea93f3da (diff) | |
| download | focaccia-qemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.tar.gz focaccia-qemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.zip | |
Merge branch 'memory-ioport' of git://github.com/afaerber/qemu-cpu
* 'memory-ioport' of git://github.com/afaerber/qemu-cpu: hw/dma.c: Replace register_ioport_* hw/pc.c: Replace register_ioport_* serial: Replace register_ioport_* hw/cirrus_vga.c: Replace register_ioport_* hw/apm.c: Replace register_ioport_* isa: Add isa_address_space_io()
Diffstat (limited to 'hw/mips_mipssim.c')
| -rw-r--r-- | hw/mips_mipssim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index a95a3c1f11..20b5f1a58c 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -217,7 +217,8 @@ mips_mipssim_init(QEMUMachineInitArgs *args) /* A single 16450 sits at offset 0x3f8. It is attached to MIPS CPU INT2, which is interrupt 4. */ if (serial_hds[0]) - serial_init(0x3f8, env->irq[4], 115200, serial_hds[0]); + serial_init(0x3f8, env->irq[4], 115200, serial_hds[0], + get_system_io()); if (nd_table[0].used) /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ |