From patchwork Mon Jul 12 18:41:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 58654 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 1D327B6F16 for ; Tue, 13 Jul 2010 04:58:18 +1000 (EST) Received: from localhost ([127.0.0.1]:44219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYOCk-0003ek-R2 for incoming@patchwork.ozlabs.org; Mon, 12 Jul 2010 14:58:14 -0400 Received: from [140.186.70.92] (port=47630 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYNwb-0000tr-Ff for qemu-devel@nongnu.org; Mon, 12 Jul 2010 14:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYNwa-0006Hp-2d for qemu-devel@nongnu.org; Mon, 12 Jul 2010 14:41:33 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:60974) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYNwZ-0006EC-TM for qemu-devel@nongnu.org; Mon, 12 Jul 2010 14:41:32 -0400 Received: by mail-pw0-f45.google.com with SMTP id 2so1971108pwi.4 for ; Mon, 12 Jul 2010 11:41:31 -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=8kcwpY3WeGxKA6e43cNETmiSGgNheXlS/vZBNyHdi3s=; b=OOCGqb/OwJ5p4wTOC/MOq8vCsCxNkeQt1hgsu4vRbFLroX4qTBkj4WZxREvozeOwp9 4PqX1fRZ6X2haPrgf5jIHTUUQTjifCd1ROqcfsO/fM/W/TtGeNflKnyP5+Yd6dCw4Kto DAAztwrT4yWDhwQ4QNnlpDC7dwbhjFwV4+6ac= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=SdwzBwx1f1zw7NJih1B3LYrtoXTGAO5sFzGia3814bRYSBPLC83im48v6ggbTtAmyP zoSCb4ZegU5KRydBp0Q+6YmVb2hBjtXVecyp3KJmj0rr6guykFE4L7DHWt6+o3nY2/AJ JvrdvxRLnxl4njh5Rr6ahsiMK3qSi2aLYYZoA= Received: by 10.142.199.20 with SMTP id w20mr16726054wff.250.1278960091302; Mon, 12 Jul 2010 11:41:31 -0700 (PDT) MIME-Version: 1.0 Received: by 10.142.212.14 with HTTP; Mon, 12 Jul 2010 11:41:11 -0700 (PDT) From: Blue Swirl Date: Mon, 12 Jul 2010 18:41:11 +0000 Message-ID: To: qemu-devel , Anthony Liguori , "Michael S. Tsirkin" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 08/15] piix: 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() instead of a mapping function. Signed-off-by: Blue Swirl --- hw/ide/piix.c | 72 +++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 27 deletions(-) { @@ -119,13 +122,28 @@ static void piix3_reset(void *opaque) static int pci_piix_ide_initfn(PCIIDEState *d) { uint8_t *pci_conf = d->dev.config; + unsigned int i; + int io_index; pci_conf[PCI_CLASS_PROG] = 0x80; // legacy ATA mode pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_IDE); qemu_register_reset(piix3_reset, d); - pci_register_bar(&d->dev, 4, 0x10, PCI_BASE_ADDRESS_SPACE_IO, bmdma_map); + pci_register_bar(&d->dev, 4, 0x10, PCI_BASE_ADDRESS_SPACE_IO, NULL); + for (i = 0; i < 2; i++) { + BMDMAState *bm = &d->bmdma[i]; + + d->bus[i].bmdma = bm; + bm->bus = d->bus + i; + qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm); + io_index = cpu_register_io(bmdma_io_reads, bmdma_cmd_io_writes, 1, bm); + pci_bar_map(&d->dev, 4, i * 3 + 0, i * 8 + 0, 1, io_index); + io_index = cpu_register_io(bmdma_io_reads, bmdma_io_writes, 3, bm); + pci_bar_map(&d->dev, 4, i * 3 + 1, i * 8 + 1, 3, io_index); + io_index = cpu_register_io(bmdma_addr_reads, bmdma_addr_writes, 4, bm); + pci_bar_map(&d->dev, 4, i * 3 + 2, i * 8 + 4, 4, io_index); + } vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d); diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 07483e8..959e061 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -68,32 +68,35 @@ static void bmdma_writeb(void *opaque, uint32_t addr, uint32_t val) } } -static void bmdma_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, pci_dev); - int i; +static IOPortWriteFunc * const bmdma_cmd_io_writes[] = { + bmdma_cmd_writeb, + NULL, + NULL, +}; - for(i = 0;i < 2; i++) { - BMDMAState *bm = &d->bmdma[i]; - d->bus[i].bmdma = bm; - bm->bus = d->bus+i; - qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm); +static IOPortWriteFunc * const bmdma_io_writes[] = { + bmdma_writeb, + NULL, + NULL, +}; - register_ioport_write(addr, 1, 1, bmdma_cmd_writeb, bm); +static IOPortReadFunc * const bmdma_io_reads[] = { + bmdma_readb, + NULL, + NULL, +}; - register_ioport_write(addr + 1, 3, 1, bmdma_writeb, bm); - register_ioport_read(addr, 4, 1, bmdma_readb, bm); +static IOPortWriteFunc * const bmdma_addr_writes[] = { + bmdma_addr_writeb, + bmdma_addr_writew, + bmdma_addr_writel, +}; - register_ioport_write(addr + 4, 4, 1, bmdma_addr_writeb, bm); - register_ioport_read(addr + 4, 4, 1, bmdma_addr_readb, bm); - register_ioport_write(addr + 4, 4, 2, bmdma_addr_writew, bm); - register_ioport_read(addr + 4, 4, 2, bmdma_addr_readw, bm); - register_ioport_write(addr + 4, 4, 4, bmdma_addr_writel, bm); - register_ioport_read(addr + 4, 4, 4, bmdma_addr_readl, bm); - addr += 8; - } -} +static IOPortReadFunc * const bmdma_addr_reads[] = { + bmdma_addr_readb, + bmdma_addr_readw, + bmdma_addr_readl, +}; static void piix3_reset(void *opaque)