From patchwork Tue Aug 16 16:45:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 110197 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 58B83B6F7F for ; Wed, 17 Aug 2011 02:49:39 +1000 (EST) Received: from localhost ([::1]:47302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMpc-00081A-72 for incoming@patchwork.ozlabs.org; Tue, 16 Aug 2011 12:49:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoL-0004eR-9q for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtMoD-00028n-B3 for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:17 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:60303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoD-00024O-3W for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:09 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so93846vxi.4 for ; Tue, 16 Aug 2011 09:48:08 -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=LvdndWXeXbDs2WrB7Fmrc88JPAPToYW8XXLe8fEoT5E=; b=f5tHPoZzsiMiHC/DSOkQcbnn5AnxxdMVguWs/yN4Kve5/SFYLXL+ku+sXc5BIPOIEw APt6BjPyYnFM02Maw9zH9tTJ0hxi00XRqMJ9nr4NfQV6yzVIyH7CEULQkZkPm3nXXWqv U9ribE7NrJWb1o/kqPtByvKG749yMHOcnHcVU= Received: by 10.52.29.42 with SMTP id g10mr5196731vdh.36.1313513288837; Tue, 16 Aug 2011 09:48:08 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id gw3sm246636vdb.44.2011.08.16.09.48.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 16 Aug 2011 09:48:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Aug 2011 09:45:40 -0700 Message-Id: <1313513145-5348-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313513145-5348-1-git-send-email-rth@twiddle.net> References: <1313513145-5348-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.220.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 09/14] sb16: Convert to isa_register_old_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/sb16.c | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/hw/sb16.c b/hw/sb16.c index a76df1b..2a960b1 100644 --- a/hw/sb16.c +++ b/hw/sb16.c @@ -1341,12 +1341,24 @@ static const VMStateDescription vmstate_sb16 = { } }; +static const MemoryRegionPortio sb16_ioport_list[] = { + { 4, 1, 1, .write = mixer_write_indexb }, + { 4, 1, 2, .write = mixer_write_indexw }, + { 5, 1, 1, .read = mixer_read, .write = mixer_write_datab }, + { 6, 1, 1, .read = dsp_read, .write = dsp_write }, + PORTIO_END_OF_LIST(), + { 10, 1, 1, .read = dsp_read }, + PORTIO_END_OF_LIST(), + { 12, 1, 1, .write = dsp_write }, + { 12, 4, 1, .read = dsp_read }, + PORTIO_END_OF_LIST(), + PORTIO_END_OF_LIST(), +}; + + static int sb16_initfn (ISADevice *dev) { - static const uint8_t dsp_write_ports[] = {0x6, 0xc}; - static const uint8_t dsp_read_ports[] = {0x6, 0xa, 0xc, 0xd, 0xe, 0xf}; SB16State *s; - int i; s = DO_UPCAST (SB16State, dev, dev); @@ -1366,22 +1378,7 @@ static int sb16_initfn (ISADevice *dev) dolog ("warning: Could not create auxiliary timer\n"); } - for (i = 0; i < ARRAY_SIZE (dsp_write_ports); i++) { - register_ioport_write (s->port + dsp_write_ports[i], 1, 1, dsp_write, s); - isa_init_ioport(dev, s->port + dsp_write_ports[i]); - } - - for (i = 0; i < ARRAY_SIZE (dsp_read_ports); i++) { - register_ioport_read (s->port + dsp_read_ports[i], 1, 1, dsp_read, s); - isa_init_ioport(dev, s->port + dsp_read_ports[i]); - } - - register_ioport_write (s->port + 0x4, 1, 1, mixer_write_indexb, s); - register_ioport_write (s->port + 0x4, 1, 2, mixer_write_indexw, s); - isa_init_ioport(dev, s->port + 0x4); - register_ioport_read (s->port + 0x5, 1, 1, mixer_read, s); - register_ioport_write (s->port + 0x5, 1, 1, mixer_write_datab, s); - isa_init_ioport(dev, s->port + 0x5); + isa_register_old_portio_list(dev, s->port, sb16_ioport_list, s, "sb16"); DMA_register_channel (s->hdma, SB_read_DMA, s); DMA_register_channel (s->dma, SB_read_DMA, s);