Changeset 1433ecda in mainline for uspace/lib/usbhid
- Timestamp:
- 2018-04-04T15:42:37Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 2c4e1cc
- Parents:
- 47b2d7e3
- Location:
- uspace/lib/usbhid
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h
r47b2d7e3 r1433ecda 135 135 136 136 /* Function keys */ 137 __NONPRINT( 138 __NONPRINT( 139 __NONPRINT( 140 __NONPRINT( 141 __NONPRINT( 142 __NONPRINT( 143 __NONPRINT( 144 __NONPRINT( 145 __NONPRINT( 137 __NONPRINT(F1, 0x3A); 138 __NONPRINT(F2, 0x3B); 139 __NONPRINT(F3, 0x3C); 140 __NONPRINT(F4, 0x3D); 141 __NONPRINT(F5, 0x3E); 142 __NONPRINT(F6, 0x3F); 143 __NONPRINT(F7, 0x40); 144 __NONPRINT(F8, 0x41); 145 __NONPRINT(F9, 0x42); 146 146 __NONPRINT(F10, 0x43); 147 147 __NONPRINT(F11, 0x44); -
uspace/lib/usbhid/src/hidparser.c
r47b2d7e3 r1433ecda 381 381 tmp_value = tmp_value << (offset % 8); 382 382 383 mask = ~(((1 << (8 - (offset % 8))) - 1) 384 << (offset % 8)); 383 mask = ~(((1 << (8 - (offset % 8))) - 1) << (offset % 8)); 385 384 386 385 buffer[i] = (buffer[i] & mask) | … … 471 470 return NULL; 472 471 } 473 memcpy(new_report_item, item, sizeof(usb_hid_report_item_t));472 memcpy(new_report_item, item, sizeof(usb_hid_report_item_t)); 474 473 link_initialize(&(new_report_item->link)); 475 474 -
uspace/lib/usbhid/src/hidpath.c
r47b2d7e3 r1433ecda 150 150 if (!list_empty(&usage_path->items)) { 151 151 item = list_get_instance(list_last(&usage_path->items), 152 152 usb_hid_report_usage_path_t, rpath_items_link); 153 153 154 154 switch (tag) { … … 293 293 294 294 while ((report_link != &report_path->items.head) && 295 295 (path_link != &path->items.head)) { 296 296 report_item = list_get_instance(report_link, 297 297 usb_hid_report_usage_path_t, rpath_items_link); … … 334 334 if (path == NULL) { 335 335 return NULL; 336 } 337 else { 336 } else { 338 337 path->depth = 0; 339 338 path->report_id = 0;
Note:
See TracChangeset
for help on using the changeset viewer.