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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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 (moved) (moved from uspace/drv/pciintel/pci.h ) (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;