From patchwork Sun Oct 2 14:26:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 117321 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 41E9E1007D6 for ; Mon, 3 Oct 2011 02:38:02 +1100 (EST) Received: from localhost ([::1]:52422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN1Z-0000gf-1A for incoming@patchwork.ozlabs.org; Sun, 02 Oct 2011 10:28:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0l-0007BH-Ql for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAN0h-0008Ds-Jq for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0f-0008By-08 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:18 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p92EREjJ004501 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 2 Oct 2011 10:27:14 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p92ER9I5021101; Sun, 2 Oct 2011 10:27:14 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 1FE26250B76; Sun, 2 Oct 2011 16:27:05 +0200 (IST) From: Avi Kivity To: qemu-devel@nongnu.org, Anthony Liguori Date: Sun, 2 Oct 2011 16:26:52 +0200 Message-Id: <1317565616-12997-22-git-send-email-avi@redhat.com> In-Reply-To: <1317565616-12997-1-git-send-email-avi@redhat.com> References: <1317565616-12997-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 21/25] milkymist-sysctl: convert 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 From: Michael Walle Signed-off-by: Michael Walle Signed-off-by: Avi Kivity --- hw/milkymist-sysctl.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c index 7b2d544..5783f08 100644 --- a/hw/milkymist-sysctl.c +++ b/hw/milkymist-sysctl.c @@ -59,6 +59,7 @@ enum { struct MilkymistSysctlState { SysBusDevice busdev; + MemoryRegion regs_region; QEMUBH *bh0; QEMUBH *bh1; @@ -88,7 +89,8 @@ static void sysctl_icap_write(MilkymistSysctlState *s, uint32_t value) } } -static uint32_t sysctl_read(void *opaque, target_phys_addr_t addr) +static uint64_t sysctl_read(void *opaque, target_phys_addr_t addr, + unsigned size) { MilkymistSysctlState *s = opaque; uint32_t r = 0; @@ -129,7 +131,8 @@ static uint32_t sysctl_read(void *opaque, target_phys_addr_t addr) return r; } -static void sysctl_write(void *opaque, target_phys_addr_t addr, uint32_t value) +static void sysctl_write(void *opaque, target_phys_addr_t addr, uint64_t value, + unsigned size) { MilkymistSysctlState *s = opaque; @@ -195,16 +198,14 @@ static void sysctl_write(void *opaque, target_phys_addr_t addr, uint32_t value) } } -static CPUReadMemoryFunc * const sysctl_read_fn[] = { - NULL, - NULL, - &sysctl_read, -}; - -static CPUWriteMemoryFunc * const sysctl_write_fn[] = { - NULL, - NULL, - &sysctl_write, +static const MemoryRegionOps sysctl_mmio_ops = { + .read = sysctl_read, + .write = sysctl_write, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, + .endianness = DEVICE_NATIVE_ENDIAN, }; static void timer0_hit(void *opaque) @@ -258,7 +259,6 @@ static void milkymist_sysctl_reset(DeviceState *d) static int milkymist_sysctl_init(SysBusDevice *dev) { MilkymistSysctlState *s = FROM_SYSBUS(typeof(*s), dev); - int sysctl_regs; sysbus_init_irq(dev, &s->gpio_irq); sysbus_init_irq(dev, &s->timer0_irq); @@ -271,9 +271,9 @@ static int milkymist_sysctl_init(SysBusDevice *dev) ptimer_set_freq(s->ptimer0, s->freq_hz); ptimer_set_freq(s->ptimer1, s->freq_hz); - sysctl_regs = cpu_register_io_memory(sysctl_read_fn, sysctl_write_fn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, sysctl_regs); + memory_region_init_io(&s->regs_region, &sysctl_mmio_ops, s, + "milkymist-sysctl", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->regs_region); return 0; }