[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/25] m48t59: Convert to isa_register_ioport
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 16/25] m48t59: Convert to isa_register_ioport |
Date: |
Thu, 6 Oct 2011 12:23:26 +0200 |
From: Richard Henderson <address@hidden>
The sysbus interface is as yet unconverted.
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/m48t59.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 0cc361e..f318e67 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -73,6 +73,7 @@ struct M48t59State {
typedef struct M48t59ISAState {
ISADevice busdev;
M48t59State state;
+ MemoryRegion io;
} M48t59ISAState;
typedef struct M48t59SysBusState {
@@ -626,6 +627,15 @@ static void m48t59_reset_sysbus(DeviceState *d)
m48t59_reset_common(NVRAM);
}
+static const MemoryRegionPortio m48t59_portio[] = {
+ {0, 4, 1, .read = NVRAM_readb, .write = NVRAM_writeb },
+ PORTIO_END_OF_LIST(),
+};
+
+static const MemoryRegionOps m48t59_io_ops = {
+ .old_portio = m48t59_portio,
+};
+
/* Initialisation routine */
M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base,
uint32_t io_base, uint16_t size, int type)
@@ -669,10 +679,9 @@ static void m48t59_reset_sysbus(DeviceState *d)
d = DO_UPCAST(M48t59ISAState, busdev, dev);
s = &d->state;
+ memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4);
if (io_base != 0) {
- register_ioport_read(io_base, 0x04, 1, NVRAM_readb, s);
- register_ioport_write(io_base, 0x04, 1, NVRAM_writeb, s);
- isa_init_ioport_range(dev, io_base, 4);
+ isa_register_ioport(dev, &d->io, io_base);
}
return s;
--
1.7.6.3
- [Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio regions, (continued)
- [Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio regions, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 04/25] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 12/25] memory: Fix old portio word accesses, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 19/25] parallel: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 18/25] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 21/25] vga: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 20/25] sb16: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 06/25] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 15/25] gus: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 17/25] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 16/25] m48t59: Convert to isa_register_ioport,
Avi Kivity <=
- [Qemu-devel] [PATCH 22/25] pc: Convert port92 to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 23/25] vmport: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 11/25] Introduce PortioList, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 24/25] ide: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 25/25] isa: Remove isa_init_ioport_range and isa_init_ioport, Avi Kivity, 2011/10/06