Changes in uspace/lib/usbhid/src/hiddescriptor.c [b72efe8:ebbe1e4] in mainline
- File:
-
- 1 edited
-
uspace/lib/usbhid/src/hiddescriptor.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbhid/src/hiddescriptor.c
rb72efe8 rebbe1e4 88 88 * @retval NULL If some error occurs 89 89 */ 90 usb_hid_report_path_t *usb_hid_report_path_try_insert( usb_hid_report_t *report,91 usb_hid_report_path_t *cmp_path) 92 { 93 link_t *path_it = report->collection_paths. head.next;90 usb_hid_report_path_t *usb_hid_report_path_try_insert( 91 usb_hid_report_t *report, usb_hid_report_path_t *cmp_path) { 92 93 link_t *path_it = report->collection_paths.next; 94 94 usb_hid_report_path_t *path = NULL; 95 95 … … 98 98 } 99 99 100 while(path_it != &report->collection_paths .head) {100 while(path_it != &report->collection_paths) { 101 101 path = list_get_instance(path_it, usb_hid_report_path_t, 102 cpath_link);102 link); 103 103 104 104 if(usb_hid_report_compare_usage_path(path, cmp_path, 105 105 USB_HID_PATH_COMPARE_STRICT) == EOK){ 106 106 break; 107 } 107 } 108 108 path_it = path_it->next; 109 109 } 110 if(path_it == &report->collection_paths .head) {110 if(path_it == &report->collection_paths) { 111 111 path = usb_hid_report_path_clone(cmp_path); 112 112 if(path == NULL) { 113 113 return NULL; 114 114 } 115 list_append(&path-> cpath_link, &report->collection_paths);115 list_append(&path->link, &report->collection_paths); 116 116 report->collection_paths_count++; 117 117 … … 120 120 else { 121 121 return list_get_instance(path_it, usb_hid_report_path_t, 122 cpath_link);122 link); 123 123 } 124 124 } … … 192 192 193 193 memset(field, 0, sizeof(usb_hid_report_field_t)); 194 li nk_initialize(&field->ritems_link);194 list_initialize(&field->link); 195 195 196 196 /* fill the attributes */ … … 291 291 } 292 292 293 li nk_initialize (&report_des->reports_link);293 list_initialize (&report_des->link); 294 294 list_initialize (&report_des->report_items); 295 295 296 list_append(&report_des-> reports_link, &report->reports);296 list_append(&report_des->link, &report->reports); 297 297 report->report_count++; 298 298 } 299 299 300 300 /* append this field to the end of founded report list */ 301 list_append (&field->ritems_link, &report_des->report_items);301 list_append (&field->link, &report_des->report_items); 302 302 303 303 /* update the sizes */ … … 333 333 } 334 334 335 link_t *report_it = report->reports.next; 335 336 usb_hid_report_description_t *report_des = NULL; 336 337 337 list_foreach(report->reports, report_it) {338 while(report_it != &report->reports) { 338 339 report_des = list_get_instance(report_it, 339 usb_hid_report_description_t, reports_link);340 usb_hid_report_description_t, link); 340 341 341 342 // if report id not set, return the first of the type … … 344 345 return report_des; 345 346 } 347 348 report_it = report_it->next; 346 349 } 347 350 … … 374 377 size_t offset_output=0; 375 378 size_t offset_feature=0; 376 377 link_t *item_link; 378 379 list_t stack; 380 list_initialize(&stack); 379 380 link_t stack; 381 list_initialize(&stack); 381 382 382 383 /* parser structure initialization*/ … … 390 391 } 391 392 memset(report_item, 0, sizeof(usb_hid_report_item_t)); 392 li nk_initialize(&(report_item->link));393 list_initialize(&(report_item->link)); 393 394 394 395 /* usage path context initialization */ … … 492 493 case USB_HID_REPORT_TAG_POP: 493 494 // restore current state from stack 494 item_link = list_first(&stack); 495 if (item_link == NULL) { 495 if(list_empty (&stack)) { 496 496 return EINVAL; 497 497 } 498 498 free(report_item); 499 500 report_item = list_get_instance( item_link,499 500 report_item = list_get_instance(stack.next, 501 501 usb_hid_report_item_t, link); 502 502 503 503 usb_hid_report_usage_path_t *tmp_usage_path; 504 504 tmp_usage_path = list_get_instance( 505 report_item->usage_path-> cpath_link.prev,506 usb_hid_report_usage_path_t, rpath_items_link);507 505 report_item->usage_path->link.prev, 506 usb_hid_report_usage_path_t, link); 507 508 508 usb_hid_report_set_last_item(usage_path, 509 509 USB_HID_TAG_CLASS_GLOBAL, tmp_usage_path->usage_page); … … 513 513 514 514 usb_hid_report_path_free(report_item->usage_path); 515 list_remove ( item_link);515 list_remove (stack.next); 516 516 517 517 break; … … 609 609 610 610 /* store collection atributes */ 611 path_item = list_get_instance( list_first(&usage_path->items),612 usb_hid_report_usage_path_t, rpath_items_link);613 path_item->flags = *data; 611 path_item = list_get_instance(usage_path->head.prev, 612 usb_hid_report_usage_path_t, link); 613 path_item->flags = *data; 614 614 615 615 /* set last item */ … … 900 900 * @return void 901 901 */ 902 void usb_hid_descriptor_print_list(li st_t *list)902 void usb_hid_descriptor_print_list(link_t *head) 903 903 { 904 904 usb_hid_report_field_t *report_item; 905 906 if(list == NULL || list_empty(list)) { 905 link_t *item; 906 907 908 if(head == NULL || list_empty(head)) { 907 909 usb_log_debug("\tempty\n"); 908 910 return; 909 911 } 910 911 list_foreach(*list, item) { 912 report_item = list_get_instance(item, usb_hid_report_field_t, 913 ritems_link); 912 913 for(item = head->next; item != head; item = item->next) { 914 915 report_item = list_get_instance(item, usb_hid_report_field_t, 916 link); 914 917 915 918 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset); 916 919 usb_log_debug("\t\tSIZE: %zu\n", report_item->size); 917 usb_log_debug("\t\tLOGMIN: %d\n", 920 usb_log_debug("\t\tLOGMIN: %d\n", 918 921 report_item->logical_minimum); 919 usb_log_debug("\t\tLOGMAX: %d\n", 920 report_item->logical_maximum); 921 usb_log_debug("\t\tPHYMIN: %d\n", 922 report_item->physical_minimum); 923 usb_log_debug("\t\tPHYMAX: %d\n", 924 report_item->physical_maximum); 925 usb_log_debug("\t\ttUSAGEMIN: %X\n", 922 usb_log_debug("\t\tLOGMAX: %d\n", 923 report_item->logical_maximum); 924 usb_log_debug("\t\tPHYMIN: %d\n", 925 report_item->physical_minimum); 926 usb_log_debug("\t\tPHYMAX: %d\n", 927 report_item->physical_maximum); 928 usb_log_debug("\t\ttUSAGEMIN: %X\n", 926 929 report_item->usage_minimum); 927 930 usb_log_debug("\t\tUSAGEMAX: %X\n", 928 931 report_item->usage_maximum); 929 usb_log_debug("\t\tUSAGES COUNT: %zu\n", 932 usb_log_debug("\t\tUSAGES COUNT: %zu\n", 930 933 report_item->usages_count); 931 934 … … 933 936 usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage); 934 937 usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page); 935 938 936 939 usb_hid_print_usage_path(report_item->collection_path); 937 940 938 usb_log_debug("\n"); 941 usb_log_debug("\n"); 939 942 940 943 } … … 955 958 } 956 959 960 link_t *report_it = report->reports.next; 957 961 usb_hid_report_description_t *report_des; 958 962 959 list_foreach(report->reports, report_it) {960 report_des = list_get_instance(report_it, 961 usb_hid_report_description_t, reports_link);963 while(report_it != &report->reports) { 964 report_des = list_get_instance(report_it, 965 usb_hid_report_description_t, link); 962 966 usb_log_debug("Report ID: %d\n", report_des->report_id); 963 967 usb_log_debug("\tType: %d\n", report_des->type); 964 usb_log_debug("\tLength: %zu\n", report_des->bit_length); 968 usb_log_debug("\tLength: %zu\n", report_des->bit_length); 965 969 usb_log_debug("\tB Size: %zu\n", 966 usb_hid_report_byte_size(report, 967 report_des->report_id, 970 usb_hid_report_byte_size(report, 971 report_des->report_id, 968 972 report_des->type)); 969 usb_log_debug("\tItems: %zu\n", report_des->item_length); 973 usb_log_debug("\tItems: %zu\n", report_des->item_length); 970 974 971 975 usb_hid_descriptor_print_list(&report_des->report_items); 976 977 report_it = report_it->next; 972 978 } 973 979 } … … 977 983 * Releases whole linked list of report items 978 984 * 979 * @param list List of report descriptor items (usb_hid_report_item_t)985 * @param head Head of list of report descriptor items (usb_hid_report_item_t) 980 986 * @return void 981 987 */ 982 void usb_hid_free_report_list(li st_t *list)988 void usb_hid_free_report_list(link_t *head) 983 989 { 984 return; /* XXX What's this? */985 986 /*usb_hid_report_item_t *report_item;990 return; 991 992 usb_hid_report_item_t *report_item; 987 993 link_t *next; 988 994 989 if( list == NULL || list_empty(list)) {995 if(head == NULL || list_empty(head)) { 990 996 return; 991 997 } 992 998 993 next = list->head.next;994 while (next != &list->head) {995 report_item = list_get_instance(next, usb_hid_report_item_t,996 rpath_items_link);999 next = head->next; 1000 while(next != head) { 1001 1002 report_item = list_get_instance(next, usb_hid_report_item_t, link); 997 1003 998 1004 while(!list_empty(&report_item->usage_path->link)) { 999 1005 usb_hid_report_remove_last_item(report_item->usage_path); 1000 1006 } 1001 1007 … … 1007 1013 1008 1014 return; 1009 */1015 1010 1016 } 1011 1017 /*---------------------------------------------------------------------------*/ … … 1023 1029 1024 1030 // free collection paths 1025 link_t *path_link;1026 1031 usb_hid_report_path_t *path; 1027 1032 while(!list_empty(&report->collection_paths)) { 1028 path_link = list_first(&report->collection_paths); 1029 path = list_get_instance(path_link, 1030 usb_hid_report_path_t, cpath_link); 1031 1032 list_remove(path_link); 1033 usb_hid_report_path_free(path); 1033 path = list_get_instance(report->collection_paths.next, 1034 usb_hid_report_path_t, link); 1035 1036 usb_hid_report_path_free(path); 1034 1037 } 1035 1038 … … 1038 1041 usb_hid_report_field_t *field; 1039 1042 while(!list_empty(&report->reports)) { 1040 report_des = list_get_instance( list_first(&report->reports),1041 usb_hid_report_description_t, reports_link);1042 1043 list_remove(&report_des-> reports_link);1043 report_des = list_get_instance(report->reports.next, 1044 usb_hid_report_description_t, link); 1045 1046 list_remove(&report_des->link); 1044 1047 1045 1048 while(!list_empty(&report_des->report_items)) { 1046 1049 field = list_get_instance( 1047 list_first(&report_des->report_items),1048 usb_hid_report_field_t, ritems_link);1049 1050 list_remove(&field-> ritems_link);1050 report_des->report_items.next, 1051 usb_hid_report_field_t, link); 1052 1053 list_remove(&field->link); 1051 1054 1052 1055 free(field);
Note:
See TracChangeset
for help on using the changeset viewer.
