[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/28] isa: add isa_register_ioport()
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PULL 10/28] isa: add isa_register_ioport() |
Date: |
Mon, 12 Sep 2011 13:50:48 +0300 |
From: Richard Henderson <address@hidden>
To replace isa_init_ioport and isa_init_ioport_range
as the ISA devices are converted to the memory api.
[avi: use memory_region_size()]
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/isa-bus.c | 10 ++++++++++
hw/isa.h | 5 ++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index d067505..6c15a31 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -108,6 +108,16 @@ void isa_init_ioport(ISADevice *dev, uint16_t ioport)
isa_init_ioport_range(dev, ioport, 1);
}
+void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start)
+{
+ memory_region_add_subregion(isabus->address_space_io, start, io);
+ if (dev != NULL) {
+ assert(dev->nio < ARRAY_SIZE(dev->io));
+ dev->io[dev->nio++] = io;
+ isa_init_ioport_range(dev, start, memory_region_size(io));
+ }
+}
+
static int isa_qdev_init(DeviceState *qdev, DeviceInfo *base)
{
ISADevice *dev = DO_UPCAST(ISADevice, qdev, qdev);
diff --git a/hw/isa.h b/hw/isa.h
index 390e2d4..432d17a 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);
@@ -29,6 +31,7 @@ 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);
--
1.7.6.1
- [Qemu-devel] [PULL 04/28] mips_r4k: convert to memory API, (continued)
- [Qemu-devel] [PULL 04/28] mips_r4k: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 24/28] etrax-eth: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 17/28] serial: Convert serial_isa_initfn to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 25/28] serial: Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 15/28] i8259: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 18/28] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 08/28] pci: add pci_address_space_io(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 22/28] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 10/28] isa: add isa_register_ioport(),
Avi Kivity <=
- [Qemu-devel] [PULL 13/28] i8254: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 23/28] etrax-dma: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 21/28] etrax-ser: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 01/28] mips_jazz: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 26/28] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 14/28] mips_malta: move i8259 initialization after piix4 initialization, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 11/28] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 07/28] omap1: convert to memory API (part II), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 19/28] pci: simplify memory region registration, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 16/28] pckbd: Convert to MemoryRegion, Avi Kivity, 2011/09/12