From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NInX2-0005iS-9q for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:14:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NInWx-0005dJ-BP for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:14:27 -0500 Received: from [199.232.76.173] (port=41861 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NInWx-0005d7-47 for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:14:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9310) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NInWx-0003kr-Jb for qemu-devel@nongnu.org; Thu, 10 Dec 2009 13:14:23 -0500 Date: Thu, 10 Dec 2009 20:11:37 +0200 From: "Michael S. Tsirkin" Message-ID: <20091210181137.GQ25707@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 16/17] usb-uhci: symbolic names for pci registers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org No functional changes. I verified that the generated binary does not change. Signed-off-by: Michael S. Tsirkin --- hw/usb-ohci.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 7ab3a98..deab7f3 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1721,14 +1721,16 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev) pci_config_set_vendor_id(ohci->pci_dev.config, PCI_VENDOR_ID_APPLE); pci_config_set_device_id(ohci->pci_dev.config, PCI_DEVICE_ID_APPLE_IPID_USB); - ohci->pci_dev.config[0x09] = 0x10; /* OHCI */ + ohci->pci_dev.config[PCI_CLASS_PROG] = 0x10; /* OHCI */ pci_config_set_class(ohci->pci_dev.config, PCI_CLASS_SERIAL_USB); - ohci->pci_dev.config[0x3d] = 0x01; /* interrupt pin 1 */ + /* TODO: RST# value should be 0. */ + ohci->pci_dev.config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin 1 */ usb_ohci_init(&ohci->state, &dev->qdev, num_ports, ohci->pci_dev.devfn, ohci->pci_dev.irq[0], OHCI_TYPE_PCI, ohci->pci_dev.name, 0); + /* TODO: avoid cast below by using dev */ pci_register_bar((struct PCIDevice *)ohci, 0, 256, PCI_BASE_ADDRESS_SPACE_MEMORY, ohci_mapfunc); return 0; -- 1.6.6.rc1.43.gf55cc