Add and use remaining #defines for PCI device IDs
PATCH v2 1/1 Add and use remaining #defines for PCI device IDs
This patch adds and uses #defines for the remaining hardcoded PCI device IDs. It also moves definitions taken from linux/pci_ids.h into a separate header (hw/pci_ids.h), removes the 'RTL' from PCI_DEVICE_ID_REALTEK_RTL8029, and renames PCI_DEVICE_ID_FSL_E500 to PCI_DEVICE_ID_MPC8533E to match Linux's definition.
Changes in v2:
* Don't use C99-style comments
* Move definitions from linux/pci_ids.h into a separate header
* Rename PCI_DEVICE_ID_FSL_E500 to PCI_DEVICE_ID_MPC8533E
sh_pci.c +1 -1
@@ -189,7 +189,7 @@cpu_register_physical_memory (0xfd000000 ,0x1000000 , mem);pci_config_set_vendor_id (p->dev->config,PCI_VENDOR_ID_HITACHI ); -pci_config_set_device_id (p->dev->config,0x350e );// SH7751R +pci_config_set_device_id (p->dev->config,PCI_DEVICE_ID_HITACHI_SH7751R ); p->dev->config[0x04 ] =0x80 ; p->dev->config[0x05 ] =0x00 ; p->dev->config[0x06 ] =0x90 ;
usb-ohci.c +2 -1
@@ -1680,7 +1680,8 @@ }pci_config_set_vendor_id (ohci->pci_dev.config,PCI_VENDOR_ID_APPLE ); -pci_config_set_device_id (ohci->pci_dev.config,0x003f );// device_id +pci_config_set_device_id (ohci->pci_dev.config, +PCI_DEVICE_ID_APPLE_IPID_USB ); ohci->pci_dev.config[0x09 ] =0x10 ;/* OHCI */ pci_config_set_class (ohci->pci_dev.config,PCI_CLASS_SERIAL_USB ); ohci->pci_dev.config[0x3d ] =0x01 ;/* interrupt pin 1 */
pci_ids.h +95 -0
95 lines not on this page · raw message
pci.h +18 -78
126 lines not on this page · raw message
eepro100.c +1 -1
@@ -424,7 +424,7 @@/* PCI Vendor ID */ pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL );/* PCI Device ID */ -pci_config_set_device_id (pci_conf,0x1209 ); +pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_INTEL_82551IT );/* PCI Command */ PCI_CONFIG_16 (PCI_COMMAND ,0x0000 );/* PCI Status */
ne2000.c +1 -1
@@ -789,7 +789,7 @@ NULL, NULL); pci_conf = d->dev.config;pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_REALTEK ); -pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_REALTEK_RTL8029 ); +pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_REALTEK_8029 );pci_config_set_class (pci_conf,PCI_CLASS_NETWORK_ETHERNET ); pci_conf[0x0e ] =0x00 ;// header_type pci_conf[0x3d ] =1 ;// interrupt pin 0
versatile_pci.c +1 -1
@@ -126,7 +126,7 @@pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_XILINX );/* Both boards have the same device ID. Oh well. */ -pci_config_set_device_id (d->config,0x0300 );// device_id +pci_config_set_device_id (d->config,PCI_DEVICE_ID_XILINX_XC2VP30 ); d->config[0x04 ] =0x00 ; d->config[0x05 ] =0x00 ; d->config[0x06 ] =0x20 ;
ppce500_pci.c +2 -2
@@ -324,8 +324,8 @@"host bridge" ,sizeof (PCIDevice), 0, NULL, NULL); -pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_FSL ); -pci_config_set_device_id (d->config,PCI_DEVICE_ID_FSL_E500 ); +pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_FREESCALE ); +pci_config_set_device_id (d->config,PCI_DEVICE_ID_MPC8533E );pci_config_set_class (d->config,PCI_CLASS_PROCESSOR_POWERPC ); controller->pci_dev = d;
ppc4xx_pci.c +1 -1
@@ -379,7 +379,7 @@ 0, NULL, NULL); pci_conf = controller->pci_dev->config;pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_IBM ); -pci_config_set_device_id (pci_conf,0x027f );// device_id +pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_IBM_440GX );pci_config_set_class (pci_conf,PCI_CLASS_BRIDGE_OTHER );/* CFGADDR */
gt64xxx.c +1 -1
@@ -1137,7 +1137,7 @@/* FIXME: Malta specific hw assumptions ahead */ pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_MARVELL ); -pci_config_set_device_id (d->config,0x4620 );/* device_id */ +pci_config_set_device_id (d->config,PCI_DEVICE_ID_MARVELL_GT6412X ); d->config[0x04 ] =0x00 ; d->config[0x05 ] =0x00 ;
Signature · 1 line
Stuart Brady
Anthony Liguori
AppliedQuoted 6 lines · Stuart Brady
This patch adds and uses #defines for the remaining hardcoded PCI device IDs. It also moves definitions taken from
linux/pci_ids.hinto a separate header (hw/pci_ids.h), removes the 'RTL' fromPCI_DEVICE_ID_REALTEK_RTL8029, and renamesPCI_DEVICE_ID_FSL_E500toPCI_DEVICE_ID_MPC8533Eto match Linux's definition.
Quoted 7 lines
Changes in v2:
* Don't use C99-style comments
* Move definitions fromlinux/pci_ids.hinto a separate header
* RenamePCI_DEVICE_ID_FSL_E500toPCI_DEVICE_ID_MPC8533ESigned-off-by Stuart Brady <[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori