[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/14] m48t59: Convert to isa_register_ioport.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 05/14] m48t59: Convert to isa_register_ioport. |
Date: |
Tue, 16 Aug 2011 09:45:36 -0700 |
The sysbus interface is as yet unconverted.
Signed-off-by: Richard Henderson <address@hidden>
---
hw/m48t59.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 537c0f7..2520812 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -72,6 +72,7 @@ struct M48t59State {
typedef struct M48t59ISAState {
ISADevice busdev;
M48t59State state;
+ MemoryRegion io;
} M48t59ISAState;
typedef struct M48t59SysBusState {
@@ -625,6 +626,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)
@@ -668,10 +678,9 @@ M48t59State *m48t59_init_isa(uint32_t io_base, uint16_t
size, int type)
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
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., (continued)
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., Avi Kivity, 2011/08/17
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., Blue Swirl, 2011/08/17
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., Avi Kivity, 2011/08/17
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., Blue Swirl, 2011/08/17
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., Avi Kivity, 2011/08/17
[Qemu-devel] [PATCH 04/14] gus: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 07/14] ne2000: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 06/14] rtc: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 10/14] vga: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 05/14] m48t59: Convert to isa_register_ioport.,
Richard Henderson <=
[Qemu-devel] [PATCH 11/14] pc: Convert port92 to isa_register_ioport., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 12/14] vmport: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 14/14] isa: Remove isa_init_ioport_range and isa_init_ioport., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 08/14] parallel: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 09/14] sb16: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
[Qemu-devel] [PATCH 13/14] ide: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16