Changeset 3842a955 in mainline for uspace/lib/usbhid/include/usb/hid/hidpath.h

Timestamp:

2011-06-19T15:59:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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/hidpath.h (modified) (2 diffs)

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

@@ -88 +88 @@
         uint8_t flags;
 
-        /** Linked list structure*/
-        link_t link;
+        /** Link to usb_hid_report_path_t.items list */
+        link_t rpath_items_link;
 } usb_hid_report_usage_path_t;
 
@@ -98 +98 @@
  * */
 typedef struct {
-        /** Length of usage path */     
-        int depth;      
+        /** Length of usage path */
+        int depth;
 
         /** Report id. Zero is reserved and means that report id is not used.
          * */
         uint8_t report_id;
-        
-        /** Linked list structure. */   
-        link_t link; /* list */
 
-        /** Head of the list of usage path items. */
-        link_t head;
+        /** Link to usb_hid_report_path_t.collection_paths list. */
+        link_t cpath_link;
 
+        /** List of usage path items. */
+        list_t items;   /* of usb_hid_report_usage_path_t */
 } usb_hid_report_path_t;