From patchwork Wed Aug 10 22:28:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109474 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 89EC4B6FF5 for ; Thu, 11 Aug 2011 09:32:09 +1000 (EST) Received: from localhost ([::1]:51940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHx-0006ME-PX for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 18:30:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHS-0004wj-0N for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrHHQ-0006Ro-I1 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:41 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:54887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHP-0006La-UU for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:40 -0400 Received: by mail-ww0-f53.google.com with SMTP id 25so1339901wwf.10 for ; Wed, 10 Aug 2011 15:29:39 -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=LMACIq4z/Ln9huLFmS8I7uAhe/FNAby6V8tHmJPlc7I=; b=nQ5S2Y5x8M4gsdsRduTFes2Dfw+8U6v4RJSsYiz9f583K9CLFIi7fVIS+TwbQwKQW8 5qpv3v2D388Q8Que+hS44ieahkCkNz4jLtf8bcHRd3mNjLimP5iIMMMLAq7K4xlqkZBH ZfVxeWjyMc5f74Nc0FDi2oSPl7VsDSdDrj6PQ= Received: by 10.216.74.7 with SMTP id w7mr7320683wed.37.1313015379470; Wed, 10 Aug 2011 15:29:39 -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 m38sm880619weq.21.2011.08.10.15.29.37 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 15:29:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 10 Aug 2011 15:28:20 -0700 Message-Id: <1313015300-23920-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313015300-23920-1-git-send-email-rth@twiddle.net> References: <1313015300-23920-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 11/11] fdc: Convert isabus_fdc_init1 to MemoryRegion. 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 This requires some amount of hoop-jumping, so that we don't inadvertently claim port 0x3f6, which is used by ISA IDE. The sysbus initialization path is as yet unconverted. Signed-off-by: Richard Henderson --- hw/fdc.c | 53 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index edf0360..cba973e 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -425,6 +425,7 @@ typedef struct FDCtrlSysBus { typedef struct FDCtrlISABus { ISADevice busdev; + MemoryRegion io_0, io_7; struct FDCtrl state; int32_t bootindexA; int32_t bootindexB; @@ -490,16 +491,6 @@ static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value) } } -static uint32_t fdctrl_read_port (void *opaque, uint32_t reg) -{ - return fdctrl_read(opaque, reg & 7); -} - -static void fdctrl_write_port (void *opaque, uint32_t reg, uint32_t value) -{ - fdctrl_write(opaque, reg & 7, value); -} - static uint32_t fdctrl_read_mem (void *opaque, target_phys_addr_t reg) { return fdctrl_read(opaque, (uint32_t)reg); @@ -1891,6 +1882,34 @@ 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[] = { + { 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 +}; + static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); @@ -1900,16 +1919,10 @@ static int isabus_fdc_init1(ISADevice *dev) int dma_chann = 2; int ret; - register_ioport_read(iobase + 0x01, 5, 1, - &fdctrl_read_port, fdctrl); - register_ioport_read(iobase + 0x07, 1, 1, - &fdctrl_read_port, fdctrl); - register_ioport_write(iobase + 0x01, 5, 1, - &fdctrl_write_port, fdctrl); - register_ioport_write(iobase + 0x07, 1, 1, - &fdctrl_write_port, fdctrl); - isa_init_ioport_range(dev, iobase, 6); - isa_init_ioport(dev, iobase + 7); + 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_init_irq(&isa->busdev, &fdctrl->irq, isairq); fdctrl->dma_chann = dma_chann;