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

syborg_fb: convert to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-24 22:38:21 +02:00 committed by Avi Kivity
parent b9441ebbff
commit 0520a04969
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/syborg_fb.c
View File

@ -65,6 +65,7 @@ enum {
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
DisplayState *ds; DisplayState *ds;
/*QEMUConsole *console;*/ /*QEMUConsole *console;*/
uint32_t need_update : 1; uint32_t need_update : 1;
@ -294,7 +295,8 @@ static void syborg_fb_invalidate_display(void * opaque)
s->need_update = 1; s->need_update = 1;
} }
static uint32_t syborg_fb_read(void *opaque, target_phys_addr_t offset) static uint64_t syborg_fb_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
SyborgFBState *s = opaque; SyborgFBState *s = opaque;
@ -366,7 +368,7 @@ static uint32_t syborg_fb_read(void *opaque, target_phys_addr_t offset)
} }
static void syborg_fb_write(void *opaque, target_phys_addr_t offset, static void syborg_fb_write(void *opaque, target_phys_addr_t offset,
uint32_t val) uint64_t val, unsigned size)
{ {
SyborgFBState *s = opaque; SyborgFBState *s = opaque;
@ -454,16 +456,10 @@ static void syborg_fb_write(void *opaque, target_phys_addr_t offset,
} }
} }
static CPUReadMemoryFunc * const syborg_fb_readfn[] = { static const MemoryRegionOps syborg_fb_ops = {
syborg_fb_read, .read = syborg_fb_read,
syborg_fb_read, .write = syborg_fb_write,
syborg_fb_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const syborg_fb_writefn[] = {
syborg_fb_write,
syborg_fb_write,
syborg_fb_write
}; };
static void syborg_fb_save(QEMUFile *f, void *opaque) static void syborg_fb_save(QEMUFile *f, void *opaque)
@ -515,13 +511,11 @@ static int syborg_fb_load(QEMUFile *f, void *opaque, int version_id)
static int syborg_fb_init(SysBusDevice *dev) static int syborg_fb_init(SysBusDevice *dev)
{ {
SyborgFBState *s = FROM_SYSBUS(SyborgFBState, dev); SyborgFBState *s = FROM_SYSBUS(SyborgFBState, dev);
int iomemtype;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
iomemtype = cpu_register_io_memory(syborg_fb_readfn, memory_region_init_io(&s->iomem, &syborg_fb_ops, s,
syborg_fb_writefn, s, "framebuffer", 0x1000);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, 0x1000, iomemtype);
s->ds = graphic_console_init(syborg_fb_update_display, s->ds = graphic_console_init(syborg_fb_update_display,
syborg_fb_invalidate_display, syborg_fb_invalidate_display,