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

Timestamp:

2011-03-26T13:28:43Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f62468c

Parents:

889e8e3 (diff), c9f5e238 (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 development/ changes

File:

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

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

@@ -70 +70 @@
  * Description of path of usage pages and usages in report descriptor
  */
+#define USB_HID_PATH_COMPARE_STRICT                             0
+#define USB_HID_PATH_COMPARE_END                                1
+#define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY    4
+
 typedef struct {
         int32_t usage_page;
+        int32_t usage;
+
+        link_t link;
+} usb_hid_report_usage_path_t;
+
+typedef struct {
+        int depth;      
+        link_t link;
 } usb_hid_report_path_t;
 
@@ -79 +91 @@
 typedef struct {
         int32_t id;
-        int32_t usage_page;
-        int32_t usage;  
         int32_t usage_minimum;
         int32_t usage_maximum;
@@ -107 +117 @@
         uint8_t item_flags;
 
+        usb_hid_report_path_t *usage_path;
         link_t link;
 } usb_hid_report_item_t;
@@ -117 +128 @@
         link_t feature;
 } usb_hid_report_parser_t;      
-
 
 
@@ -194 +204 @@
 int usb_hid_parse_report(const usb_hid_report_parser_t *parser,  
     const uint8_t *data, size_t size,
+    usb_hid_report_path_t *path, int flags,
     const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 
 int usb_hid_report_input_length(const usb_hid_report_parser_t *parser,
-        const usb_hid_report_path_t *path);
+        usb_hid_report_path_t *path, int flags);
 
 
@@ -204 +215 @@
 void usb_hid_descriptor_print(usb_hid_report_parser_t *parser);
 
+/* usage path functions */
+usb_hid_report_path_t *usb_hid_report_path(void);
+void usb_hid_report_path_free(usb_hid_report_path_t *path);
+int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, int32_t usage_page, int32_t usage);
+void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path);
+void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path);
+void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, int32_t tag, int32_t data);
+int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, usb_hid_report_path_t *path, int flags);
+int     usb_hid_report_path_clone(usb_hid_report_path_t *new_usage_path, usb_hid_report_path_t *usage_path);
+
+
+// output
+//      - funkce co vrati cesty poli v output reportu
+//      - funkce co pro danou cestu nastavi data
+//      - finalize
+
 #endif
 /**