[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/19] serial: Convert serial_isa_initfn to MemoryRe
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 17/19] serial: Convert serial_isa_initfn to MemoryRegion |
Date: |
Thu, 25 Aug 2011 11:09:16 +0300 |
From: Richard Henderson <address@hidden>
The serial_mm_init path is as yet unconverted.
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/serial.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/serial.c b/hw/serial.c
index ed7fd0a..2e6d212 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -157,6 +157,7 @@ struct SerialState {
typedef struct ISASerialState {
ISADevice dev;
+ MemoryRegion io;
uint32_t index;
uint32_t iobase;
uint32_t isairq;
@@ -755,6 +756,15 @@ void serial_set_frequency(SerialState *s, uint32_t
frequency)
static const int isa_serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8,
0x2e8 };
static const int isa_serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };
+static const MemoryRegionPortio serial_portio[] = {
+ { 0, 8, 1, .read = serial_ioport_read, .write = serial_ioport_write },
+ PORTIO_END_OF_LIST()
+};
+
+static const MemoryRegionOps serial_io_ops = {
+ .old_portio = serial_portio
+};
+
static int serial_isa_initfn(ISADevice *dev)
{
static int index;
@@ -776,9 +786,8 @@ static int serial_isa_initfn(ISADevice *dev)
serial_init_core(s);
qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3);
- register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s);
- register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s);
- isa_init_ioport_range(dev, isa->iobase, 8);
+ memory_region_init_io(&isa->io, &serial_io_ops, s, "serial", 8);
+ isa_register_ioport(dev, &isa->io, isa->iobase);
return 0;
}
--
1.7.5.3
- [Qemu-devel] [PATCH 00/19] Memory API conversions: batch 6, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 09/19] pci: add pci_address_space_io(), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 01/19] mips_fulong2e: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 04/19] mips_mipssim: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 19/19] pci: simplify memory region registration, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 17/19] serial: Convert serial_isa_initfn to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [PATCH 13/19] cs4231a: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 11/19] isa: add isa_register_ioport(), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 12/19] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 06/19] musicpal: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 14/19] i8254: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 18/19] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 07/19] omap1: convert to memory API (part I), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 16/19] pckbd: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 10/19] isa: Pass i/o address space to isa_bus_new, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 15/19] i8259: Convert to MemoryRegion, Avi Kivity, 2011/08/25