From patchwork Thu Jul 22 21:57:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 59698 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 604681007D4 for ; Fri, 23 Jul 2010 09:22:15 +1000 (EST) Received: from localhost ([127.0.0.1]:37957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc4TX-000715-Kq for incoming@patchwork.ozlabs.org; Thu, 22 Jul 2010 18:42:47 -0400 Received: from [140.186.70.92] (port=42696 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc3xF-00030V-L4 for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:09:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oc3m1-0002du-WB for qemu-devel@nongnu.org; Thu, 22 Jul 2010 17:57:50 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:35640) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oc3m1-0002ZY-R6 for qemu-devel@nongnu.org; Thu, 22 Jul 2010 17:57:49 -0400 Received: by mail-vw0-f45.google.com with SMTP id 19so694064vws.4 for ; Thu, 22 Jul 2010 14:57:49 -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=qNhTLfzR1KoIC0PKOQFHKiRM5MebI9eumsSMkKQj2Yw=; b=fT5lhfu2mnIXvxAPl+CHbNtRqI5/2ZKmGfw8BBprdMEFhzvqiOQ1RbnSHIsId42S3a 9SuSt5iQkH1ubxzx+yK3pthRXC/cBTwLoA0kgzQpS7mwNrw7vpprdzesoIfdWeLEi1XP C1bp8THV9iJlpMulKp0c5WiSgSBbf+83fD8F4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=x+pBbsn8FGsTd1VbyupVufEqpynT8/qGTiCpDXLkGNI1F9eKJSQsxRyU86zcttUORB fiBzbRL1fmpEiU/XZBqZWwaVGP3g7baeMMTfSgpAAK99gWwNrj0rm7VGM63YIiA9GfCW XIW0oqjtS6hX0URWZeqfWsWOVOa4KqiZf8dJk= Received: by 10.224.60.20 with SMTP id n20mr1701001qah.279.1279835869298; Thu, 22 Jul 2010 14:57:49 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.185.146 with HTTP; Thu, 22 Jul 2010 14:57:29 -0700 (PDT) From: Blue Swirl Date: Thu, 22 Jul 2010 21:57:29 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 12/34] rtl8139: 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/rtl8139.c | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 deletions(-) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index d92981d..bc20549 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3269,28 +3269,17 @@ static const VMStateDescription vmstate_rtl8139 = { /***********************************************************/ /* PCI RTL8139 definitions */ -static void rtl8139_mmio_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - RTL8139State *s = DO_UPCAST(RTL8139State, dev, pci_dev); - - cpu_register_physical_memory(addr + 0, 0x100, s->rtl8139_mmio_io_addr); -} - -static void rtl8139_ioport_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - RTL8139State *s = DO_UPCAST(RTL8139State, dev, pci_dev); - - register_ioport_write(addr, 0x100, 1, rtl8139_ioport_writeb, s); - register_ioport_read( addr, 0x100, 1, rtl8139_ioport_readb, s); - - register_ioport_write(addr, 0x100, 2, rtl8139_ioport_writew, s); - register_ioport_read( addr, 0x100, 2, rtl8139_ioport_readw, s); +static IOPortWriteFunc * const rtl8139_io_writes[] = { + rtl8139_ioport_writeb, + rtl8139_ioport_writew, + rtl8139_ioport_writel, +}; - register_ioport_write(addr, 0x100, 4, rtl8139_ioport_writel, s); - register_ioport_read( addr, 0x100, 4, rtl8139_ioport_readl, s); -} +static IOPortReadFunc * const rtl8139_io_reads[] = { + rtl8139_ioport_readb, + rtl8139_ioport_readw, + rtl8139_ioport_readl, +}; static CPUReadMemoryFunc * const rtl8139_mmio_read[3] = { rtl8139_mmio_readb, @@ -3353,6 +3342,7 @@ static int pci_rtl8139_init(PCIDevice *dev) { RTL8139State * s = DO_UPCAST(RTL8139State, dev, dev); uint8_t *pci_conf; + int io_index; pci_conf = s->dev.config; pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK); @@ -3368,11 +3358,11 @@ static int pci_rtl8139_init(PCIDevice *dev) s->rtl8139_mmio_io_addr = cpu_register_io_memory(rtl8139_mmio_read, rtl8139_mmio_write, s); - pci_register_bar(&s->dev, 0, 0x100, - PCI_BASE_ADDRESS_SPACE_IO, rtl8139_ioport_map); - - pci_register_bar(&s->dev, 1, 0x100, - PCI_BASE_ADDRESS_SPACE_MEMORY, rtl8139_mmio_map); + pci_register_bar(&s->dev, 0, 0x100, PCI_BASE_ADDRESS_SPACE_IO, NULL); + io_index = cpu_register_io(rtl8139_io_reads, rtl8139_io_writes, 0x100, s); + pci_bar_map(&s->dev, 0, 0, 0, 0x100, io_index); + pci_register_bar(&s->dev, 1, 0x100, PCI_BASE_ADDRESS_SPACE_MEMORY, NULL); + pci_bar_map(&s->dev, 1, 0, 0, 0x100, s->rtl8139_mmio_io_addr); qemu_macaddr_default_if_unset(&s->conf.macaddr);