linux-user: fix ppc target_stat64 st_blocks layout

[qemu] / hw / isa.h

diff --git a/hw/isa.h b/hw/isa.h
index 1a3bb5b..655ad62 100644 (file)
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -12,13 +12,11 @@ typedef struct ISADeviceInfo ISADeviceInfo;
 
 struct ISADevice {
     DeviceState qdev;
-    uint32_t iobase[2];
     uint32_t isairq[2];
-    qemu_irq *irqs[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;
@@ -26,10 +24,11 @@ struct ISADeviceInfo {
 
 ISABus *isa_bus_new(DeviceState *dev);
 void isa_bus_irqs(qemu_irq *irqs);
-void isa_connect_irq(ISADevice *dev, int devirq, int isairq);
-void isa_init_irq(ISADevice *dev, qemu_irq *p);
+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;