summaryrefslogtreecommitdiffstats
path: root/hw/mips_malta.c
diff options
context:
space:
mode:
authorGerd Hoffmann2009-09-10 11:43:26 +0200
committermalc2009-09-10 17:47:58 +0200
commit86c861578453b544fa67ad50d28c4460bee068c5 (patch)
tree639b1de76d4c0fdbd8ae2501da3288bc62ae28ce /hw/mips_malta.c
parentqdev: add property type for 32bit signed integers. (diff)
downloadqemu-86c861578453b544fa67ad50d28c4460bee068c5.tar.gz
qemu-86c861578453b544fa67ad50d28c4460bee068c5.tar.xz
qemu-86c861578453b544fa67ad50d28c4460bee068c5.zip
qdev: drop iobase properties from isa bus
Lot of ISA devices work at fixed addresses, so having iobase as bus property doesn't make much sense. Devices which can have different iobases will get a device property. Also simply hard-code stuff which can't be configured anyway. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r--hw/mips_malta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index bb6364b08a..3222e166e6 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -921,7 +921,7 @@ void mips_malta_init (ram_addr_t ram_size,
DMA_init(0);
/* Super I/O */
- isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
+ isa_dev = isa_create_simple("i8042", 1, 12);
rtc_state = rtc_init(0x70, isa_reserve_irq(8), 2000);
serial_init(0x3f8, isa_reserve_irq(4), 115200, serial_hds[0]);
@@ -932,7 +932,7 @@ void mips_malta_init (ram_addr_t ram_size,
dinfo = drive_get(IF_FLOPPY, 0, i);
fd[i] = dinfo ? dinfo->bdrv : NULL;
}
- floppy_controller = fdctrl_init_isa(6, 2, 0x3f0, fd);
+ floppy_controller = fdctrl_init_isa(fd);
/* Sound card */
#ifdef HAS_AUDIO