From 86c861578453b544fa67ad50d28c4460bee068c5 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 10 Sep 2009 11:43:26 +0200 Subject: 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 --- hw/isa-bus.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'hw/isa-bus.c') diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 2843b5132c..fde066acc9 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -35,11 +35,6 @@ static struct BusInfo isa_bus_info = { .name = "ISA", .size = sizeof(ISABus), .print_dev = isabus_dev_print, - .props = (Property[]) { - DEFINE_PROP_HEX32("iobase", ISADevice, iobase[0], -1), - DEFINE_PROP_HEX32("iobase2", ISADevice, iobase[1], -1), - DEFINE_PROP_END_OF_LIST(), - } }; ISABus *isa_bus_new(DeviceState *dev) @@ -122,8 +117,7 @@ void isa_qdev_register(ISADeviceInfo *info) qdev_register(&info->qdev); } -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, - uint32_t irq, uint32 irq2) +ISADevice *isa_create_simple(const char *name, uint32_t irq, uint32 irq2) { DeviceState *dev; ISADevice *isa; @@ -134,8 +128,6 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2 } dev = qdev_create(&isabus->qbus, name); isa = DO_UPCAST(ISADevice, qdev, dev); - isa->iobase[0] = iobase; - isa->iobase[1] = iobase2; qdev_init(dev); if (irq != -1) { isa_connect_irq(isa, 0, irq); -- cgit 1.4.1