[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/19] isa: add isa_register_ioport()
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 11/19] isa: add isa_register_ioport() |
Date: |
Thu, 25 Aug 2011 11:09:10 +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.5.3
- [Qemu-devel] [PATCH 00/19] Memory API conversions: batch 6, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 09/19] pci: add pci_address_space_io(), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 01/19] mips_fulong2e: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 04/19] mips_mipssim: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 19/19] pci: simplify memory region registration, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 17/19] serial: Convert serial_isa_initfn to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 13/19] cs4231a: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 11/19] isa: add isa_register_ioport(),
Avi Kivity <=
- [Qemu-devel] [PATCH 12/19] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 06/19] musicpal: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 14/19] i8254: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 18/19] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 07/19] omap1: convert to memory API (part I), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 16/19] pckbd: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 10/19] isa: Pass i/o address space to isa_bus_new, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 15/19] i8259: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 05/19] mips_r4k: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 03/19] mips_malta: convert to memory API, Avi Kivity, 2011/08/25