From patchwork Wed Aug 31 14:48:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 112574 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 60770B6F18 for ; Thu, 1 Sep 2011 01:24:39 +1000 (EST) Received: from localhost ([::1]:57663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6i-000280-Le for incoming@patchwork.ozlabs.org; Wed, 31 Aug 2011 10:49:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6N-0001qZ-Jj for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qym6M-0000mM-AG for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:15 -0400 Received: from mail.serverraum.org ([78.47.150.89]:34298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6M-0000mG-4r for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:14 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.serverraum.org (Postfix) with ESMTP id DA65E3EF4E; Wed, 31 Aug 2011 16:53:40 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.serverraum.org Received: from mail.serverraum.org ([127.0.0.1]) by localhost (web.serverraum.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ra51+IJpqU8x; Wed, 31 Aug 2011 16:53:40 +0200 (CEST) Received: from thanatos.fritz.box (95-89-251-205-dynip.superkabel.de [95.89.251.205]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.serverraum.org (Postfix) with ESMTPSA id AF6993EF44; Wed, 31 Aug 2011 16:53:39 +0200 (CEST) From: Michael Walle To: qemu-devel@nongnu.org Date: Wed, 31 Aug 2011 16:48:41 +0200 Message-Id: <1314802127-13202-4-git-send-email-michael@walle.cc> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314802127-13202-1-git-send-email-michael@walle.cc> References: <1314802127-13202-1-git-send-email-michael@walle.cc> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 78.47.150.89 Cc: Michael Walle , Avi Kivity Subject: [Qemu-devel] [PATCH 3/9] milkymist-memcard: 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: Michael Walle --- hw/milkymist-memcard.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c index 22dc377..fb6e558 100644 --- a/hw/milkymist-memcard.c +++ b/hw/milkymist-memcard.c @@ -60,6 +60,7 @@ enum { struct MilkymistMemcardState { SysBusDevice busdev; + MemoryRegion regs_region; SDState *card; int command_write_ptr; @@ -116,7 +117,8 @@ static void memcard_sd_command(MilkymistMemcardState *s) } } -static uint32_t memcard_read(void *opaque, target_phys_addr_t addr) +static uint64_t memcard_read(void *opaque, target_phys_addr_t addr, + unsigned size) { MilkymistMemcardState *s = opaque; uint32_t r = 0; @@ -164,7 +166,8 @@ static uint32_t memcard_read(void *opaque, target_phys_addr_t addr) return r; } -static void memcard_write(void *opaque, target_phys_addr_t addr, uint32_t value) +static void memcard_write(void *opaque, target_phys_addr_t addr, uint64_t value, + unsigned size) { MilkymistMemcardState *s = opaque; @@ -216,16 +219,14 @@ static void memcard_write(void *opaque, target_phys_addr_t addr, uint32_t value) } } -static CPUReadMemoryFunc * const memcard_read_fn[] = { - NULL, - NULL, - &memcard_read, -}; - -static CPUWriteMemoryFunc * const memcard_write_fn[] = { - NULL, - NULL, - &memcard_write, +static const MemoryRegionOps memcard_mmio_ops = { + .read = memcard_read, + .write = memcard_write, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, + .endianness = DEVICE_NATIVE_ENDIAN, }; static void milkymist_memcard_reset(DeviceState *d) @@ -247,15 +248,14 @@ static int milkymist_memcard_init(SysBusDevice *dev) { MilkymistMemcardState *s = FROM_SYSBUS(typeof(*s), dev); DriveInfo *dinfo; - int memcard_regs; dinfo = drive_get_next(IF_SD); s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0); s->enabled = dinfo ? bdrv_is_inserted(dinfo->bdrv) : 0; - memcard_regs = cpu_register_io_memory(memcard_read_fn, memcard_write_fn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, memcard_regs); + memory_region_init_io(&s->regs_region, &memcard_mmio_ops, s, + "milkymist-memcard", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->regs_region); return 0; }