[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/11] syborg_fb: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 04/11] syborg_fb: convert to memory API |
Date: |
Tue, 25 Oct 2011 12:32:37 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/syborg_fb.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/hw/syborg_fb.c b/hw/syborg_fb.c
index ae3e0eb..3b71c72 100644
--- a/hw/syborg_fb.c
+++ b/hw/syborg_fb.c
@@ -65,6 +65,7 @@ enum {
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
DisplayState *ds;
/*QEMUConsole *console;*/
uint32_t need_update : 1;
@@ -294,7 +295,8 @@ static void syborg_fb_invalidate_display(void * opaque)
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;
@@ -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,
- uint32_t val)
+ uint64_t val, unsigned size)
{
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[] = {
- syborg_fb_read,
- syborg_fb_read,
- syborg_fb_read
-};
-
-static CPUWriteMemoryFunc * const syborg_fb_writefn[] = {
- syborg_fb_write,
- syborg_fb_write,
- syborg_fb_write
+static const MemoryRegionOps syborg_fb_ops = {
+ .read = syborg_fb_read,
+ .write = syborg_fb_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
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)
{
SyborgFBState *s = FROM_SYSBUS(SyborgFBState, dev);
- int iomemtype;
sysbus_init_irq(dev, &s->irq);
- iomemtype = cpu_register_io_memory(syborg_fb_readfn,
- syborg_fb_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &syborg_fb_ops, s,
+ "framebuffer", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
s->ds = graphic_console_init(syborg_fb_update_display,
syborg_fb_invalidate_display,
--
1.7.5.4
- [Qemu-devel] [PATCH 00/11] V3 arm memory API conversion, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 01/11] integratorcp: convert control to sysbus, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 02/11] marvell_88x8618_audio: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 03/11] mst_fpga: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 04/11] syborg_fb: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 05/11] syborg_interrupt: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 06/11] syborg_keyboard: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 07/11] syborg_pointer: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 10/11] syborg_timer: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 11/11] syborg_virtio: convert to memory API, Benoît Canet, 2011/10/25
- Re: [Qemu-devel] [PATCH 00/11] V3 arm memory API conversion, Avi Kivity, 2011/10/25
- [Qemu-devel] [PATCH 09/11] syborg_serial: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 08/11] syborg_rtc: convert to memory API, Benoît Canet, 2011/10/25