From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSrGO-00034X-Sp for qemu-devel@nongnu.org; Tue, 22 Nov 2011 09:24:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSrGD-0007yl-FS for qemu-devel@nongnu.org; Tue, 22 Nov 2011 09:23:51 -0500 Received: from mail-fx0-f45.google.com ([209.85.161.45]:50182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSrGD-0007vr-6k for qemu-devel@nongnu.org; Tue, 22 Nov 2011 09:23:45 -0500 Received: by mail-fx0-f45.google.com with SMTP id s14so490429faa.4 for ; Tue, 22 Nov 2011 06:23:44 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 22 Nov 2011 15:23:23 +0100 Message-Id: <1321971808-20072-7-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1321971808-20072-1-git-send-email-benoit.canet@gmail.com> References: <1321971808-20072-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 06/11] lm32_sys: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoît Canet --- hw/lm32_sys.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c index e5ff962..320b333 100644 --- a/hw/lm32_sys.c +++ b/hw/lm32_sys.c @@ -35,6 +35,7 @@ #include "qemu-error.h" #include "sysemu.h" #include "qemu-log.h" +#include "exec-memory.h" enum { R_CTRL = 0, @@ -47,6 +48,7 @@ enum { struct LM32SysState { SysBusDevice busdev; + MemoryRegion iomem; uint32_t base; uint32_t regs[R_MAX]; uint8_t testname[MAX_TESTNAME_LEN]; @@ -89,16 +91,12 @@ static void sys_write(void *opaque, target_phys_addr_t addr, uint32_t value) } } -static CPUReadMemoryFunc * const sys_read_fn[] = { - NULL, - NULL, - NULL, -}; - -static CPUWriteMemoryFunc * const sys_write_fn[] = { - NULL, - NULL, - &sys_write, +static const MemoryRegionOps sys_ops = { + .old_mmio = { + .read = { NULL, NULL, NULL, }, + .write = { NULL, NULL, sys_write, }, + }, + .endianness = DEVICE_NATIVE_ENDIAN, }; static void sys_reset(DeviceState *d) @@ -115,11 +113,9 @@ static void sys_reset(DeviceState *d) static int lm32_sys_init(SysBusDevice *dev) { LM32SysState *s = FROM_SYSBUS(typeof(*s), dev); - int sys_regs; - sys_regs = cpu_register_io_memory(sys_read_fn, sys_write_fn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, sys_regs); + memory_region_init_io(&s->iomem, &sys_ops , s, "sys", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->iomem); /* Note: This device is not created in the board initialization, * instead it has to be added with the -device parameter. Therefore, -- 1.7.7.3