From patchwork Thu Jul 22 21:59:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 59683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9F4A51007EE for ; Fri, 23 Jul 2010 08:32:32 +1000 (EST) Received: from localhost ([127.0.0.1]:50865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc4JS-0000Gx-6t for incoming@patchwork.ozlabs.org; Thu, 22 Jul 2010 18:32:22 -0400 Received: from [140.186.70.92] (port=42713 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc3x3-00031d-Ee for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:09:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oc3nh-0002sN-Oe for qemu-devel@nongnu.org; Thu, 22 Jul 2010 17:59:34 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:35832) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oc3nh-0002sI-MR for qemu-devel@nongnu.org; Thu, 22 Jul 2010 17:59:33 -0400 Received: by yxn35 with SMTP id 35so3120787yxn.4 for ; Thu, 22 Jul 2010 14:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=ij7rt5Lf5mGbjPG2OroyJb7S/8kN2R5zdb3K/0DxkjY=; b=VPFGfq/+z/x9EQp653QgpIG8EmPxHISC2bCDq1Gz7XjlHqwzWTuwJ3eXKdBaIYkXhJ kQjMOLapqt0Uddvrjep9thD/Weoi68D3nSKhqqK+0N9DLkPCAvo6cG1fJd1kEOQ4bFR4 3aG3+DqZjkD31+2FZo67mL50abI4CvWrdEbz0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=IhdHw1z+L4MyG636YkSKVNqSh8jpRli9HaLXZ/w9nmG39y2mJ9N14JJCNQwTJLhT6k xPeAuyXb08JyVMOajciP2f2anmqY1vjDCVoueSlSiDNlxPhPJDVhVEHkfSGNB5USkfiy wUrGNy5OhkWNdLP9CTXizvZRKeqBS6ZTr+g9U= Received: by 10.100.197.4 with SMTP id u4mr3063713anf.17.1279835973232; Thu, 22 Jul 2010 14:59:33 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.185.146 with HTTP; Thu, 22 Jul 2010 14:59:13 -0700 (PDT) From: Blue Swirl Date: Thu, 22 Jul 2010 21:59:13 +0000 Message-ID: To: qemu-devel , malc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 17/34] ac97: convert to pci_bar_map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use pci_bar_map() and post_map_func instead of a mapping function. Signed-off-by: Blue Swirl --- hw/ac97.c | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index ad4aef4..2e5f02c 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -1234,29 +1234,39 @@ static const VMStateDescription vmstate_ac97 = { } }; -static void ac97_map (PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) +static IOPortWriteFunc * const nam_writes[] = { + nam_writeb, + nam_writew, + nam_writel, +}; + +static IOPortReadFunc * const nam_reads[] = { + nam_readb, + nam_readw, + nam_readl, +}; + +static IOPortWriteFunc * const nabm_writes[] = { + nabm_writeb, + nabm_writew, + nabm_writel, +}; + +static IOPortReadFunc * const nabm_reads[] = { + nabm_readb, + nabm_readw, + nabm_readl, +}; + +static void ac97_post_map (PCIDevice *pci_dev, int region_num, + pcibus_t addr, pcibus_t size, int type) { AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, pci_dev); - PCIDevice *d = &s->dev; if (!region_num) { s->base[0] = addr; - register_ioport_read (addr, 256 * 1, 1, nam_readb, d); - register_ioport_read (addr, 256 * 2, 2, nam_readw, d); - register_ioport_read (addr, 256 * 4, 4, nam_readl, d); - register_ioport_write (addr, 256 * 1, 1, nam_writeb, d); - register_ioport_write (addr, 256 * 2, 2, nam_writew, d); - register_ioport_write (addr, 256 * 4, 4, nam_writel, d); - } - else { + } else { s->base[1] = addr; - register_ioport_read (addr, 64 * 1, 1, nabm_readb, d); - register_ioport_read (addr, 64 * 2, 2, nabm_readw, d); - register_ioport_read (addr, 64 * 4, 4, nabm_readl, d); - register_ioport_write (addr, 64 * 1, 1, nabm_writeb, d); - register_ioport_write (addr, 64 * 2, 2, nabm_writew, d); - register_ioport_write (addr, 64 * 4, 4, nabm_writel, d); } } @@ -1280,6 +1290,7 @@ static int ac97_initfn (PCIDevice *dev) { AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, dev); uint8_t *c = s->dev.config; + int io_index; pci_config_set_vendor_id (c, PCI_VENDOR_ID_INTEL); /* ro */ pci_config_set_device_id (c, PCI_DEVICE_ID_INTEL_82801AA_5); /* ro */ @@ -1320,10 +1331,16 @@ static int ac97_initfn (PCIDevice *dev) /* TODO: RST# value should be 0. */ c[PCI_INTERRUPT_PIN] = 0x01; /* intr_pn interrupt pin ro */ - pci_register_bar (&s->dev, 0, 256 * 4, PCI_BASE_ADDRESS_SPACE_IO, - ac97_map, NULL); - pci_register_bar (&s->dev, 1, 64 * 4, PCI_BASE_ADDRESS_SPACE_IO, ac97_map, - NULL); + pci_register_bar (&s->dev, 0, 256 * 4, PCI_BASE_ADDRESS_SPACE_IO, NULL, + ac97_post_map); + io_index = cpu_register_io (nam_reads, nam_writes, 256 * 4, s); + pci_bar_map (&s->dev, 0, 0, 0, 256 * 4, io_index); + + pci_register_bar (&s->dev, 1, 64 * 4, PCI_BASE_ADDRESS_SPACE_IO, NULL, + ac97_post_map); + io_index = cpu_register_io (nabm_reads, nabm_writes, 64 * 4, s); + pci_bar_map (&s->dev, 1, 0, 0, 64 * 4, io_index); + qemu_register_reset (ac97_on_reset, s); AUD_register_card ("ac97", &s->card); ac97_on_reset (s);