aboutsummaryrefslogtreecommitdiff
path: root/hw/isa.h
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2011-12-15 22:09:51 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-20 15:44:30 -0600
commit48a18b3c698295e4d891f34e919615e84e20f027 (patch)
tree689d5ec205341895b0eef457f3c0313be53b5432 /hw/isa.h
parent0fa29915cdcadb5853515703d3eca8992627dcf2 (diff)
downloadqemu-48a18b3c698295e4d891f34e919615e84e20f027.zip
qemu-48a18b3c698295e4d891f34e919615e84e20f027.tar.gz
qemu-48a18b3c698295e4d891f34e919615e84e20f027.tar.bz2
isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions
NULL is a valid bus/device, so there is no change in behaviour. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/isa.h')
-rw-r--r--hw/isa.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/isa.h b/hw/isa.h
index 5eb9c78..1e75f87 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -9,7 +9,6 @@
#define ISA_NUM_IRQS 16
-typedef struct ISABus ISABus;
typedef struct ISADevice ISADevice;
typedef struct ISADeviceInfo ISADeviceInfo;
@@ -27,14 +26,14 @@ struct ISADeviceInfo {
};
ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io);
-void isa_bus_irqs(qemu_irq *irqs);
-qemu_irq isa_get_irq(int isairq);
+void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
+qemu_irq isa_get_irq(ISADevice *dev, int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
void isa_qdev_register(ISADeviceInfo *info);
MemoryRegion *isa_address_space(ISADevice *dev);
-ISADevice *isa_create(const char *name);
-ISADevice *isa_try_create(const char *name);
-ISADevice *isa_create_simple(const char *name);
+ISADevice *isa_create(ISABus *bus, const char *name);
+ISADevice *isa_try_create(ISABus *bus, const char *name);
+ISADevice *isa_create_simple(ISABus *bus, const char *name);
/**
* isa_register_ioport: Install an I/O port region on the ISA bus.