From patchwork Wed Aug 24 00:13:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111219 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 22197B6F18 for ; Wed, 24 Aug 2011 11:15:46 +1000 (EST) Received: from localhost ([::1]:52286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw17k-0007PV-9b for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:15:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw16y-0005EW-Jn for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw16x-00047b-BJ for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:28 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:40396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw16w-00045z-W5 for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:27 -0400 Received: by mail-vw0-f45.google.com with SMTP id 17so649441vws.4 for ; Tue, 23 Aug 2011 17:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=kPSdowmDRaD2OoppPIudRD5FJVNxC8sJ7bQ/kOxgJro=; b=chDNRyuPrNVXi1Db/q+RSavrOOddbDTsT0xgQV2iEoezjbRbBCc2RA0ihZuehieWVN mPsvtKF707Cpbz6qXBk+fvyx9hZVLcOgYFu8kJJXyGMn53wuJv6pJqS59xSPjDN4RW9n BfUv4ArbrVo/ldG9gTHPFfVdyGHcJSu/pqhA8= Received: by 10.52.98.4 with SMTP id ee4mr4423970vdb.485.1314144866859; Tue, 23 Aug 2011 17:14:26 -0700 (PDT) Received: from localhost.localdomain (cpe-66-91-180-197.hawaii.res.rr.com [66.91.180.197]) by mx.google.com with ESMTPS id es7sm441852vdb.6.2011.08.23.17.14.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:45 -0700 Message-Id: <1314144835-29098-7-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1314144835-29098-1-git-send-email-rth@twiddle.net> References: <1314144835-29098-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.45 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 06/16] gus: Convert to isa_register_portio_list. 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: Richard Henderson --- hw/gus.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/hw/gus.c b/hw/gus.c index 37e543a..1532686 100644 --- a/hw/gus.c +++ b/hw/gus.c @@ -232,6 +232,22 @@ static const VMStateDescription vmstate_gus = { } }; +static const MemoryRegionPortio gus_portio_list1[] = { + {0x000, 1, 1, .write = gus_writeb }, + {0x000, 1, 2, .write = gus_writew }, + {0x006, 10, 1, .read = gus_readb, .write = gus_writeb }, + {0x006, 10, 2, .read = gus_readw, .write = gus_writew }, + {0x100, 8, 1, .read = gus_readb, .write = gus_writeb }, + {0x100, 8, 2, .read = gus_readw, .write = gus_writew }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionPortio gus_portio_list2[] = { + {0, 1, 1, .read = gus_readb }, + {0, 1, 2, .read = gus_readw }, + PORTIO_END_OF_LIST(), +}; + static int gus_initfn (ISADevice *dev) { GUSState *s = DO_UPCAST(GUSState, dev, dev); @@ -262,26 +278,9 @@ static int gus_initfn (ISADevice *dev) s->samples = AUD_get_buffer_size_out (s->voice) >> s->shift; s->mixbuf = g_malloc0 (s->samples << s->shift); - register_ioport_write (s->port, 1, 1, gus_writeb, s); - register_ioport_write (s->port, 1, 2, gus_writew, s); - isa_init_ioport_range(dev, s->port, 2); - - register_ioport_read ((s->port + 0x100) & 0xf00, 1, 1, gus_readb, s); - register_ioport_read ((s->port + 0x100) & 0xf00, 1, 2, gus_readw, s); - isa_init_ioport_range(dev, (s->port + 0x100) & 0xf00, 2); - - register_ioport_write (s->port + 6, 10, 1, gus_writeb, s); - register_ioport_write (s->port + 6, 10, 2, gus_writew, s); - register_ioport_read (s->port + 6, 10, 1, gus_readb, s); - register_ioport_read (s->port + 6, 10, 2, gus_readw, s); - isa_init_ioport_range(dev, s->port + 6, 10); - - - register_ioport_write (s->port + 0x100, 8, 1, gus_writeb, s); - register_ioport_write (s->port + 0x100, 8, 2, gus_writew, s); - register_ioport_read (s->port + 0x100, 8, 1, gus_readb, s); - register_ioport_read (s->port + 0x100, 8, 2, gus_readw, s); - isa_init_ioport_range(dev, s->port + 0x100, 8); + isa_register_portio_list(dev, s->port, gus_portio_list1, s, "gus"); + isa_register_portio_list(dev, (s->port + 0x100) & 0xf00, + gus_portio_list2, s, "gus"); DMA_register_channel (s->emu.gusdma, GUS_read_DMA, s); s->emu.himemaddr = s->himem;