Changeset f1fae414 in mainline for uspace/lib/usbhid/include/usb/hid/hidtypes.h

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/lib/usbhid/include/usb/hid/hidtypes.h (modified) (3 diffs)

uspace/lib/usbhid/include/usb/hid/hidtypes.h

@@ -95 +95 @@
         int report_count;
 
-        /** Head of linked list of description of reports. */
-        link_t reports;
-
-        /** Head of linked list of all used usage/collection paths. */
-        link_t collection_paths;
+        /** List of description of reports. */
+        list_t reports; /* of usb_hid_report_description_t */
+
+        /** List of all used usage/collection paths. */
+        list_t collection_paths;
 
         /** Length of list of usage paths. */
@@ -129 +129 @@
         size_t item_length;
         
-        /** Linked list of report items in report */
-        link_t report_items;
-
-        /** Linked list of descriptions. */
-        link_t link;
+        /** List of report items in report */
+        list_t report_items;
+
+        /** Link to usb_hid_report_t.reports list. */
+        link_t reports_link;
 } usb_hid_report_description_t;
 /*---------------------------------------------------------------------------*/
@@ -198 +198 @@
         int32_t value;
 
-        /** List to another report items */
-        link_t link;
+        /** Link to usb_hid_report_description_t.report_items list */
+        link_t ritems_link;
 } usb_hid_report_field_t;