Changeset 78dbf5b in mainline for uspace/lib/usb/include

Timestamp:

2011-05-07T08:38:40Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fb295b6

Parents:

6c6a95d2 (diff), 45a2688 (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:

Fixes (parsing), mouse driver improved, generic HID driver improved

Location:

uspace/lib/usb/include/usb/classes

Files:

• hiddescriptor.h (modified) (1 diff)
• hidpath.h (modified) (1 diff)
• hidtypes.h (modified) (1 diff)

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

@@ -78 +78 @@
 uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size);
 
+usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path);
 #endif
 /**

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

@@ -43 +43 @@
  * 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
-#define USB_HID_PATH_COMPARE_COLLECTION_ONLY    2 /* porovnava jenom cestu z Kolekci */
+/** Wanted usage path must be exactly the same as the searched one */
+#define USB_HID_PATH_COMPARE_STRICT             0
+/** Wanted usage path must be the suffix in the searched one */
+#define USB_HID_PATH_COMPARE_END                1
+/** */
+#define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY    2
+/** Searched usage page must be prefix of the other one */
+#define USB_HID_PATH_COMPARE_BEGIN              4
+/** Searched couple of usage page and usage can be anywhere in usage path */
+#define USB_HID_PATH_COMPARE_ANYWHERE           8
 
 

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

@@ -165 +165 @@
         /** */  
         link_t link;
+
+        int in_delimiter;
 } usb_hid_report_item_t;