From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIeK0-0002c3-01 for qemu-devel@nongnu.org; Tue, 25 Oct 2011 06:33:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIeJy-0004bX-CG for qemu-devel@nongnu.org; Tue, 25 Oct 2011 06:33:27 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:51885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIeJy-0004X5-4u for qemu-devel@nongnu.org; Tue, 25 Oct 2011 06:33:26 -0400 Received: by mail-wy0-f173.google.com with SMTP id 15so372089wyh.4 for ; Tue, 25 Oct 2011 03:33:25 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 25 Oct 2011 12:32:37 +0200 Message-Id: <1319538764-3954-5-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1319538764-3954-1-git-send-email-benoit.canet@gmail.com> References: <1319538764-3954-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH 04/11] syborg_fb: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoit Canet --- 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