Changes in uspace/lib/usbhid/src/hidpath.c [feeac0d:07525cd] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbhid/src/hidpath.c
rfeeac0d r07525cd 237 237 usb_hid_report_usage_path_t, report_item) { 238 238 239 if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 240 path_item->usage_page)){ 241 242 if(only_page == 0){ 243 if(USB_HID_SAME_USAGE( 244 report_item->usage, 245 path_item->usage)) { 246 239 if (USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 240 path_item->usage_page)) { 241 242 if (only_page == 0) { 243 if (USB_HID_SAME_USAGE(report_item->usage, 244 path_item->usage)) 247 245 return EOK; 248 }249 246 } 250 247 else { … … 268 265 report_link = report_path->items.head.next; 269 266 path_link = path->items.head.next; 270 271 while ((report_link != &report_path->items.head) &&272 273 267 268 while ((report_link != &report_path->items.head) && 269 (path_link != &path->items.head)) { 270 274 271 report_item = list_get_instance(report_link, 275 276 272 usb_hid_report_usage_path_t, rpath_items_link); 273 277 274 path_item = list_get_instance(path_link, 278 275 usb_hid_report_usage_path_t, rpath_items_link); 279 276 280 if (!USB_HID_SAME_USAGE_PAGE(report_item->usage_page,281 277 if (!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 278 path_item->usage_page) || ((only_page == 0) && 282 279 !USB_HID_SAME_USAGE(report_item->usage, 283 path_item->usage))) { 284 280 path_item->usage))) { 285 281 return 1; 286 282 } else { … … 290 286 } 291 287 292 if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 293 (path_link == &path->items.head)) || 294 ((report_link == &report_path->items.head) && 295 (path_link == &path->items.head))) { 296 288 if ((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 289 (path_link == &path->items.head)) || 290 ((report_link == &report_path->items.head) && 291 (path_link == &path->items.head))) { 297 292 return EOK; 298 } 299 else { 293 } else { 300 294 return 1; 301 } 295 } 302 296 break; 303 297
Note:
See TracChangeset
for help on using the changeset viewer.