From patchwork Mon Oct 17 15:28:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 120267 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 A19B9B6F84 for ; Tue, 18 Oct 2011 03:14:22 +1100 (EST) Received: from localhost ([::1]:39301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFpHr-0002Le-5B for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2011 11:39:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFpHE-0000ii-Rd for qemu-devel@nongnu.org; Mon, 17 Oct 2011 11:38:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFpHA-0000do-9W for qemu-devel@nongnu.org; Mon, 17 Oct 2011 11:38:56 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:36384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFpHA-0000ZQ-0k for qemu-devel@nongnu.org; Mon, 17 Oct 2011 11:38:52 -0400 Received: by mail-wy0-f173.google.com with SMTP id 15so972062wyh.4 for ; Mon, 17 Oct 2011 08:38:51 -0700 (PDT) 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=UfiwfOnQ8f4Yrc6KmwXygELaW/tkJSlVdFZnDrDKtEo=; b=X8CRUPXazwVt91aEo84hRMyoAeq1DLiMFEe4+Xl1uFGtFcbWC7B+XpszDSHl5JO5vl uIT7z1TaLH74TcLVPA2TULMFN0CqC3R1Lu7q54UaeQxhWsVjVQm4tcVLgS+s/1CzSD2V ormrN2Gne6PRfvykCzlSJ/VtLTV05qdMuIhCM= Received: by 10.216.229.81 with SMTP id g59mr3890306weq.114.1318865931599; Mon, 17 Oct 2011 08:38:51 -0700 (PDT) Received: from localhost.localdomain (AMontsouris-651-1-196-196.w83-202.abo.wanadoo.fr. [83.202.59.196]) by mx.google.com with ESMTPS id y10sm31736541wbm.14.2011.10.17.08.38.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Oct 2011 08:38:50 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 17 Oct 2011 17:28:32 +0200 Message-Id: <1318865312-27483-8-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1318865312-27483-1-git-send-email-benoit.canet@gmail.com> References: <1318865312-27483-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: =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Subject: [Qemu-devel] [PATCH 7/7] stellaris: convert gptm 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 Reviewed-by: Peter Maydell --- hw/stellaris.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/stellaris.c b/hw/stellaris.c index 533d9c1..2ab7ec7 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -45,6 +45,7 @@ typedef const struct { typedef struct gptm_state { SysBusDevice busdev; + MemoryRegion iomem; uint32_t config; uint32_t mode[2]; uint32_t control; @@ -140,7 +141,8 @@ static void gptm_tick(void *opaque) gptm_update_irq(s); } -static uint32_t gptm_read(void *opaque, target_phys_addr_t offset) +static uint64_t gptm_read(void *opaque, target_phys_addr_t offset, + unsigned size) { gptm_state *s = (gptm_state *)opaque; @@ -188,7 +190,8 @@ static uint32_t gptm_read(void *opaque, target_phys_addr_t offset) } } -static void gptm_write(void *opaque, target_phys_addr_t offset, uint32_t value) +static void gptm_write(void *opaque, target_phys_addr_t offset, + uint64_t value, unsigned size) { gptm_state *s = (gptm_state *)opaque; uint32_t oldval; @@ -268,16 +271,10 @@ static void gptm_write(void *opaque, target_phys_addr_t offset, uint32_t value) gptm_update_irq(s); } -static CPUReadMemoryFunc * const gptm_readfn[] = { - gptm_read, - gptm_read, - gptm_read -}; - -static CPUWriteMemoryFunc * const gptm_writefn[] = { - gptm_write, - gptm_write, - gptm_write +static const MemoryRegionOps gptm_ops = { + .read = gptm_read, + .write = gptm_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; static const VMStateDescription vmstate_stellaris_gptm = { @@ -305,16 +302,14 @@ static const VMStateDescription vmstate_stellaris_gptm = { static int stellaris_gptm_init(SysBusDevice *dev) { - int iomemtype; gptm_state *s = FROM_SYSBUS(gptm_state, dev); sysbus_init_irq(dev, &s->irq); qdev_init_gpio_out(&dev->qdev, &s->trigger, 1); - iomemtype = cpu_register_io_memory(gptm_readfn, - gptm_writefn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, 0x1000, iomemtype); + memory_region_init_io(&s->iomem, &gptm_ops, s, + "gptm", 0x1000); + sysbus_init_mmio_region(dev, &s->iomem); s->opaque[0] = s->opaque[1] = s; s->timer[0] = qemu_new_timer_ns(vm_clock, gptm_tick, &s->opaque[0]);