[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] i8254: Convert to MemoryRegion.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 06/11] i8254: Convert to MemoryRegion. |
Date: |
Wed, 10 Aug 2011 15:28:15 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
hw/i8254.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/hw/i8254.c b/hw/i8254.c
index a9ca9f6..12571ef 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -55,6 +55,7 @@ typedef struct PITChannelState {
typedef struct PITState {
ISADevice dev;
+ MemoryRegion ioports;
uint32_t irq;
uint32_t iobase;
PITChannelState channels[3];
@@ -506,6 +507,16 @@ void hpet_pit_enable(void)
pit_load_count(s, 0);
}
+static const MemoryRegionPortio pit_portio[] = {
+ { 0, 4, 1, .write = pit_ioport_write },
+ { 0, 3, 1, .read = pit_ioport_read },
+ PORTIO_END_OF_LIST()
+};
+
+static const MemoryRegionOps pit_ioport_ops = {
+ .old_portio = pit_portio
+};
+
static int pit_initfn(ISADevice *dev)
{
PITState *pit = DO_UPCAST(PITState, dev, dev);
@@ -516,9 +527,8 @@ static int pit_initfn(ISADevice *dev)
s->irq_timer = qemu_new_timer_ns(vm_clock, pit_irq_timer, s);
s->irq = isa_get_irq(pit->irq);
- register_ioport_write(pit->iobase, 4, 1, pit_ioport_write, pit);
- register_ioport_read(pit->iobase, 3, 1, pit_ioport_read, pit);
- isa_init_ioport(dev, pit->iobase);
+ memory_region_init_io(&pit->ioports, &pit_ioport_ops, pit, "pit", 4);
+ isa_register_ioport(dev, &pit->ioports, pit->iobase);
qdev_set_legacy_instance_id(&dev->qdev, pit->iobase, 2);
--
1.7.6
- [Qemu-devel] [PATCH 00/11] Memory API conversion for ISA, Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 02/11] isa: Pass i/o address space to isa_bus_new., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 03/11] isa: add isa_register_ioport(), Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 04/11] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 05/11] cs4231a: Convert to MemoryRegion., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 06/11] i8254: Convert to MemoryRegion.,
Richard Henderson <=
- [Qemu-devel] [PATCH 01/11] pci: add pci_address_space_io(), Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 07/11] i8259: Convert to MemoryRegion., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 08/11] pckbd: Convert to MemoryRegion., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 09/11] serial: Convert serial_isa_initfn to MemoryRegion., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 11/11] fdc: Convert isabus_fdc_init1 to MemoryRegion., Richard Henderson, 2011/08/10
- [Qemu-devel] [PATCH 10/11] memory: Fix old_portio vs non-zero offset., Richard Henderson, 2011/08/10
- Re: [Qemu-devel] [PATCH 00/11] Memory API conversion for ISA, Avi Kivity, 2011/08/11