Merge remote branch 'kwolf/for-anthony' into staging

[qemu.git] / hw / isa.h

diff --git a/hw/isa.h b/hw/isa.h
index 49c58f84faf8b927b41258e701ce48211ceb1e34..aaf0272c2529346f5dfb63cd5bfa46fa9b7cda3d 100644 (file)
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -12,26 +12,27 @@ typedef struct ISADeviceInfo ISADeviceInfo;
 
 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;
 
-void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size);
+void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size, int be);
 
 /* dma.c */
 int DMA_get_channel_mode (int nchan);
@@ -40,7 +41,7 @@ int DMA_write_memory (int nchan, void *buf, int pos, int size);
 void DMA_hold_DREQ (int nchan);
 void DMA_release_DREQ (int nchan);
 void DMA_schedule(int nchan);
-void DMA_init (int high_page_enable);
+void DMA_init(int high_page_enable, qemu_irq *cpu_request_exit);
 void DMA_register_channel (int nchan,
                            DMA_transfer_handler transfer_handler,
                            void *opaque);