[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/14] i82374: replace register_ioport*
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v3 04/14] i82374: replace register_ioport* |
Date: |
Sat, 22 Jun 2013 08:06:57 +0200 |
From: Jan Kiszka <address@hidden>
Convert over to memory regions to obsolete register_ioport*.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/dma/i82374.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 6192780..ecda5cb 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -124,16 +124,24 @@ static const VMStateDescription vmstate_isa_i82374 = {
},
};
+static const MemoryRegionPortio i82374_portio_list[] = {
+ { 0x0A, 1, 1, .read = i82374_read_isr, },
+ { 0x10, 8, 1, .write = i82374_write_command, },
+ { 0x18, 8, 1, .read = i82374_read_status, },
+ { 0x20, 0x20, 1,
+ .write = i82374_write_descriptor, .read = i82374_read_descriptor, },
+ PORTIO_END_OF_LIST(),
+};
+
static void i82374_isa_realize(DeviceState *dev, Error **errp)
{
ISAi82374State *isa = I82374(dev);
I82374State *s = &isa->state;
+ PortioList *port_list = g_new(PortioList, 1);
- register_ioport_read(isa->iobase + 0x0A, 1, 1, i82374_read_isr, s);
- register_ioport_write(isa->iobase + 0x10, 8, 1, i82374_write_command, s);
- register_ioport_read(isa->iobase + 0x18, 8, 1, i82374_read_status, s);
- register_ioport_write(isa->iobase + 0x20, 0x20, 1,
i82374_write_descriptor, s);
- register_ioport_read(isa->iobase + 0x20, 0x20, 1, i82374_read_descriptor,
s);
+ portio_list_init(port_list, i82374_portio_list, s, "i82374");
+ portio_list_add(port_list, isa_address_space_io(&isa->parent_obj),
+ isa->iobase);
i82374_realize(s, errp);
--
1.7.3.4
- [Qemu-devel] [PATCH v3 00/14] Refactor portio dispatching, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 03/14] wdt_ib700: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 08/14] isa: implement isa_is_ioport_assigned via memory_region_find, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 02/14] applesmc: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 04/14] i82374: replace register_ioport*,
Jan Kiszka <=
- [Qemu-devel] [PATCH v3 10/14] xen: Mark fixed platform I/O as unaligned, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 09/14] vmware-vga: Accept unaligned I/O accesses, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 14/14] ioport: Move portio types to ioport.h, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 11/14] ioport: Switch dispatching to memory core layer, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 13/14] vmport: Disentangle read handler type from portio, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 05/14] prep: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 01/14] adlib: replace register_ioport*, Jan Kiszka, 2013/06/22