From patchwork Wed Aug 31 14:48:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 112595 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 C3E58B6F6F for ; Thu, 1 Sep 2011 01:45:47 +1000 (EST) Received: from localhost ([::1]:57287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6a-0001r9-6q for incoming@patchwork.ozlabs.org; Wed, 31 Aug 2011 10:49:28 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6L-0001ow-3s for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qym6J-0000la-CG for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:12 -0400 Received: from mail.serverraum.org ([78.47.150.89]:34884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6J-0000lM-5v for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.serverraum.org (Postfix) with ESMTP id D8E3F3EF4C; Wed, 31 Aug 2011 16:53:37 +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 ysvv1jzqgBNn; Wed, 31 Aug 2011 16:53:37 +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 9AB653EF44; Wed, 31 Aug 2011 16:53:36 +0200 (CEST) From: Michael Walle To: qemu-devel@nongnu.org Date: Wed, 31 Aug 2011 16:48:39 +0200 Message-Id: <1314802127-13202-2-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 1/9] milkymist-ac97: 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-ac97.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c index 6104732..5c5ed27 100644 --- a/hw/milkymist-ac97.c +++ b/hw/milkymist-ac97.c @@ -53,6 +53,7 @@ enum { struct MilkymistAC97State { SysBusDevice busdev; + MemoryRegion regs_region; QEMUSoundCard card; SWVoiceIn *voice_in; @@ -82,7 +83,8 @@ static void update_voices(MilkymistAC97State *s) } } -static uint32_t ac97_read(void *opaque, target_phys_addr_t addr) +static uint64_t ac97_read(void *opaque, target_phys_addr_t addr, + unsigned size) { MilkymistAC97State *s = opaque; uint32_t r = 0; @@ -113,7 +115,8 @@ static uint32_t ac97_read(void *opaque, target_phys_addr_t addr) return r; } -static void ac97_write(void *opaque, target_phys_addr_t addr, uint32_t value) +static void ac97_write(void *opaque, target_phys_addr_t addr, uint64_t value, + unsigned size) { MilkymistAC97State *s = opaque; @@ -159,16 +162,14 @@ static void ac97_write(void *opaque, target_phys_addr_t addr, uint32_t value) } -static CPUReadMemoryFunc * const ac97_read_fn[] = { - NULL, - NULL, - &ac97_read, -}; - -static CPUWriteMemoryFunc * const ac97_write_fn[] = { - NULL, - NULL, - &ac97_write, +static const MemoryRegionOps ac97_mmio_ops = { + .read = ac97_read, + .write = ac97_write, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, + .endianness = DEVICE_NATIVE_ENDIAN, }; static void ac97_in_cb(void *opaque, int avail_b) @@ -280,7 +281,6 @@ static int ac97_post_load(void *opaque, int version_id) static int milkymist_ac97_init(SysBusDevice *dev) { MilkymistAC97State *s = FROM_SYSBUS(typeof(*s), dev); - int ac97_regs; struct audsettings as; sysbus_init_irq(dev, &s->crrequest_irq); @@ -300,9 +300,9 @@ static int milkymist_ac97_init(SysBusDevice *dev) s->voice_out = AUD_open_out(&s->card, s->voice_out, "mm_ac97.out", s, ac97_out_cb, &as); - ac97_regs = cpu_register_io_memory(ac97_read_fn, ac97_write_fn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, ac97_regs); + memory_region_init_io(&s->regs_region, &ac97_mmio_ops, s, + "milkymist-ac97", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->regs_region); return 0; }