From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGy1-0007iu-Iv for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQGxx-0000Kq-5t for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:17 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:38996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGxw-0000KC-K3 for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:12 -0500 Received: by mail-ww0-f53.google.com with SMTP id 27so4904272wwf.10 for ; Tue, 15 Nov 2011 03:14:12 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 15 Nov 2011 12:13:53 +0100 Message-Id: <1321355644-1982-4-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> References: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH 03/14] slavio_misc: convert diagnostic to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoit Canet --- hw/slavio_misc.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 7b98f11..60a115d 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -37,6 +37,7 @@ typedef struct MiscState { SysBusDevice busdev; MemoryRegion cfg_iomem; + MemoryRegion diag_iomem; qemu_irq irq; qemu_irq fdc_tc; uint32_t dummy; @@ -133,7 +134,7 @@ static const MemoryRegionOps slavio_cfg_mem_ops = { }; static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr, - uint32_t val) + uint64_t val, unsigned size) { MiscState *s = opaque; @@ -141,7 +142,8 @@ static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr, s->diag = val & 0xff; } -static uint32_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr) +static uint64_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr, + unsigned size) { MiscState *s = opaque; uint32_t ret = 0; @@ -151,16 +153,14 @@ static uint32_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr) return ret; } -static CPUReadMemoryFunc * const slavio_diag_mem_read[3] = { - slavio_diag_mem_readb, - NULL, - NULL, -}; - -static CPUWriteMemoryFunc * const slavio_diag_mem_write[3] = { - slavio_diag_mem_writeb, - NULL, - NULL, +static const MemoryRegionOps slavio_diag_mem_ops = { + .read = slavio_diag_mem_readb, + .write = slavio_diag_mem_writeb, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 1, + .max_access_size = 1, + }, }; static void slavio_mdm_mem_writeb(void *opaque, target_phys_addr_t addr, @@ -433,10 +433,9 @@ static int slavio_misc_init1(SysBusDevice *dev) sysbus_init_mmio_region(dev, &s->cfg_iomem); /* Diagnostics */ - io = cpu_register_io_memory(slavio_diag_mem_read, - slavio_diag_mem_write, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, MISC_SIZE, io); + memory_region_init_io(&s->diag_iomem, &slavio_diag_mem_ops, s, + "diagnostic", MISC_SIZE); + sysbus_init_mmio_region(dev, &s->diag_iomem); /* Modem control */ io = cpu_register_io_memory(slavio_mdm_mem_read, -- 1.7.5.4