Changeset 3842a955 in mainline for uspace/lib/usbhid/src/hiddescriptor.c
- Timestamp:
- 2011-06-19T15:59:42Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 26e7d6d
- Parents:
- 9724d7f (diff), 74464e8 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbhid/src/hiddescriptor.c
r9724d7f r3842a955 88 88 * @retval NULL If some error occurs 89 89 */ 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;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; 94 94 usb_hid_report_path_t *path = NULL; 95 95 … … 98 98 } 99 99 100 while(path_it != &report->collection_paths ) {100 while(path_it != &report->collection_paths.head) { 101 101 path = list_get_instance(path_it, usb_hid_report_path_t, 102 link);102 cpath_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 ) {110 if(path_it == &report->collection_paths.head) { 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-> link, &report->collection_paths);115 list_append(&path->cpath_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 link);122 cpath_link); 123 123 } 124 124 } … … 192 192 193 193 memset(field, 0, sizeof(usb_hid_report_field_t)); 194 li st_initialize(&field->link);194 link_initialize(&field->ritems_link); 195 195 196 196 /* fill the attributes */ … … 291 291 } 292 292 293 li st_initialize (&report_des->link);293 link_initialize (&report_des->reports_link); 294 294 list_initialize (&report_des->report_items); 295 295 296 list_append(&report_des-> link, &report->reports);296 list_append(&report_des->reports_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->link, &report_des->report_items);301 list_append(&field->ritems_link, &report_des->report_items); 302 302 303 303 /* update the sizes */ … … 333 333 } 334 334 335 link_t *report_it = report->reports.next;336 335 usb_hid_report_description_t *report_des = NULL; 337 336 338 while(report_it != &report->reports) {337 list_foreach(report->reports, report_it) { 339 338 report_des = list_get_instance(report_it, 340 usb_hid_report_description_t, link);339 usb_hid_report_description_t, reports_link); 341 340 342 341 // if report id not set, return the first of the type … … 345 344 return report_des; 346 345 } 347 348 report_it = report_it->next;349 346 } 350 347 … … 377 374 size_t offset_output=0; 378 375 size_t offset_feature=0; 379 380 link_t stack; 381 list_initialize(&stack); 376 377 link_t *item_link; 378 379 list_t stack; 380 list_initialize(&stack); 382 381 383 382 /* parser structure initialization*/ … … 391 390 } 392 391 memset(report_item, 0, sizeof(usb_hid_report_item_t)); 393 li st_initialize(&(report_item->link));392 link_initialize(&(report_item->link)); 394 393 395 394 /* usage path context initialization */ … … 493 492 case USB_HID_REPORT_TAG_POP: 494 493 // restore current state from stack 495 if(list_empty (&stack)) { 494 item_link = list_first(&stack); 495 if (item_link == NULL) { 496 496 return EINVAL; 497 497 } 498 498 free(report_item); 499 500 report_item = list_get_instance( stack.next,499 500 report_item = list_get_instance(item_link, 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-> link.prev,506 usb_hid_report_usage_path_t, link);507 505 report_item->usage_path->cpath_link.prev, 506 usb_hid_report_usage_path_t, rpath_items_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 ( stack.next);515 list_remove (item_link); 516 516 517 517 break; … … 609 609 610 610 /* store collection atributes */ 611 path_item = list_get_instance( usage_path->head.prev,612 usb_hid_report_usage_path_t, link);613 path_item->flags = *data; 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; 614 614 615 615 /* set last item */ … … 900 900 * @return void 901 901 */ 902 void usb_hid_descriptor_print_list(li nk_t *head)902 void usb_hid_descriptor_print_list(list_t *list) 903 903 { 904 904 usb_hid_report_field_t *report_item; 905 link_t *item; 906 907 908 if(head == NULL || list_empty(head)) { 905 906 if(list == NULL || list_empty(list)) { 909 907 usb_log_debug("\tempty\n"); 910 908 return; 911 909 } 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); 910 911 list_foreach(*list, item) { 912 report_item = list_get_instance(item, usb_hid_report_field_t, 913 ritems_link); 917 914 918 915 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset); 919 916 usb_log_debug("\t\tSIZE: %zu\n", report_item->size); 920 usb_log_debug("\t\tLOGMIN: %d\n", 917 usb_log_debug("\t\tLOGMIN: %d\n", 921 918 report_item->logical_minimum); 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", 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", 929 926 report_item->usage_minimum); 930 927 usb_log_debug("\t\tUSAGEMAX: %X\n", 931 928 report_item->usage_maximum); 932 usb_log_debug("\t\tUSAGES COUNT: %zu\n", 929 usb_log_debug("\t\tUSAGES COUNT: %zu\n", 933 930 report_item->usages_count); 934 931 … … 936 933 usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage); 937 934 usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page); 938 935 939 936 usb_hid_print_usage_path(report_item->collection_path); 940 937 941 usb_log_debug("\n"); 938 usb_log_debug("\n"); 942 939 943 940 } … … 958 955 } 959 956 960 link_t *report_it = report->reports.next;961 957 usb_hid_report_description_t *report_des; 962 958 963 while(report_it != &report->reports) {964 report_des = list_get_instance(report_it, 965 usb_hid_report_description_t, link);959 list_foreach(report->reports, report_it) { 960 report_des = list_get_instance(report_it, 961 usb_hid_report_description_t, reports_link); 966 962 usb_log_debug("Report ID: %d\n", report_des->report_id); 967 963 usb_log_debug("\tType: %d\n", report_des->type); 968 usb_log_debug("\tLength: %zu\n", report_des->bit_length); 964 usb_log_debug("\tLength: %zu\n", report_des->bit_length); 969 965 usb_log_debug("\tB Size: %zu\n", 970 usb_hid_report_byte_size(report, 971 report_des->report_id, 966 usb_hid_report_byte_size(report, 967 report_des->report_id, 972 968 report_des->type)); 973 usb_log_debug("\tItems: %zu\n", report_des->item_length); 969 usb_log_debug("\tItems: %zu\n", report_des->item_length); 974 970 975 971 usb_hid_descriptor_print_list(&report_des->report_items); 976 977 report_it = report_it->next;978 972 } 979 973 } … … 983 977 * Releases whole linked list of report items 984 978 * 985 * @param head Head of list of report descriptor items (usb_hid_report_item_t)979 * @param list List of report descriptor items (usb_hid_report_item_t) 986 980 * @return void 987 981 */ 988 void usb_hid_free_report_list(li nk_t *head)982 void usb_hid_free_report_list(list_t *list) 989 983 { 990 return; 991 992 usb_hid_report_item_t *report_item;984 return; /* XXX What's this? */ 985 986 /* usb_hid_report_item_t *report_item; 993 987 link_t *next; 994 988 995 if( head == NULL || list_empty(head)) {989 if(list == NULL || list_empty(list)) { 996 990 return; 997 991 } 998 992 999 next = head->next;1000 while (next !=head) {1001 1002 report_item = list_get_instance(next, usb_hid_report_item_t,link);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); 1003 997 1004 998 while(!list_empty(&report_item->usage_path->link)) { 1005 999 usb_hid_report_remove_last_item(report_item->usage_path); 1006 1000 } 1007 1001 … … 1013 1007 1014 1008 return; 1015 1009 */ 1016 1010 } 1017 1011 /*---------------------------------------------------------------------------*/ … … 1029 1023 1030 1024 // free collection paths 1025 link_t *path_link; 1031 1026 usb_hid_report_path_t *path; 1032 1027 while(!list_empty(&report->collection_paths)) { 1033 path = list_get_instance(report->collection_paths.next, 1034 usb_hid_report_path_t, link); 1035 1036 usb_hid_report_path_free(path); 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); 1037 1034 } 1038 1035 … … 1041 1038 usb_hid_report_field_t *field; 1042 1039 while(!list_empty(&report->reports)) { 1043 report_des = list_get_instance( report->reports.next,1044 usb_hid_report_description_t, link);1045 1046 list_remove(&report_des-> link);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); 1047 1044 1048 1045 while(!list_empty(&report_des->report_items)) { 1049 1046 field = list_get_instance( 1050 report_des->report_items.next,1051 usb_hid_report_field_t,link);1052 1053 list_remove(&field-> link);1047 list_first(&report_des->report_items), 1048 usb_hid_report_field_t, ritems_link); 1049 1050 list_remove(&field->ritems_link); 1054 1051 1055 1052 free(field);
Note:
See TracChangeset
for help on using the changeset viewer.