Changeset 021351c in mainline for uspace/lib/usb/include

Timestamp:

2011-03-08T20:01:03Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

5050d9e

Parents:

8e9becf6 (diff), 8bec4d1 (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:

Merged changes from branch maklf

Location:

uspace/lib/usb/include/usb/classes

Files:

• hid_report_items.h (modified) (1 diff)
• hidparser.h (modified) (1 diff)

uspace/lib/usb/include/usb/classes/hid_report_items.h

@@ -42 +42 @@
 #define USB_HID_REPORT_TAG_INPUT                        0x8
 #define USB_HID_REPORT_TAG_OUTPUT                       0x9
-#define USB_HID_REPORT_TAG_FEATURE                      0xA
-#define USB_HID_REPORT_TAG_COLLECTION           0xB
+#define USB_HID_REPORT_TAG_FEATURE                      0xB
+#define USB_HID_REPORT_TAG_COLLECTION           0xA
 #define USB_HID_REPORT_TAG_END_COLLECTION       0xC
 

uspace/lib/usb/include/usb/classes/hidparser.h

@@ -76 +76 @@
         int32_t size;
         int32_t count;
-        int32_t offset;
+        size_t offset;
+        int32_t delimiter;
 
         int32_t unit_exponent;