From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LTcHQ-0002Oo-LF for qemu-devel@nongnu.org; Sun, 01 Feb 2009 08:22:32 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LTcHO-0002N0-L6 for qemu-devel@nongnu.org; Sun, 01 Feb 2009 08:22:31 -0500 Received: from [199.232.76.173] (port=52095 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LTcHO-0002Mp-HO for qemu-devel@nongnu.org; Sun, 01 Feb 2009 08:22:30 -0500 Received: from mtaout01-winn.ispmail.ntl.com ([81.103.221.47]:38050) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LTcHM-0004Qt-EV for qemu-devel@nongnu.org; Sun, 01 Feb 2009 08:22:29 -0500 Received: from aamtaout04-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout01-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20090201132227.XIWT2989.mtaout01-winn.ispmail.ntl.com@aamtaout04-winn.ispmail.ntl.com> for ; Sun, 1 Feb 2009 13:22:27 +0000 Received: from miranda.arrow ([213.107.21.171]) by aamtaout04-winn.ispmail.ntl.com (InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id <20090201132227.LBHP22934.aamtaout04-winn.ispmail.ntl.com@miranda.arrow> for ; Sun, 1 Feb 2009 13:22:27 +0000 Received: from sdb by miranda.arrow with local (Exim 4.63) (envelope-from ) id 1LTcHE-0003Z1-Fv for qemu-devel@nongnu.org; Sun, 01 Feb 2009 13:22:20 +0000 Date: Sun, 1 Feb 2009 13:22:20 +0000 From: Stuart Brady Subject: Re: [Qemu-devel] [6490] Update #defines for PCI vendor and device IDs from OpenBIOS and Linux Message-ID: <20090201132220.GA13663@miranda.arrow> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On Sun, Feb 01, 2009 at 12:01:07PM +0000, Blue Swirl wrote: > Update #defines for PCI vendor and device IDs from OpenBIOS and Linux Just a few questions... > Modified: trunk/hw/grackle_pci.c > =================================================================== > --- trunk/hw/grackle_pci.c 2009-01-30 20:39:41 UTC (rev 6489) > +++ trunk/hw/grackle_pci.c 2009-02-01 12:01:04 UTC (rev 6490) > @@ -154,10 +154,8 @@ > > #if 0 > /* PCI2PCI bridge same values as PearPC - check this */ > - d->config[0x00] = 0x11; // vendor_id > - d->config[0x01] = 0x10; > - d->config[0x02] = 0x26; // device_id > - d->config[0x03] = 0x00; > + pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_DEC); > + pci_config_set_device_id(d->config, PCI_DEVICE_ID_DEC_21154); Isn't the DEC 21154 is a Tulip-compatible NIC, and not a PCI bridge? Yes, 0x1011 is the Vendor ID for DEC, and 0x0026 is the Device ID for the 21154, but what was actually intended here? > +#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff > +#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 > +#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e > +#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f > +#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 > +#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 > #define PCI_DEVICE_ID_REALTEK_8139 0x8139 It probably wouldn't hurt to mark IDs without a corresponding definition in Linux's pci_ids.h with a comment... (Also, RTL8029 vs. 8139?...) > +#define PCI_VENDOR_ID_QEMU 0x1234 > +#define PCI_DEVICE_ID_QEMU_VGA 0x1111 I gather 0x1234/0x1111 was originally chosen by Bochs. Unfortunately, it is apparently allocated to 'Technical Corp.' Would it be possible to use something less confusing instead? Cheers, -- Stuart Brady