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

pc87312: Replace register_ioport_*() with MemoryRegion 

Prepare an instance_init function for the MemoryRegion init.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Tested-by: Hervé Poussineau <hpoussin@reactos.org>
This commit is contained in:
Andreas Färber 2013-01-11 21:11:20 +01:00
parent cf7c3f0cb5
commit 328c24a97b
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/pc87312.c
View File

@ -194,7 +194,8 @@ static void pc87312_hard_reset(PC87312State *s)
pc87312_soft_reset(s); pc87312_soft_reset(s);
} }
static void pc87312_ioport_write(void *opaque, uint32_t addr, uint32_t val) static void pc87312_io_write(void *opaque, hwaddr addr, uint64_t val,
unsigned int size)
{ {
PC87312State *s = opaque; PC87312State *s = opaque;
@ -213,7 +214,7 @@ static void pc87312_ioport_write(void *opaque, uint32_t addr, uint32_t val)
} }
} }
static uint32_t pc87312_ioport_read(void *opaque, uint32_t addr) static uint64_t pc87312_io_read(void *opaque, hwaddr addr, unsigned int size)
{ {
PC87312State *s = opaque; PC87312State *s = opaque;
uint32_t val; uint32_t val;
@ -241,6 +242,16 @@ static uint32_t pc87312_ioport_read(void *opaque, uint32_t addr)
return val; return val;
} }
static const MemoryRegionOps pc87312_io_ops = {
.read = pc87312_io_read,
.write = pc87312_io_write,
.endianness = DEVICE_LITTLE_ENDIAN,
.valid = {
.min_access_size = 1,
.max_access_size = 1,
},
};
static int pc87312_post_load(void *opaque, int version_id) static int pc87312_post_load(void *opaque, int version_id)
{ {
PC87312State *s = opaque; PC87312State *s = opaque;
@ -270,6 +281,7 @@ static int pc87312_init(ISADevice *dev)
s = PC87312(dev); s = PC87312(dev);
bus = isa_bus_from_device(dev); bus = isa_bus_from_device(dev);
pc87312_hard_reset(s); pc87312_hard_reset(s);
isa_register_ioport(dev, &s->io, s->iobase);
if (is_parallel_enabled(s)) { if (is_parallel_enabled(s)) {
chr = parallel_hds[0]; chr = parallel_hds[0];
@ -337,11 +349,16 @@ static int pc87312_init(ISADevice *dev)
trace_pc87312_info_ide(get_ide_iobase(s)); trace_pc87312_info_ide(get_ide_iobase(s));
} }
register_ioport_write(s->iobase, 2, 1, pc87312_ioport_write, s);
register_ioport_read(s->iobase, 2, 1, pc87312_ioport_read, s);
return 0; return 0;
} }
static void pc87312_initfn(Object *obj)
{
PC87312State *s = PC87312(obj);
memory_region_init_io(&s->io, &pc87312_io_ops, s, "pc87312", 2);
}
static const VMStateDescription vmstate_pc87312 = { static const VMStateDescription vmstate_pc87312 = {
.name = "pc87312", .name = "pc87312",
.version_id = 1, .version_id = 1,
@ -376,6 +393,7 @@ static const TypeInfo pc87312_type_info = {
.name = TYPE_PC87312, .name = TYPE_PC87312,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(PC87312State), .instance_size = sizeof(PC87312State),
.instance_init = pc87312_initfn,
.class_init = pc87312_class_init, .class_init = pc87312_class_init,
}; };

2
hw/pc87312.h
View File

@ -56,6 +56,8 @@ typedef struct PC87312State {
uint32_t base; uint32_t base;
} ide; } ide;
MemoryRegion io;
uint8_t read_id_step; uint8_t read_id_step;
uint8_t selected_index; uint8_t selected_index;