ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serial: Convert serial_isa_initfn to MemoryRegion 

The serial_mm_init path is as yet unconverted.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Richard Henderson 2011-08-10 15:28:18 -07:00 committed by Avi Kivity
parent dbff76ac33
commit a941ae4515
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/serial.c
View File

@ -157,6 +157,7 @@ struct SerialState {
typedef struct ISASerialState { typedef struct ISASerialState {
ISADevice dev; ISADevice dev;
MemoryRegion io;
uint32_t index; uint32_t index;
uint32_t iobase; uint32_t iobase;
uint32_t isairq; 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_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
static const int isa_serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; 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 serial_isa_initfn(ISADevice *dev)
{ {
static int index; static int index;
@ -776,9 +786,8 @@ static int serial_isa_initfn(ISADevice *dev)
serial_init_core(s); serial_init_core(s);
qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3); qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3);
register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s); memory_region_init_io(&isa->io, &serial_io_ops, s, "serial", 8);
register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s); isa_register_ioport(dev, &isa->io, isa->iobase);
isa_init_ioport_range(dev, isa->iobase, 8);
return 0; return 0;
} }