Changeset 00aece0 in mainline for uspace/drv/bus/pci/pciintel/pci.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/pci/pciintel/pci.h (modified) (1 diff)

uspace/drv/bus/pci/pciintel/pci.h

@@ -60 +60 @@
         int vendor_id;
         int device_id;
+        uint8_t class_code;
+        uint8_t subclass_code;
+        uint8_t prog_if;
+        uint8_t revision;
         hw_resource_list_t hw_resources;
+        hw_resource_t resources[PCI_MAX_HW_RES];
 } pci_fun_t;