[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/28] serial: Convert serial_isa_initfn to MemoryReg
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PULL 17/28] serial: Convert serial_isa_initfn to MemoryRegion |
Date: |
Mon, 12 Sep 2011 13:50:55 +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.6.1
- [Qemu-devel] [PULL 00/28] Memory API conversion, batch 7, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 03/28] mips_mipssim: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 02/28] mips_malta: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 04/28] mips_r4k: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 24/28] etrax-eth: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 17/28] serial: Convert serial_isa_initfn to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [PULL 25/28] serial: Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 15/28] i8259: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 18/28] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 08/28] pci: add pci_address_space_io(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 22/28] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 10/28] isa: add isa_register_ioport(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 13/28] i8254: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 23/28] etrax-dma: Convert to MemoryRegion, Avi Kivity, 2011/09/12