From patchwork Mon Oct 24 20:38:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 121413 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 5E1AE1007D7 for ; Tue, 25 Oct 2011 07:48:04 +1100 (EST) Received: from localhost ([::1]:42321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRRB-00073D-6j for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2011 16:48:01 -0400 Received: from eggs.gnu.org ([140.186.70.92]:45216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRR4-00072m-IG for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:47:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIRR2-0007CK-GG for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:47:54 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:41629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRR1-0007C9-VN for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:47:52 -0400 Received: by wyh15 with SMTP id 15so7500316wyh.4 for ; Mon, 24 Oct 2011 13:47:50 -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=ya6U60a0DHu5BnP6mIwPou4j+I+JZx0SbtmObOB08do=; b=O+XmMD/BcheFaQFewTcqvltBL+a3uQC0Y1MjGW6aN097MZFIveaQdDyY6HYOy/VTb3 NLLmrtigvb8BvvPTvAHyO5X9/Gt1SVGc/mC7P4geWUQF1pezHWKTEb3n8mYODSvT/v3a rkyklOgft5sQhAqFu/1hFWxaIa5BtwTKbnE1A= Received: by 10.216.14.13 with SMTP id c13mr74093wec.76.1319488606939; Mon, 24 Oct 2011 13:36:46 -0700 (PDT) Received: from localhost.localdomain ([78.250.84.36]) by mx.google.com with ESMTPS id ff6sm10499039wbb.10.2011.10.24.13.36.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Oct 2011 13:36:45 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2011 22:38:25 +0200 Message-Id: <1319488713-3482-7-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.173 Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [PATCH 06/14] syborg_rtc: 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_rtc.c | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/hw/syborg_rtc.c b/hw/syborg_rtc.c index 69f6ccf..375664f 100644 --- a/hw/syborg_rtc.c +++ b/hw/syborg_rtc.c @@ -35,12 +35,14 @@ enum { typedef struct { SysBusDevice busdev; + MemoryRegion iomem; int64_t offset; int64_t data; qemu_irq irq; } SyborgRTCState; -static uint32_t syborg_rtc_read(void *opaque, target_phys_addr_t offset) +static uint64_t syborg_rtc_read(void *opaque, target_phys_addr_t offset, + unsigned size) { SyborgRTCState *s = (SyborgRTCState *)opaque; offset &= 0xfff; @@ -58,7 +60,8 @@ static uint32_t syborg_rtc_read(void *opaque, target_phys_addr_t offset) } } -static void syborg_rtc_write(void *opaque, target_phys_addr_t offset, uint32_t value) +static void syborg_rtc_write(void *opaque, target_phys_addr_t offset, + uint64_t value, unsigned size) { SyborgRTCState *s = (SyborgRTCState *)opaque; uint64_t now; @@ -90,16 +93,10 @@ static void syborg_rtc_write(void *opaque, target_phys_addr_t offset, uint32_t v } } -static CPUReadMemoryFunc * const syborg_rtc_readfn[] = { - syborg_rtc_read, - syborg_rtc_read, - syborg_rtc_read -}; - -static CPUWriteMemoryFunc * const syborg_rtc_writefn[] = { - syborg_rtc_write, - syborg_rtc_write, - syborg_rtc_write +static const MemoryRegionOps syborg_rtc_ops = { + .read = syborg_rtc_read, + .write = syborg_rtc_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; static const VMStateDescription vmstate_syborg_rtc = { @@ -118,12 +115,9 @@ static int syborg_rtc_init(SysBusDevice *dev) { SyborgRTCState *s = FROM_SYSBUS(SyborgRTCState, dev); struct tm tm; - int iomemtype; - iomemtype = cpu_register_io_memory(syborg_rtc_readfn, - syborg_rtc_writefn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, 0x1000, iomemtype); + memory_region_init_io(&s->iomem, &syborg_rtc_ops, s, "rtc", 0x1000); + sysbus_init_mmio_region(dev, &s->iomem); qemu_get_timedate(&tm, 0); s->offset = (uint64_t)mktime(&tm) * 1000000000;