Changes in / [ba17f5b:6c6a95d2] in mainline
- Location:
- uspace/lib/usb
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/include/usb/classes/hiddescriptor.h
rba17f5b r6c6a95d2 78 78 uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size); 79 79 80 usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path);81 80 #endif 82 81 /** -
uspace/lib/usb/include/usb/classes/hidpath.h
rba17f5b r6c6a95d2 43 43 * Description of path of usage pages and usages in report descriptor 44 44 */ 45 /** Wanted usage path must be exactly the same as the searched one */ 46 #define USB_HID_PATH_COMPARE_STRICT 0 47 /** Wanted usage path must be the suffix in the searched one */ 48 #define USB_HID_PATH_COMPARE_END 1 49 /** */ 50 #define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 2 51 /** Searched usage page must be prefix of the other one */ 52 #define USB_HID_PATH_COMPARE_BEGIN 4 53 /** Searched couple of usage page and usage can be anywhere in usage path */ 54 #define USB_HID_PATH_COMPARE_ANYWHERE 8 45 #define USB_HID_PATH_COMPARE_STRICT 0 46 #define USB_HID_PATH_COMPARE_END 1 47 #define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 4 48 #define USB_HID_PATH_COMPARE_COLLECTION_ONLY 2 /* porovnava jenom cestu z Kolekci */ 55 49 56 50 -
uspace/lib/usb/include/usb/classes/hidtypes.h
rba17f5b r6c6a95d2 165 165 /** */ 166 166 link_t link; 167 168 int in_delimiter;169 167 } usb_hid_report_item_t; 170 168 -
uspace/lib/usb/src/hiddescriptor.c
rba17f5b r6c6a95d2 41 41 #include <assert.h> 42 42 43 44 #define OUTSIDE_DELIMITER_SET 045 #define START_DELIMITER_SET 146 #define INSIDE_DELIMITER_SET 247 48 43 /** The new report item flag. Used to determine when the item is completly 49 44 * configured and should be added to the report structure … … 61 56 #define USB_HID_UNKNOWN_TAG -99 62 57 63 usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path) 64 { 58 59 /** 60 * Initialize the report descriptor parser structure 61 * 62 * @param parser Report descriptor parser structure 63 * @return Error code 64 */ 65 int usb_hid_report_init(usb_hid_report_t *report) 66 { 67 if(report == NULL) { 68 return EINVAL; 69 } 70 71 memset(report, 0, sizeof(usb_hid_report_t)); 72 list_initialize(&report->reports); 73 list_initialize(&report->collection_paths); 74 75 report->use_report_ids = 0; 76 return EOK; 77 } 78 79 int usb_hid_report_append_fields(usb_hid_report_t *report, usb_hid_report_item_t *report_item) 80 { 81 usb_hid_report_field_t *field; 82 int i; 83 84 65 85 /* find or append current collection path to the list */ 66 86 link_t *path_it = report->collection_paths.next; … … 69 89 path = list_get_instance(path_it, usb_hid_report_path_t, link); 70 90 71 if(usb_hid_report_compare_usage_path(path, cmp_path, USB_HID_PATH_COMPARE_STRICT) == EOK){91 if(usb_hid_report_compare_usage_path(path, report_item->usage_path, USB_HID_PATH_COMPARE_STRICT) == EOK){ 72 92 break; 73 93 } … … 75 95 } 76 96 if(path_it == &report->collection_paths) { 77 path = usb_hid_report_path_clone( cmp_path);97 path = usb_hid_report_path_clone(report_item->usage_path); 78 98 list_append(&path->link, &report->collection_paths); 79 99 report->collection_paths_count++; 80 81 return path; 82 } 83 else { 84 return list_get_instance(path_it, usb_hid_report_path_t, link); 85 } 86 } 87 88 /** 89 * Initialize the report descriptor parser structure 90 * 91 * @param parser Report descriptor parser structure 92 * @return Error code 93 */ 94 int usb_hid_report_init(usb_hid_report_t *report) 95 { 96 if(report == NULL) { 97 return EINVAL; 98 } 99 100 memset(report, 0, sizeof(usb_hid_report_t)); 101 list_initialize(&report->reports); 102 list_initialize(&report->collection_paths); 103 104 report->use_report_ids = 0; 105 return EOK; 106 } 107 108 109 /* 110 * 111 * 112 */ 113 int usb_hid_report_append_fields(usb_hid_report_t *report, usb_hid_report_item_t *report_item) 114 { 115 usb_hid_report_field_t *field; 116 int i; 100 } 117 101 118 102 for(i=0; i<report_item->usages_count; i++){ … … 120 104 } 121 105 122 usb_hid_report_path_t *path = report_item->usage_path;106 123 107 for(i=0; i<report_item->count; i++){ 124 108 … … 128 112 129 113 /* fill the attributes */ 114 field->collection_path = path; 130 115 field->logical_minimum = report_item->logical_minimum; 131 116 field->logical_maximum = report_item->logical_maximum; … … 144 129 if(report_item->usages_count > 0 && ((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0))) { 145 130 uint32_t usage; 146 if(i < report_item->usages_count){ 147 usage = report_item->usages[i]; 131 if(report_item->type != USB_HID_REPORT_TYPE_OUTPUT) { 132 if(i < report_item->usages_count){ 133 usage = report_item->usages[i]; 134 } 135 else { 136 usage = report_item->usages[report_item->usages_count - 1]; 137 } 148 138 } 149 139 else { 150 usage = report_item->usages[report_item->usages_count - 1]; 140 if((report_item->count - i - 1) < report_item->usages_count){ 141 usage = report_item->usages[(report_item->count - i - 1)]; 142 } 143 else { 144 usage = report_item->usages[report_item->usages_count - 1]; 145 } 151 146 } 152 147 … … 164 159 165 160 if((USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) != 0) && (!((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0)))) { 166 field->usage = report_item->usage_minimum + i; 167 } 168 169 usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_GLOBAL, field->usage_page); 170 usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_LOCAL, field->usage); 171 172 field->collection_path = usb_hid_report_path_try_insert(report, path); 173 161 if(report_item->type == USB_HID_REPORT_TYPE_INPUT) { 162 field->usage = report_item->usage_maximum - i; 163 } 164 else { 165 field->usage = report_item->usage_minimum + i; 166 } 167 168 } 169 174 170 field->size = report_item->size; 175 176 size_t offset_byte = (report_item->offset + (i * report_item->size)) / 8; 177 size_t offset_bit = 8 - ((report_item->offset + (i * report_item->size)) % 8) - report_item->size; 178 179 field->offset = 8 * offset_byte + offset_bit; 171 field->offset = report_item->offset + (i * report_item->size); 180 172 if(report_item->id != 0) { 181 173 field->offset += 8; … … 272 264 return ENOMEM; 273 265 } 274 usb_hid_report_path_append_item(usage_path, 0, 0);275 266 276 267 while(i<size){ … … 358 349 tmp_usage_path = list_get_instance(report_item->usage_path->link.prev, usb_hid_report_usage_path_t, link); 359 350 360 usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_GLOBAL, tmp_usage_path->usage_page); 361 usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_LOCAL, tmp_usage_path->usage); 351 usb_hid_report_set_last_item(usage_path, tmp_usage_path->usage_page, tmp_usage_path->usage); 362 352 363 353 usb_hid_report_path_free(report_item->usage_path); … … 437 427 int usb_hid_report_parse_main_tag(uint8_t tag, const uint8_t *data, size_t item_size, 438 428 usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path) 439 { 440 usb_hid_report_usage_path_t *path_item; 441 429 { 442 430 switch(tag) 443 431 { … … 450 438 451 439 case USB_HID_REPORT_TAG_COLLECTION: 452 // store collection atributes 453 path_item = list_get_instance(usage_path->head.prev, usb_hid_report_usage_path_t, link); 454 path_item->flags = *data; 455 456 // set last item 457 usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_GLOBAL, report_item->usage_page); 458 usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_LOCAL, report_item->usages[report_item->usages_count-1]); 459 460 // append the new one which will be set by common 461 // usage/usage page 462 usb_hid_report_path_append_item(usage_path, report_item->usage_page, report_item->usages[report_item->usages_count-1]); 440 // TODO usage_path->flags = *data; 441 usb_hid_report_path_append_item(usage_path, report_item->usage_page, report_item->usages[report_item->usages_count-1]); 463 442 usb_hid_report_reset_local_items (report_item); 464 443 return USB_HID_NO_ACTION; … … 551 530 usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path) 552 531 { 553 switch(tag) { 532 switch(tag) 533 { 554 534 case USB_HID_REPORT_TAG_USAGE: 555 switch(report_item->in_delimiter) { 556 case INSIDE_DELIMITER_SET: 557 // nothing to do 558 break; 559 case START_DELIMITER_SET: 560 report_item->in_delimiter = INSIDE_DELIMITER_SET; 561 case OUTSIDE_DELIMITER_SET: 562 report_item->usages[report_item->usages_count] = usb_hid_report_tag_data_uint32(data,item_size); 563 report_item->usages_count++; 564 break; 565 } 535 report_item->usages[report_item->usages_count] = usb_hid_report_tag_data_uint32(data,item_size); 536 report_item->usages_count++; 566 537 break; 567 538 case USB_HID_REPORT_TAG_USAGE_MINIMUM: … … 604 575 break; 605 576 case USB_HID_REPORT_TAG_DELIMITER: 606 report_item->in_delimiter = usb_hid_report_tag_data_uint32(data,item_size); 607 break; 608 577 //report_item->delimiter = usb_hid_report_tag_data_uint32(data,item_size); 578 //TODO: 579 // DELIMITER STUFF 580 break; 581 609 582 default: 610 583 return USB_HID_NO_ACTION; 611 584 } 612 585 613 586 return EOK; 614 587 } … … 656 629 657 630 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset); 658 usb_log_debug("\t\tSIZE: % X\n", report_item->size);631 usb_log_debug("\t\tSIZE: %zu\n", report_item->size); 659 632 usb_log_debug("\t\tLOGMIN: %d\n", report_item->logical_minimum); 660 633 usb_log_debug("\t\tLOGMAX: %d\n", report_item->logical_maximum); … … 667 640 usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage); 668 641 usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page); 669 670 //usb_hid_print_usage_path(report_item->collection_path); 671 672 usb_log_debug("\n"); 642 643 // usb_log_debug("\n"); 673 644 674 645 } … … 695 666 usb_log_debug("Report ID: %d\n", report_des->report_id); 696 667 usb_log_debug("\tType: %d\n", report_des->type); 697 usb_log_debug("\tLength: % d\n", report_des->bit_length);698 usb_log_debug("\tItems: % d\n", report_des->item_length);668 usb_log_debug("\tLength: %zu\n", report_des->bit_length); 669 usb_log_debug("\tItems: %zu\n", report_des->item_length); 699 670 700 671 usb_hid_descriptor_print_list(&report_des->report_items); -
uspace/lib/usb/src/hidparser.c
rba17f5b r6c6a95d2 405 405 } 406 406 407 size_t shift = 8 - offset%8 - length;407 size_t shift = offset%8; 408 408 409 409 value = value << shift; -
uspace/lib/usb/src/hidpath.c
rba17f5b r6c6a95d2 149 149 usb_log_debug("\tFLAGS: %d\n", path_item->flags); 150 150 151 151 item = item->next; 152 152 } 153 153 } … … 156 156 * Compares two usage paths structures 157 157 * 158 * 159 * @param report_path usage path structure to compare with @path 158 * If USB_HID_PATH_COMPARE_COLLECTION_ONLY flag is given, the last item in report_path structure is forgotten 159 * 160 * @param report_path usage path structure to compare 160 161 * @param path usage patrh structure to compare 161 162 * @param flags Flags determining the mode of comparison … … 178 179 } 179 180 180 // Empty path match all others181 181 if(path->depth == 0){ 182 182 return EOK; … … 189 189 190 190 switch(flags){ 191 /* path is somewhere in report_path */ 192 case USB_HID_PATH_COMPARE_ANYWHERE: 193 if(path->depth != 1){ 194 return 1; 195 } 196 197 // projit skrz cestu a kdyz nekde sedi tak vratim EOK 198 // dojduli az za konec tak nnesedi 199 report_link = report_path->head.next; 200 path_link = path->head.next; 201 path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link); 202 203 while(report_link != &report_path->head) { 204 report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link); 205 if(report_item->usage_page == path_item->usage_page){ 206 if(only_page == 0){ 207 if(report_item->usage == path_item->usage) { 208 return EOK; 209 } 210 } 211 else { 212 return EOK; 213 } 214 } 215 216 report_link = report_link->next; 217 } 218 219 return 1; 220 break; 221 /* the paths must be identical */ 191 /* path must be completly identical */ 222 192 case USB_HID_PATH_COMPARE_STRICT: 223 193 if(report_path->depth != path->depth){ 224 194 return 1; 225 195 } 226 227 /* path is prefix of the report_path */ 228 case USB_HID_PATH_COMPARE_BEGIN: 229 196 230 197 report_link = report_path->head.next; 231 198 path_link = path->head.next; … … 254 221 } 255 222 256 if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && (path_link == &path->head)) || 257 ((report_link == &report_path->head) && (path_link == &path->head))) { 223 if(((report_link == &report_path->head) && (path_link == &path->head)) || 224 (((flags & USB_HID_PATH_COMPARE_COLLECTION_ONLY) != 0) && 225 (path_link = &path->head) && 226 (report_link == report_path->head.prev))) { 258 227 return EOK; 259 228 } … … 263 232 break; 264 233 265 /* path is suffix of report_path*/234 /* compare with only the end of path*/ 266 235 case USB_HID_PATH_COMPARE_END: 267 236 268 report_link = report_path->head.prev; 237 if((flags & USB_HID_PATH_COMPARE_COLLECTION_ONLY) != 0) { 238 report_link = report_path->head.prev->prev; 239 } 240 else { 241 report_link = report_path->head.prev; 242 } 269 243 path_link = path->head.prev; 270 244
Note:
See TracChangeset
for help on using the changeset viewer.