[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/24] vmport: Convert to isa_register_ioport
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 22/24] vmport: Convert to isa_register_ioport |
Date: |
Mon, 10 Oct 2011 16:59:51 +0200 |
From: Richard Henderson <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/vmport.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/hw/vmport.c b/hw/vmport.c
index c8aefaa..b5c6fa1 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -38,6 +38,7 @@
typedef struct _VMPortState
{
ISADevice dev;
+ MemoryRegion io;
IOPortReadFunc *func[VMPORT_ENTRIES];
void *opaque[VMPORT_ENTRIES];
} VMPortState;
@@ -120,13 +121,22 @@ void vmmouse_set_data(const uint32_t *data)
env->regs[R_ESI] = data[4]; env->regs[R_EDI] = data[5];
}
+static const MemoryRegionPortio vmport_portio[] = {
+ {0, 1, 4, .read = vmport_ioport_read, .write = vmport_ioport_write },
+ PORTIO_END_OF_LIST(),
+};
+
+static const MemoryRegionOps vmport_ops = {
+ .old_portio = vmport_portio
+};
+
static int vmport_initfn(ISADevice *dev)
{
VMPortState *s = DO_UPCAST(VMPortState, dev, dev);
- register_ioport_read(0x5658, 1, 4, vmport_ioport_read, s);
- register_ioport_write(0x5658, 1, 4, vmport_ioport_write, s);
- isa_init_ioport(dev, 0x5658);
+ memory_region_init_io(&s->io, &vmport_ops, s, "vmport", 1);
+ isa_register_ioport(dev, &s->io, 0x5658);
+
port_state = s;
/* Register some generic port commands */
vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);
--
1.7.6.3
- [Qemu-devel] [PULL 00/24] Memory API, batch 11, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 02/24] palm: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 08/24] ppc_newworld: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 22/24] vmport: Convert to isa_register_ioport,
Avi Kivity <=
- [Qemu-devel] [PATCH 05/24] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 13/24] fdc: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 16/24] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 10/24] Introduce PortioList, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 12/24] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 09/24] isa: Tidy support code for isabus_get_fw_dev_path, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 17/24] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 11/24] memory: Fix old portio word accesses, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 04/24] petalogix_s2adsp1800: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 03/24] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/10