From patchwork Tue Nov 15 11:13:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 125749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B4E6B6F72 for ; Tue, 15 Nov 2011 22:14:55 +1100 (EST) Received: from localhost ([::1]:35682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGyV-0008NL-Th for incoming@patchwork.ozlabs.org; Tue, 15 Nov 2011 06:14:47 -0500 Received: from eggs.gnu.org ([140.186.70.92]:38700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGy6-0007yK-A8 for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQGy0-0000LJ-2v for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:22 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:37244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGxz-0000KS-Rt for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:16 -0500 Received: by mail-wy0-f173.google.com with SMTP id 34so1821973wyg.4 for ; Tue, 15 Nov 2011 03:14:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ArsITEpq/J/NkuCoWNYeaNz2Cc9r3qMzEkRsSkBWCNI=; b=eetvC2/TdytLgoRzOdHjXLHbJZzI9zaF42o2mMrZLLN5ty9evqoVNhV7oW2F9yji6O uUN9xc7Ac264nJKn8PLAH5cvCg9mboKe3/k3SvDhDkM/mafAAGIND6uhVT0f3erbulfq TUGPtUEgHvVpomRUt7ESo1EccxDA1RGxCMIOk= Received: by 10.216.135.37 with SMTP id t37mr4694465wei.44.1321355655500; Tue, 15 Nov 2011 03:14:15 -0800 (PST) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id n18sm12476201wbm.19.2011.11.15.03.14.14 (version=SSLv3 cipher=OTHER); Tue, 15 Nov 2011 03:14:14 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 15 Nov 2011 12:13:56 +0100 Message-Id: <1321355644-1982-7-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> References: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: blauwirbel@gmail.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Subject: [Qemu-devel] [PATCH 06/14] slavio_misc: convert system control to memory API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 db266ba..29eca9b 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -40,6 +40,7 @@ typedef struct MiscState { MemoryRegion diag_iomem; MemoryRegion mdm_iomem; MemoryRegion led_iomem; + MemoryRegion sysctrl_iomem; qemu_irq irq; qemu_irq fdc_tc; uint32_t dummy; @@ -300,7 +301,8 @@ static const MemoryRegionOps apc_mem_ops = { } }; -static uint32_t slavio_sysctrl_mem_readl(void *opaque, target_phys_addr_t addr) +static uint64_t slavio_sysctrl_mem_readl(void *opaque, target_phys_addr_t addr, + unsigned size) { MiscState *s = opaque; uint32_t ret = 0; @@ -317,7 +319,7 @@ static uint32_t slavio_sysctrl_mem_readl(void *opaque, target_phys_addr_t addr) } static void slavio_sysctrl_mem_writel(void *opaque, target_phys_addr_t addr, - uint32_t val) + uint64_t val, unsigned size) { MiscState *s = opaque; @@ -334,16 +336,14 @@ static void slavio_sysctrl_mem_writel(void *opaque, target_phys_addr_t addr, } } -static CPUReadMemoryFunc * const slavio_sysctrl_mem_read[3] = { - NULL, - NULL, - slavio_sysctrl_mem_readl, -}; - -static CPUWriteMemoryFunc * const slavio_sysctrl_mem_write[3] = { - NULL, - NULL, - slavio_sysctrl_mem_writel, +static const MemoryRegionOps slavio_sysctrl_mem_ops = { + .read = slavio_sysctrl_mem_readl, + .write = slavio_sysctrl_mem_writel, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, }; static uint64_t slavio_led_mem_readw(void *opaque, target_phys_addr_t addr, @@ -450,10 +450,9 @@ static int slavio_misc_init1(SysBusDevice *dev) /* 32 bit registers */ /* System control */ - io = cpu_register_io_memory(slavio_sysctrl_mem_read, - slavio_sysctrl_mem_write, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, SYSCTRL_SIZE, io); + memory_region_init_io(&s->sysctrl_iomem, &slavio_sysctrl_mem_ops, s, + "system-control", MISC_SIZE); + sysbus_init_mmio_region(dev, &s->sysctrl_iomem); /* AUX 1 (Misc System Functions) */ io = cpu_register_io_memory(slavio_aux1_mem_read,