diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
| commit | 4c54661feb0437eab99186a0e462524e18592b9c (patch) | |
| tree | 7e2c4969ac479ca13bfacbd569af3c08be103bad /hw/isa.h | |
| parent | 04970fd9339f75f5d21c094ab816a8e429dc1ff1 (diff) | |
| parent | 2f290a8c3db977056e4840810d0dd42032745f21 (diff) | |
| download | focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.gz focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/isa.h')
| -rw-r--r-- | hw/isa.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/isa.h b/hw/isa.h index f344699722..432d17ab26 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -13,10 +13,12 @@ typedef struct ISADeviceInfo ISADeviceInfo; struct ISADevice { DeviceState qdev; + MemoryRegion *io[32]; uint32_t isairq[2]; - int nirqs; uint16_t ioports[32]; + int nirqs; int nioports; + int nio; }; typedef int (*isa_qdev_initfn)(ISADevice *dev); @@ -25,10 +27,11 @@ struct ISADeviceInfo { isa_qdev_initfn init; }; -ISABus *isa_bus_new(DeviceState *dev); +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_init_irq(ISADevice *dev, qemu_irq *p, int isairq); +void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start); void isa_init_ioport(ISADevice *dev, uint16_t ioport); void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length); void isa_qdev_register(ISADeviceInfo *info); |