From patchwork Tue Aug 16 16:45:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 110198 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 E6789B6F80 for ; Wed, 17 Aug 2011 02:50:26 +1000 (EST) Received: from localhost ([::1]:48655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMqO-0000LK-41 for incoming@patchwork.ozlabs.org; Tue, 16 Aug 2011 12:50:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMqI-0000Kx-6x for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtMqH-0002Wj-5T for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:50:18 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:35326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMqH-0002Wd-1k for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:50:17 -0400 Received: by vxi32 with SMTP id 32so96081vxi.4 for ; Tue, 16 Aug 2011 09:50:16 -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=s5d1Sn8NHj5WRfctXeY67XV8Meot2Aa49aHcJAY29h4=; b=oCX1Cjn5y/yuuTv2nrACn96NA3UmuaCmF7BbaMQ431xYuP6i9BDHqK7rz5Dm1Z++AO lJ88HdnvYYC3RTZFthTp8dklEbZO7ylhtD8MCvRCLt8bQfWSLOmuUvN+cLs1DSHzz9gS +Sosf0+2bfu9hzpFHsXs5hVPpbqmR7MYObogI= Received: by 10.52.90.44 with SMTP id bt12mr4734160vdb.239.1313513282254; Tue, 16 Aug 2011 09:48:02 -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.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 16 Aug 2011 09:48:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Aug 2011 09:45:34 -0700 Message-Id: <1313513145-5348-4-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 03/14] fdc: 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/fdc.c | 36 ++++++------------------------------ 1 files changed, 6 insertions(+), 30 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index cba973e..099acf2 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -425,7 +425,6 @@ typedef struct FDCtrlSysBus { typedef struct FDCtrlISABus { ISADevice busdev; - MemoryRegion io_0, io_7; struct FDCtrl state; int32_t bootindexA; int32_t bootindexB; @@ -1882,32 +1881,12 @@ static int fdctrl_init_common(FDCtrl *fdctrl) return fdctrl_connect_drives(fdctrl); } -static uint32_t fdctrl_read_port_7(void *opaque, uint32_t reg) -{ - return fdctrl_read(opaque, reg + 7); -} - -static void fdctrl_write_port_7(void *opaque, uint32_t reg, uint32_t value) -{ - fdctrl_write(opaque, reg + 7, value); -} - -static const MemoryRegionPortio fdc_portio_0[] = { +static const MemoryRegionPortio fdc_portio_list[] = { { 1, 5, 1, .read = fdctrl_read, .write = fdctrl_write }, - PORTIO_END_OF_LIST() -}; - -static const MemoryRegionPortio fdc_portio_7[] = { - { 0, 1, 1, .read = fdctrl_read_port_7, .write = fdctrl_write_port_7 }, - PORTIO_END_OF_LIST() -}; - -static const MemoryRegionOps fdc_ioport_0_ops = { - .old_portio = fdc_portio_0 -}; - -static const MemoryRegionOps fdc_ioport_7_ops = { - .old_portio = fdc_portio_7 + PORTIO_END_OF_LIST(), + { 7, 1, 1, .read = fdctrl_read, .write = fdctrl_write }, + PORTIO_END_OF_LIST(), + PORTIO_END_OF_LIST(), }; static int isabus_fdc_init1(ISADevice *dev) @@ -1919,10 +1898,7 @@ static int isabus_fdc_init1(ISADevice *dev) int dma_chann = 2; int ret; - memory_region_init_io(&isa->io_0, &fdc_ioport_0_ops, fdctrl, "fdc", 6); - memory_region_init_io(&isa->io_7, &fdc_ioport_7_ops, fdctrl, "fdc", 1); - isa_register_ioport(dev, &isa->io_0, iobase); - isa_register_ioport(dev, &isa->io_7, iobase + 7); + isa_register_old_portio_list(dev, iobase, fdc_portio_list, fdctrl, "fdc"); isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); fdctrl->dma_chann = dma_chann;