michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: pci: struct pci_dev_info rename class

Browse source 
Rename class in pci_dev_info struct to allow to use C++ compilers.
Updated drivers to use new struct.

Change-Id: I17b94cb7bc094bccd615c8389a28589bfa90cab8
Signed-off-by: Javier B Perez Hernandez <javier.b.perez.hernandez@linux.intel.com>
This commit is contained in:
Javier B Perez Hernandez 2015-12-29 16:34:58 -06:00 • committed by Anas Nashif
commit 02812f4635
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/pci/pci.c
View file

@ -45,7 +45,7 @@
*
* EXAMPLE
* struct pci_dev_info info = {
* .class = PCI_CLASS_COMM_CTLR
* .class_type = PCI_CLASS_COMM_CTLR
* };
*
* pci_bus_scan_init();
@ -286,8 +286,8 @@ static inline int pci_dev_scan(union pci_addr_reg pci_ctrl_addr,
* Skip a device if its class is specified by the
* caller and does not match
*/
if (lookup.info.class &&
pci_dev_header.field.class != lookup.info.class) {
if (lookup.info.class_type &&
pci_dev_header.field.class != lookup.info.class_type) {
continue;
}
@ -318,7 +318,7 @@ static inline int pci_dev_scan(union pci_addr_reg pci_ctrl_addr,
pci_dev_header.field.vendor_id;
dev_info->device_id =
pci_dev_header.field.device_id;
dev_info->class =
dev_info->class_type =
pci_dev_header.field.class;
dev_info->irq = pci_pin2irq(
pci_dev_header.field.interrupt_pin);
@ -342,7 +342,7 @@ static inline int pci_dev_scan(union pci_addr_reg pci_ctrl_addr,
void pci_bus_scan_init(void)
{
lookup.info.class = 0;
lookup.info.class_type = 0;
lookup.info.vendor_id = 0;
lookup.info.device_id = 0;
lookup.info.function = PCI_FUNCTION_ANY;
@ -370,12 +370,12 @@ int pci_bus_scan(struct pci_dev_info *dev_info)
{
union pci_addr_reg pci_ctrl_addr;
if (!lookup.info.class &&
if (!lookup.info.class_type &&
!lookup.info.vendor_id &&
!lookup.info.device_id &&
lookup.info.bar == PCI_BAR_ANY &&
lookup.info.function == PCI_FUNCTION_ANY) {
lookup.info.class = dev_info->class;
lookup.info.class_type = dev_info->class_type;
lookup.info.vendor_id = dev_info->vendor_id;
lookup.info.device_id = dev_info->device_id;
lookup.info.function = dev_info->function;
@ -472,7 +472,7 @@ void pci_show(struct pci_dev_info *dev_info)
dev_info->dev,
dev_info->vendor_id,
dev_info->device_id,
dev_info->class,
dev_info->class_type,
dev_info->function,
dev_info->bar,
(dev_info->mem_type == BAR_SPACE_MEM) ? "MEM" : "I/O",

2
drivers/pci/pci_legacy_bridge.c
View file

@ -159,7 +159,7 @@ int pci_legacy_bridge_detect(struct pci_dev_info *dev_info)
dev_info->dev = CONFIG_PCI_LEGACY_BRIDGE_DEV;
dev_info->function = 0;
dev_info->mem_type = BAR_SPACE_MEM;
dev_info->class = pci_dev_header.field.class;
dev_info->class_type = pci_dev_header.field.class;
dev_info->bar = 0;
dev_info->vendor_id = pci_dev_header.field.vendor_id;
dev_info->device_id = pci_dev_header.field.device_id;