From patchwork Wed Aug 24 00:13:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111218 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 689D1B6F57 for ; Wed, 24 Aug 2011 11:13:16 +1000 (EST) Received: from localhost ([::1]:53372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw18C-00082N-GN for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:15:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw175-0005dN-Q0 for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw173-00049u-6Q for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:35 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:49027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw172-00046B-V9 for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:33 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so649475vxi.4 for ; Tue, 23 Aug 2011 17:14:32 -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=0fJQxn8VyTItRohXVCTMfp3u34TJtzM1ybj8wivPDCM=; b=vE9j60wX78nZ4E4GeFNRPEzOCjT0OrcFk4wPNrB4pQfaPbP7TWCaqDBbMU22hc4943 VtwraB74MbGx81xHMyFph4JoVhHBuTbHcGyFNIbx3DpwErRYHkWLGRf+RjS3RHXEOsER /BlF7x28HLvZ1mOOAt4Zm5uu2EVVCJ72VZLMU= Received: by 10.52.89.211 with SMTP id bq19mr4455843vdb.86.1314144872757; Tue, 23 Aug 2011 17:14:32 -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.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:49 -0700 Message-Id: <1314144835-29098-11-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.220.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 10/16] parallel: 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/parallel.c | 47 ++++++++++++++++++++++++++++------------------- 1 files changed, 28 insertions(+), 19 deletions(-) diff --git a/hw/parallel.c b/hw/parallel.c index ecbc8c3..8494d94 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -448,6 +448,29 @@ static void parallel_reset(void *opaque) static const int isa_parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; +static const MemoryRegionPortio isa_parallel_portio_hw_list[] = { + { 0, 8, 1, + .read = parallel_ioport_read_hw, + .write = parallel_ioport_write_hw }, + { 4, 1, 2, + .read = parallel_ioport_eppdata_read_hw2, + .write = parallel_ioport_eppdata_write_hw2 }, + { 4, 1, 4, + .read = parallel_ioport_eppdata_read_hw4, + .write = parallel_ioport_eppdata_write_hw4 }, + { 0x400, 8, 1, + .read = parallel_ioport_ecp_read, + .write = parallel_ioport_ecp_write }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionPortio isa_parallel_portio_sw_list[] = { + { 0, 8, 1, + .read = parallel_ioport_read_sw, + .write = parallel_ioport_write_sw }, + PORTIO_END_OF_LIST(), +}; + static int parallel_isa_initfn(ISADevice *dev) { static int index; @@ -478,25 +501,11 @@ static int parallel_isa_initfn(ISADevice *dev) s->status = dummy; } - if (s->hw_driver) { - register_ioport_write(base, 8, 1, parallel_ioport_write_hw, s); - register_ioport_read(base, 8, 1, parallel_ioport_read_hw, s); - isa_init_ioport_range(dev, base, 8); - - register_ioport_write(base+4, 1, 2, parallel_ioport_eppdata_write_hw2, s); - register_ioport_read(base+4, 1, 2, parallel_ioport_eppdata_read_hw2, s); - register_ioport_write(base+4, 1, 4, parallel_ioport_eppdata_write_hw4, s); - register_ioport_read(base+4, 1, 4, parallel_ioport_eppdata_read_hw4, s); - isa_init_ioport(dev, base+4); - register_ioport_write(base+0x400, 8, 1, parallel_ioport_ecp_write, s); - register_ioport_read(base+0x400, 8, 1, parallel_ioport_ecp_read, s); - isa_init_ioport_range(dev, base+0x400, 8); - } - else { - register_ioport_write(base, 8, 1, parallel_ioport_write_sw, s); - register_ioport_read(base, 8, 1, parallel_ioport_read_sw, s); - isa_init_ioport_range(dev, base, 8); - } + isa_register_portio_list(dev, base, + (s->hw_driver + ? &isa_parallel_portio_hw_list[0] + : &isa_parallel_portio_sw_list[0]), + s, "parallel"); return 0; }