Changeset ec6bee4 in mainline for uspace/lib/usb/include/usb/classes/hidparser.h

Timestamp:

2011-04-05T17:44:20Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

15a9e63

Parents:

966acede (diff), bda06a3 (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 maklf (report IDs support)

File:

• uspace/lib/usb/include/usb/classes/hidparser.h (modified) (4 diffs)

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

@@ -88 +88 @@
         /** */  
         int depth;      
+        uint8_t report_id;
         
         /** */  
@@ -155 +156 @@
         /** */  
         link_t feature;
+        
+        int use_report_id;
+        
 } usb_hid_report_parser_t;      
 
@@ -166 +170 @@
          * @param arg Custom argument.
          */
-        void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t modifiers, void *arg);
+        void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t report_id, void *arg);
 } usb_hid_report_in_callbacks_t;
 
@@ -269 +273 @@
 
 /** */
+int usb_hid_report_path_set_report_id(usb_hid_report_path_t *usage_path, uint8_t report_id);
+
+/** */
 int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, int32_t usage_page, int32_t usage);