Changeset 4fe3b6d in mainline for uspace/lib/usbhid/src/hidpath.c

Timestamp:

2011-05-20T11:07:00Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 with development

File:

• uspace/lib/usbhid/src/hidpath.c (modified) (6 diffs)

uspace/lib/usbhid/src/hidpath.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb
+/** @addtogroup libusbhid
  * @{
  */
@@ -33 +33 @@
  * HID report descriptor and report data parser implementation.
  */
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <errno.h>
 #include <stdio.h>
@@ -41 +41 @@
 #include <assert.h>
 
+
+#define USB_HID_SAME_USAGE(usage1, usage2)      ((usage1 == usage2) || (usage1 == 0) || (usage2 == 0))
+#define USB_HID_SAME_USAGE_PAGE(page1, page2)   ((page1 == page2) || (page1 == 0) || (page2 == 0))
 
 /**
@@ -203 +206 @@
                         while(report_link != &report_path->head) {
                                 report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link);
-                                if(report_item->usage_page == path_item->usage_page){
+                                if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page, path_item->usage_page)){
                                         if(only_page == 0){
-                                                if(report_item->usage == path_item->usage) {
+                                                if(USB_HID_SAME_USAGE(report_item->usage, path_item->usage)) {
                                                         return EOK;
                                                 }
@@ -242 +245 @@
                                                                       link);            
 
-                                        if((report_item->usage_page != path_item->usage_page) || 
+                                        if(!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, path_item->usage_page) || 
                                            ((only_page == 0) && 
-                                            (report_item->usage != path_item->usage))) {
+                                            !USB_HID_SAME_USAGE(report_item->usage, path_item->usage))) {
                                                         
                                                    return 1;
@@ -282 +285 @@
                                                                       usb_hid_report_usage_path_t, 
                                                                       link);            
-
-                                        if((report_item->usage_page != path_item->usage_page) || 
+                                                  
+                                        if(!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, path_item->usage_page) || 
                                            ((only_page == 0) && 
-                                            (report_item->usage != path_item->usage))) {
-                                                   return 1;
+                                            !USB_HID_SAME_USAGE(report_item->usage, path_item->usage))) {
+                                                        return 1;
                                         } else {
                                                 report_link = report_link->prev;