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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

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;