From patchwork Mon Oct 24 20:38:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 121437 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 8DB31B6F6B for ; Tue, 25 Oct 2011 09:22:43 +1100 (EST) Received: from localhost ([::1]:59304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRGv-0003L0-6V for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2011 16:37:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRGR-0002qO-8U for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:36:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIRGP-0005GS-KW for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:36:54 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:51156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRGP-0005Bc-3b for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:36:53 -0400 Received: by mail-ww0-f53.google.com with SMTP id 36so8710678wwi.10 for ; Mon, 24 Oct 2011 13:36:52 -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=gJBkRLDnQ1Xy9ce7xa+opl76sYKhBU68SNXOjv9crGk=; b=DqPcJGvj00Ec7UPuKrrPxC+uO0Ww3eSj9O7llmA8wEaRKpZf9SfQb7HHWyGjj7pa2J /Bt0/8X6j0yaGj7u6o+A8+rfnqlQWkVv21psFaXI9EPKt+od1bKcMyc+kuFvK/NWDjGh Ytszqj3VEQUn5MJj+KnR+8/E41k0wp/9J6UFk= Received: by 10.227.6.199 with SMTP id a7mr9641505wba.74.1319488612534; Mon, 24 Oct 2011 13:36:52 -0700 (PDT) Received: from localhost.localdomain ([78.250.84.36]) by mx.google.com with ESMTPS id ff6sm10499039wbb.10.2011.10.24.13.36.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Oct 2011 13:36:51 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2011 22:38:27 +0200 Message-Id: <1319488713-3482-9-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1319488713-3482-1-git-send-email-benoit.canet@gmail.com> References: <1319488713-3482-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.53 Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [PATCH 08/14] syborg_timer: 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 Signed-off-by: Benoit Canet --- hw/syborg_timer.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/hw/syborg_timer.c b/hw/syborg_timer.c index 50c813e..dfee457 100644 --- a/hw/syborg_timer.c +++ b/hw/syborg_timer.c @@ -53,6 +53,7 @@ enum { typedef struct { SysBusDevice busdev; + MemoryRegion iomem; ptimer_state *timer; int running; int oneshot; @@ -83,7 +84,8 @@ static void syborg_timer_tick(void *opaque) syborg_timer_update(s); } -static uint32_t syborg_timer_read(void *opaque, target_phys_addr_t offset) +static uint64_t syborg_timer_read(void *opaque, target_phys_addr_t offset, + unsigned size) { SyborgTimerState *s = (SyborgTimerState *)opaque; @@ -114,7 +116,7 @@ static uint32_t syborg_timer_read(void *opaque, target_phys_addr_t offset) } static void syborg_timer_write(void *opaque, target_phys_addr_t offset, - uint32_t value) + uint64_t value, unsigned size) { SyborgTimerState *s = (SyborgTimerState *)opaque; @@ -162,16 +164,10 @@ static void syborg_timer_write(void *opaque, target_phys_addr_t offset, } } -static CPUReadMemoryFunc * const syborg_timer_readfn[] = { - syborg_timer_read, - syborg_timer_read, - syborg_timer_read -}; - -static CPUWriteMemoryFunc * const syborg_timer_writefn[] = { - syborg_timer_write, - syborg_timer_write, - syborg_timer_write +static const MemoryRegionOps syborg_timer_ops = { + .read = syborg_timer_read, + .write = syborg_timer_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; static const VMStateDescription vmstate_syborg_timer = { @@ -194,17 +190,14 @@ static int syborg_timer_init(SysBusDevice *dev) { SyborgTimerState *s = FROM_SYSBUS(SyborgTimerState, dev); QEMUBH *bh; - int iomemtype; if (s->freq == 0) { fprintf(stderr, "syborg_timer: Zero/unset frequency\n"); exit(1); } sysbus_init_irq(dev, &s->irq); - iomemtype = cpu_register_io_memory(syborg_timer_readfn, - syborg_timer_writefn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, 0x1000, iomemtype); + memory_region_init_io(&s->iomem, &syborg_timer_ops, s, "timer", 0x1000); + sysbus_init_mmio_region(dev, &s->iomem); bh = qemu_bh_new(syborg_timer_tick, s); s->timer = ptimer_init(bh);