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

milkymist-vgafb: convert to memory API 

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Michael Walle 2011-08-31 16:48:46 +02:00 committed by Avi Kivity
parent 5adb30d38b
commit 883abf8d2c
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/milkymist-vgafb.c
View File

@ -64,6 +64,7 @@ enum {
struct MilkymistVgafbState { struct MilkymistVgafbState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion regs_region;
DisplayState *ds; DisplayState *ds;
int invalidate; int invalidate;
@ -153,7 +154,8 @@ static void vgafb_resize(MilkymistVgafbState *s)
s->invalidate = 1; s->invalidate = 1;
} }
static uint32_t vgafb_read(void *opaque, target_phys_addr_t addr) static uint64_t vgafb_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
MilkymistVgafbState *s = opaque; MilkymistVgafbState *s = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -189,8 +191,8 @@ static uint32_t vgafb_read(void *opaque, target_phys_addr_t addr)
return r; return r;
} }
static void static void vgafb_write(void *opaque, target_phys_addr_t addr, uint64_t value,
vgafb_write(void *opaque, target_phys_addr_t addr, uint32_t value) unsigned size)
{ {
MilkymistVgafbState *s = opaque; MilkymistVgafbState *s = opaque;
@ -238,16 +240,14 @@ vgafb_write(void *opaque, target_phys_addr_t addr, uint32_t value)
} }
} }
static CPUReadMemoryFunc * const vgafb_read_fn[] = { static const MemoryRegionOps vgafb_mmio_ops = {
NULL, .read = vgafb_read,
NULL, .write = vgafb_write,
&vgafb_read .valid = {
}; .min_access_size = 4,
.max_access_size = 4,
static CPUWriteMemoryFunc * const vgafb_write_fn[] = { },
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
NULL,
&vgafb_write
}; };
static void milkymist_vgafb_reset(DeviceState *d) static void milkymist_vgafb_reset(DeviceState *d)
@ -269,11 +269,10 @@ static void milkymist_vgafb_reset(DeviceState *d)
static int milkymist_vgafb_init(SysBusDevice *dev) static int milkymist_vgafb_init(SysBusDevice *dev)
{ {
MilkymistVgafbState *s = FROM_SYSBUS(typeof(*s), dev); MilkymistVgafbState *s = FROM_SYSBUS(typeof(*s), dev);
int vgafb_regs;
vgafb_regs = cpu_register_io_memory(vgafb_read_fn, vgafb_write_fn, s, memory_region_init_io(&s->regs_region, &vgafb_mmio_ops, s,
DEVICE_NATIVE_ENDIAN); "milkymist-vgafb", R_MAX * 4);
sysbus_init_mmio(dev, R_MAX * 4, vgafb_regs); sysbus_init_mmio_region(dev, &s->regs_region);
s->ds = graphic_console_init(vgafb_update_display, s->ds = graphic_console_init(vgafb_update_display,
vgafb_invalidate_display, vgafb_invalidate_display,