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

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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

@@ -59 +59 @@
         int dev;
         int fn;
-        int vendor_id;
-        int device_id;
+        uint16_t vendor_id;
+        uint16_t device_id;
+        uint16_t command;
         uint8_t class_code;
         uint8_t subclass_code;