struct ISADevice {
DeviceState qdev;
- uint32_t iobase[2];
- qemu_irq *irqs[2];
+ uint32_t isairq[2];
int nirqs;
};
-typedef void (*isa_qdev_initfn)(ISADevice *dev);
+typedef int (*isa_qdev_initfn)(ISADevice *dev);
struct ISADeviceInfo {
DeviceInfo qdev;
isa_qdev_initfn init;
};
ISABus *isa_bus_new(DeviceState *dev);
-void isa_connect_irq(ISADevice *dev, int n, qemu_irq irq);
-void isa_init_irq(ISADevice *dev, qemu_irq *p);
+void isa_bus_irqs(qemu_irq *irqs);
+qemu_irq isa_reserve_irq(int isairq);
+void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
void isa_qdev_register(ISADeviceInfo *info);
-ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2);
+ISADevice *isa_create(const char *name);
+ISADevice *isa_create_simple(const char *name);
extern target_phys_addr_t isa_mem_base;