Changes in uspace/lib/usb/src/hidparser.c [ef354b6:1cbb4b7] in mainline
- File:
-
- 1 edited
-
uspace/lib/usb/src/hidparser.c (modified) (54 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/src/hidparser.c
ref354b6 r1cbb4b7 39 39 #include <mem.h> 40 40 #include <usb/debug.h> 41 #include <assert.h> 42 43 /** The new report item flag. Used to determine when the item is completly 44 * configured and should be added to the report structure 45 */ 41 42 /** */ 46 43 #define USB_HID_NEW_REPORT_ITEM 1 47 44 48 /** No special action after the report descriptor tag is processed should be 49 * done 50 */ 51 #define USB_HID_NO_ACTION 2 52 53 #define USB_HID_RESET_OFFSET 3 54 55 /** Unknown tag was founded in report descriptor data*/ 45 /** */ 46 #define USB_HID_NO_ACTION 2 47 48 /** */ 56 49 #define USB_HID_UNKNOWN_TAG -99 57 50 … … 59 52 * Private descriptor parser functions 60 53 */ 61 int usb_hid_report_init(usb_hid_report_t *report);62 int usb_hid_report_append_fields(usb_hid_report_t *report, usb_hid_report_item_t *report_item);63 usb_hid_report_description_t * usb_hid_report_find_description(const usb_hid_report_t *report, uint8_t report_id, usb_hid_report_type_t type);64 54 int usb_hid_report_parse_tag(uint8_t tag, uint8_t class, const uint8_t *data, size_t item_size, 65 55 usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); … … 71 61 usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); 72 62 73 void usb_hid_print_usage_path(usb_hid_report_path_t *path);74 63 void usb_hid_descriptor_print_list(link_t *head); 75 64 int usb_hid_report_reset_local_items(); … … 81 70 int32_t usb_hid_report_tag_data_int32(const uint8_t *data, size_t size); 82 71 inline size_t usb_hid_count_item_offset(usb_hid_report_item_t * report_item, size_t offset); 83 int usb_hid_translate_data(usb_hid_report_ field_t *item, const uint8_t *data, size_t j);84 uint32_t usb_hid_translate_data_reverse(usb_hid_report_field_t *item, int32_t value);72 int usb_hid_translate_data(usb_hid_report_item_t *item, const uint8_t *data, size_t j); 73 int32_t usb_hid_translate_data_reverse(usb_hid_report_item_t *item, int32_t value); 85 74 int usb_pow(int a, int b); 86 75 … … 107 96 * @return Error code 108 97 */ 109 int usb_hid_ report_init(usb_hid_report_t *report)110 { 111 if( report== NULL) {98 int usb_hid_parser_init(usb_hid_report_parser_t *parser) 99 { 100 if(parser == NULL) { 112 101 return EINVAL; 113 102 } 114 103 115 memset(report, 0, sizeof(usb_hid_report_t)); 116 list_initialize(&report->reports); 117 list_initialize(&report->collection_paths); 118 119 report->use_report_ids = 0; 104 list_initialize(&(parser->input)); 105 list_initialize(&(parser->output)); 106 list_initialize(&(parser->feature)); 107 108 list_initialize(&(parser->stack)); 109 110 parser->use_report_id = 0; 120 111 return EOK; 121 112 } 122 113 123 int usb_hid_report_append_fields(usb_hid_report_t *report, usb_hid_report_item_t *report_item)124 {125 usb_hid_report_field_t *field;126 int i;127 128 129 /* find or append current collection path to the list */130 link_t *path_it = report->collection_paths.next;131 usb_hid_report_path_t *path = NULL;132 while(path_it != &report->collection_paths) {133 path = list_get_instance(path_it, usb_hid_report_path_t, link);134 135 if(usb_hid_report_compare_usage_path(path, report_item->usage_path, USB_HID_PATH_COMPARE_STRICT) == EOK){136 break;137 }138 path_it = path_it->next;139 }140 if(path_it == &report->collection_paths) {141 path = usb_hid_report_path_clone(report_item->usage_path);142 list_append(&path->link, &report->collection_paths);143 report->collection_paths_count++;144 }145 146 147 for(i=0; i<report_item->count; i++){148 149 field = malloc(sizeof(usb_hid_report_field_t));150 memset(field, 0, sizeof(usb_hid_report_field_t));151 list_initialize(&field->link);152 153 /* fill the attributes */154 field->collection_path = path;155 field->logical_minimum = report_item->logical_minimum;156 field->logical_maximum = report_item->logical_maximum;157 field->physical_minimum = report_item->physical_minimum;158 field->physical_maximum = report_item->physical_maximum;159 field->usage_minimum = report_item->usage_minimum;160 field->usage_maximum = report_item->usage_maximum;161 if(report_item->extended_usage_page != 0){162 field->usage_page = report_item->extended_usage_page;163 }164 else {165 field->usage_page = report_item->usage_page;166 }167 168 if(report_item->usages_count > 0 && ((report_item->usage_minimum = 0) && (report_item->usage_maximum = 0))) {169 if(i < report_item->usages_count){170 if((report_item->usages[i] & 0xFF00) > 0){171 field->usage_page = (report_item->usages[i] >> 16);172 field->usage = (report_item->usages[i] & 0xFF);173 }174 else {175 field->usage = report_item->usages[i];176 }177 }178 else {179 field->usage = report_item->usages[report_item->usages_count - 1];180 }181 }182 183 field->size = report_item->size;184 field->offset = report_item->offset + (i * report_item->size);185 if(report_item->id != 0) {186 field->offset += 8;187 report->use_report_ids = 1;188 }189 field->item_flags = report_item->item_flags;190 191 /* find the right report list*/192 usb_hid_report_description_t *report_des;193 report_des = usb_hid_report_find_description(report, report_item->id, report_item->type);194 if(report_des == NULL){195 report_des = malloc(sizeof(usb_hid_report_description_t));196 memset(report_des, 0, sizeof(usb_hid_report_description_t));197 198 report_des->type = report_item->type;199 report_des->report_id = report_item->id;200 list_initialize (&report_des->link);201 list_initialize (&report_des->report_items);202 203 list_append(&report_des->link, &report->reports);204 report->report_count++;205 }206 207 /* append this field to the end of founded report list */208 list_append (&field->link, &report_des->report_items);209 210 /* update the sizes */211 report_des->bit_length += field->size;212 report_des->item_length++;213 214 }215 216 217 return EOK;218 }219 220 usb_hid_report_description_t * usb_hid_report_find_description(const usb_hid_report_t *report, uint8_t report_id, usb_hid_report_type_t type)221 {222 link_t *report_it = report->reports.next;223 usb_hid_report_description_t *report_des = NULL;224 225 while(report_it != &report->reports) {226 report_des = list_get_instance(report_it, usb_hid_report_description_t, link);227 228 if((report_des->report_id == report_id) && (report_des->type == type)){229 return report_des;230 }231 232 report_it = report_it->next;233 }234 235 return NULL;236 }237 114 238 115 /** Parse HID report descriptor. … … 242 119 * @return Error code. 243 120 */ 244 int usb_hid_parse_report_descriptor(usb_hid_report_ t *report,121 int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, 245 122 const uint8_t *data, size_t size) 246 123 { … … 253 130 usb_hid_report_item_t *new_report_item; 254 131 usb_hid_report_path_t *usage_path; 132 usb_hid_report_path_t *tmp_usage_path; 255 133 256 134 size_t offset_input=0; 257 135 size_t offset_output=0; 258 136 size_t offset_feature=0; 259 260 link_t stack; 261 list_initialize(&stack); 137 262 138 263 139 /* parser structure initialization*/ 264 if(usb_hid_ report_init(report) != EOK) {140 if(usb_hid_parser_init(parser) != EOK) { 265 141 return EINVAL; 266 142 } 267 143 144 268 145 /*report item initialization*/ 269 146 if(!(report_item=malloc(sizeof(usb_hid_report_item_t)))){ … … 282 159 283 160 if((i+USB_HID_ITEM_SIZE(data[i]))>= size){ 284 return EINVAL; 161 return EINVAL; // TODO ERROR CODE 285 162 } 286 163 … … 288 165 item_size = USB_HID_ITEM_SIZE(data[i]); 289 166 class = USB_HID_ITEM_TAG_CLASS(data[i]); 167 168 usb_log_debug2( 169 "i(%u) data(%X) value(%X): TAG %u, class %u, size %u - ", i, 170 data[i], usb_hid_report_tag_data_int32(data+i+1,item_size), 171 tag, class, item_size); 290 172 291 173 ret = usb_hid_report_parse_tag(tag,class,data+i+1, 292 174 item_size,report_item, usage_path); 175 usb_log_debug2("ret: %u\n", ret); 293 176 switch(ret){ 294 177 case USB_HID_NEW_REPORT_ITEM: 295 178 // store report item to report and create the new one 296 // store current collection path 179 usb_log_debug("\nNEW REPORT ITEM: %X",ret); 180 181 // store current usage path 297 182 report_item->usage_path = usage_path; 298 183 184 // clone path to the new one 185 tmp_usage_path = usb_hid_report_path_clone(usage_path); 186 187 // swap 188 usage_path = tmp_usage_path; 189 tmp_usage_path = NULL; 190 299 191 usb_hid_report_path_set_report_id(report_item->usage_path, report_item->id); 300 192 if(report_item->id != 0){ 301 report->use_report_ids= 1;193 parser->use_report_id = 1; 302 194 } 303 195 304 196 switch(tag) { 305 197 case USB_HID_REPORT_TAG_INPUT: 306 report_item->type = USB_HID_REPORT_TYPE_INPUT;307 198 report_item->offset = offset_input; 308 199 offset_input += report_item->count * report_item->size; 200 usb_log_debug(" - INPUT\n"); 201 list_append(&(report_item->link), &(parser->input)); 309 202 break; 310 203 case USB_HID_REPORT_TAG_OUTPUT: 311 report_item->type = USB_HID_REPORT_TYPE_OUTPUT;312 204 report_item->offset = offset_output; 313 205 offset_output += report_item->count * report_item->size; 206 usb_log_debug(" - OUTPUT\n"); 207 list_append(&(report_item->link), &(parser->output)); 314 208 315 209 break; 316 210 case USB_HID_REPORT_TAG_FEATURE: 317 report_item->type = USB_HID_REPORT_TYPE_FEATURE;318 211 report_item->offset = offset_feature; 319 212 offset_feature += report_item->count * report_item->size; 213 usb_log_debug(" - FEATURE\n"); 214 list_append(&(report_item->link), &(parser->feature)); 320 215 break; 321 216 default: … … 323 218 break; 324 219 } 220 221 /* clone current state table to the new item */ 222 if(!(new_report_item = malloc(sizeof(usb_hid_report_item_t)))) { 223 return ENOMEM; 224 } 225 memcpy(new_report_item,report_item, sizeof(usb_hid_report_item_t)); 226 link_initialize(&(new_report_item->link)); 325 227 326 /*327 * append new fields to the report328 * structure329 */330 usb_hid_report_append_fields(report, report_item);331 332 228 /* reset local items */ 333 while(report_item->usages_count > 0){ 334 report_item->usages[--(report_item->usages_count)] = 0; 335 } 336 337 report_item->extended_usage_page = 0; 338 report_item->usage_minimum = 0; 339 report_item->usage_maximum = 0; 340 report_item->designator_index = 0; 341 report_item->designator_minimum = 0; 342 report_item->designator_maximum = 0; 343 report_item->string_index = 0; 344 report_item->string_minimum = 0; 345 report_item->string_maximum = 0; 346 229 new_report_item->usage_minimum = 0; 230 new_report_item->usage_maximum = 0; 231 new_report_item->designator_index = 0; 232 new_report_item->designator_minimum = 0; 233 new_report_item->designator_maximum = 0; 234 new_report_item->string_index = 0; 235 new_report_item->string_minimum = 0; 236 new_report_item->string_maximum = 0; 237 238 /* reset usage from current usage path */ 239 usb_hid_report_usage_path_t *path = list_get_instance(&usage_path->link, usb_hid_report_usage_path_t, link); 240 path->usage = 0; 241 242 report_item = new_report_item; 243 347 244 break; 348 349 case USB_HID_RESET_OFFSET:350 offset_input = 0;351 offset_output = 0;352 offset_feature = 0;353 break;354 355 245 case USB_HID_REPORT_TAG_PUSH: 356 246 // push current state to stack 357 247 new_report_item = usb_hid_report_item_clone(report_item); 358 usb_hid_report_path_t *tmp_path = usb_hid_report_path_clone(usage_path); 359 new_report_item->usage_path = tmp_path; 360 361 list_prepend (&new_report_item->link, &stack); 248 list_prepend (&parser->stack, &new_report_item->link); 249 362 250 break; 363 251 case USB_HID_REPORT_TAG_POP: 364 252 // restore current state from stack 365 if(list_empty (& stack)) {253 if(list_empty (&parser->stack)) { 366 254 return EINVAL; 367 255 } 368 free(report_item);369 370 report_item = list_get_instance(stack.next, usb_hid_report_item_t, link);371 256 372 usb_hid_report_usage_path_t *tmp_usage_path; 373 tmp_usage_path = list_get_instance(report_item->usage_path->link.prev, usb_hid_report_usage_path_t, link); 374 375 usb_hid_report_set_last_item(usage_path, tmp_usage_path->usage_page, tmp_usage_path->usage); 376 377 usb_hid_report_path_free(report_item->usage_path); 378 list_initialize(&report_item->usage_path->link); 379 list_remove (stack.next); 257 report_item = list_get_instance(&parser->stack, usb_hid_report_item_t, link); 258 list_remove (parser->stack.next); 380 259 381 260 break; … … 400 279 } 401 280 281 282 /** 283 * Parse input report. 284 * 285 * @param data Data for report 286 * @param size Size of report 287 * @param callbacks Callbacks for report actions 288 * @param arg Custom arguments 289 * 290 * @return Error code 291 */ 292 int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size, 293 const usb_hid_report_in_callbacks_t *callbacks, void *arg) 294 { 295 int i; 296 usb_hid_report_item_t item; 297 298 /* fill item due to the boot protocol report descriptor */ 299 // modifier keys are in the first byte 300 uint8_t modifiers = data[0]; 301 302 item.offset = 2; /* second byte is reserved */ 303 item.size = 8; 304 item.count = 6; 305 item.usage_minimum = 0; 306 item.usage_maximum = 255; 307 item.logical_minimum = 0; 308 item.logical_maximum = 255; 309 310 if (size != 8) { 311 return -1; //ERANGE; 312 } 313 314 uint8_t keys[6]; 315 for (i = 0; i < item.count; i++) { 316 keys[i] = data[i + item.offset]; 317 } 318 319 callbacks->keyboard(keys, 6, modifiers, arg); 320 return EOK; 321 } 322 323 /** 324 * Makes output report for keyboard boot protocol 325 * 326 * @param leds 327 * @param output Output report data buffer 328 * @param size Size of the output buffer 329 * @return Error code 330 */ 331 int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size) 332 { 333 if(size != 1){ 334 return -1; 335 } 336 337 /* used only first five bits, others are only padding*/ 338 *data = leds; 339 return EOK; 340 } 402 341 403 342 /** … … 462 401 463 402 case USB_HID_REPORT_TAG_COLLECTION: 464 // TODO usage_path->flags = *data;465 usb_hid_report_path_append_item(usage_path, report_item->usage_page, report_item->usages[report_item->usages_count-1]);403 usb_hid_report_path_append_item(usage_path, 0, 0); 404 466 405 return USB_HID_NO_ACTION; 467 406 break; 468 407 469 408 case USB_HID_REPORT_TAG_END_COLLECTION: 409 // TODO 410 // znici posledni uroven ve vsech usage paths 411 // otazka jestli nema nicit dve, respektive novou posledni vynulovat? 470 412 usb_hid_report_remove_last_item(usage_path); 471 413 return USB_HID_NO_ACTION; … … 494 436 { 495 437 case USB_HID_REPORT_TAG_USAGE_PAGE: 496 report_item->usage_page = usb_hid_report_tag_data_int32(data, item_size); 438 // zmeni to jenom v poslednim poli aktualni usage path 439 usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_GLOBAL, 440 usb_hid_report_tag_data_int32(data,item_size)); 497 441 break; 498 442 case USB_HID_REPORT_TAG_LOGICAL_MINIMUM: … … 522 466 case USB_HID_REPORT_TAG_REPORT_ID: 523 467 report_item->id = usb_hid_report_tag_data_int32(data,item_size); 524 return USB_HID_RESET_OFFSET;525 468 break; 526 469 case USB_HID_REPORT_TAG_PUSH: 527 470 case USB_HID_REPORT_TAG_POP: 528 /*529 * stack operations are done in top level parsing530 * function531 */532 471 return tag; 533 472 break; … … 555 494 { 556 495 case USB_HID_REPORT_TAG_USAGE: 557 report_item->usages[report_item->usages_count++] = usb_hid_report_tag_data_int32(data,item_size); 496 usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_LOCAL, 497 usb_hid_report_tag_data_int32(data,item_size)); 558 498 break; 559 499 case USB_HID_REPORT_TAG_USAGE_MINIMUM: 560 if (item_size == 3) { 561 // usage extended usages 562 report_item->extended_usage_page = (usb_hid_report_tag_data_int32(data,item_size) & 0xFF00) >> 16; 563 report_item->usage_minimum = usb_hid_report_tag_data_int32(data,item_size) & 0xFF; 564 } 565 else { 566 report_item->usage_minimum = usb_hid_report_tag_data_int32(data,item_size); 567 } 500 report_item->usage_minimum = usb_hid_report_tag_data_int32(data,item_size); 568 501 break; 569 502 case USB_HID_REPORT_TAG_USAGE_MAXIMUM: 570 if (item_size == 3) { 571 // usage extended usages 572 report_item->extended_usage_page = (usb_hid_report_tag_data_int32(data,item_size) & 0xFF00) >> 16; 573 report_item->usage_maximum = usb_hid_report_tag_data_int32(data,item_size) & 0xFF; 574 } 575 else { 576 report_item->usage_maximum = usb_hid_report_tag_data_int32(data,item_size); 577 } 503 report_item->usage_maximum = usb_hid_report_tag_data_int32(data,item_size); 578 504 break; 579 505 case USB_HID_REPORT_TAG_DESIGNATOR_INDEX: … … 596 522 break; 597 523 case USB_HID_REPORT_TAG_DELIMITER: 598 //report_item->delimiter = usb_hid_report_tag_data_int32(data,item_size); 599 //TODO: 600 // DELIMITER STUFF 524 report_item->delimiter = usb_hid_report_tag_data_int32(data,item_size); 601 525 break; 602 526 … … 638 562 void usb_hid_descriptor_print_list(link_t *head) 639 563 { 640 usb_hid_report_field_t *report_item; 564 usb_hid_report_item_t *report_item; 565 usb_hid_report_usage_path_t *path_item; 566 link_t *path; 641 567 link_t *item; 642 643 568 644 569 if(head == NULL || list_empty(head)) { 645 570 usb_log_debug("\tempty\n"); … … 649 574 for(item = head->next; item != head; item = item->next) { 650 575 651 report_item = list_get_instance(item, usb_hid_report_field_t, link); 652 653 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset); 654 usb_log_debug("\t\tSIZE: %X\n", report_item->size); 655 usb_log_debug("\t\tLOGMIN: %X\n", report_item->logical_minimum); 656 usb_log_debug("\t\tLOGMAX: %X\n", report_item->logical_maximum); 657 usb_log_debug("\t\tPHYMIN: %X\n", report_item->physical_minimum); 658 usb_log_debug("\t\tPHYMAX: %X\n", report_item->physical_maximum); 659 usb_log_debug("\t\ttUSAGEMIN: %X\n", report_item->usage_minimum); 660 usb_log_debug("\t\tUSAGEMAX: %X\n", report_item->usage_maximum); 661 662 usb_log_debug("\t\tVALUE: %X\n", report_item->value); 663 usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage); 664 usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page); 665 666 // usb_log_debug("\n"); 576 report_item = list_get_instance(item, usb_hid_report_item_t, link); 577 578 usb_log_debug("\tOFFSET: %X\n", report_item->offset); 579 usb_log_debug("\tCOUNT: %X\n", report_item->count); 580 usb_log_debug("\tSIZE: %X\n", report_item->size); 581 usb_log_debug("\tCONSTANT/VAR: %X\n", USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags)); 582 usb_log_debug("\tVARIABLE/ARRAY: %X\n", USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags)); 583 usb_log_debug("\tUSAGE PATH:\n"); 584 585 path = report_item->usage_path->link.next; 586 while(path != &report_item->usage_path->link) { 587 path_item = list_get_instance(path, usb_hid_report_usage_path_t, link); 588 usb_log_debug("\t\tUSAGE PAGE: %X, USAGE: %X\n", path_item->usage_page, path_item->usage); 589 path = path->next; 590 } 591 592 usb_log_debug("\tLOGMIN: %X\n", report_item->logical_minimum); 593 usb_log_debug("\tLOGMAX: %X\n", report_item->logical_maximum); 594 usb_log_debug("\tPHYMIN: %X\n", report_item->physical_minimum); 595 usb_log_debug("\tPHYMAX: %X\n", report_item->physical_maximum); 596 usb_log_debug("\tUSAGEMIN: %X\n", report_item->usage_minimum); 597 usb_log_debug("\tUSAGEMAX: %X\n", report_item->usage_maximum); 598 599 usb_log_debug("\n"); 667 600 668 601 } … … 676 609 * @return void 677 610 */ 678 void usb_hid_descriptor_print(usb_hid_report_ t *report)679 { 680 if( report== NULL) {611 void usb_hid_descriptor_print(usb_hid_report_parser_t *parser) 612 { 613 if(parser == NULL) { 681 614 return; 682 615 } 683 684 link_t *report_it = report->reports.next; 685 usb_hid_report_description_t *report_des; 686 687 while(report_it != &report->reports) { 688 report_des = list_get_instance(report_it, usb_hid_report_description_t, link); 689 usb_log_debug("Report ID: %d\n", report_des->report_id); 690 usb_log_debug("\tType: %d\n", report_des->type); 691 usb_log_debug("\tLength: %d\n", report_des->bit_length); 692 usb_log_debug("\tItems: %d\n", report_des->item_length); 693 694 usb_hid_descriptor_print_list(&report_des->report_items); 695 696 697 link_t *path_it = report->collection_paths.next; 698 while(path_it != &report->collection_paths) { 699 usb_hid_print_usage_path (list_get_instance(path_it, usb_hid_report_path_t, link)); 700 path_it = path_it->next; 701 } 702 703 report_it = report_it->next; 704 } 616 617 usb_log_debug("INPUT:\n"); 618 usb_hid_descriptor_print_list(&parser->input); 619 620 usb_log_debug("OUTPUT: \n"); 621 usb_hid_descriptor_print_list(&parser->output); 622 623 usb_log_debug("FEATURE:\n"); 624 usb_hid_descriptor_print_list(&parser->feature); 625 705 626 } 706 627 … … 746 667 * @return void 747 668 */ 748 void usb_hid_free_report (usb_hid_report_t *report)749 { 750 if( report== NULL){669 void usb_hid_free_report_parser(usb_hid_report_parser_t *parser) 670 { 671 if(parser == NULL){ 751 672 return; 752 673 } 753 674 754 // free collection paths 755 usb_hid_report_path_t *path; 756 while(!list_empty(&report->collection_paths)) { 757 path = list_get_instance(report->collection_paths.next, usb_hid_report_path_t, link); 758 usb_hid_report_path_free(path); 759 } 760 761 // free report items 762 usb_hid_report_description_t *report_des; 763 usb_hid_report_field_t *field; 764 while(!list_empty(&report->reports)) { 765 report_des = list_get_instance(report->reports.next, usb_hid_report_description_t, link); 766 list_remove(&report_des->link); 767 768 while(!list_empty(&report_des->report_items)) { 769 field = list_get_instance(report_des->report_items.next, usb_hid_report_field_t, link); 770 list_remove(&field->link); 771 772 free(field); 773 } 774 775 free(report_des); 776 } 777 675 parser->use_report_id = 0; 676 677 usb_hid_free_report_list(&parser->input); 678 usb_hid_free_report_list(&parser->output); 679 usb_hid_free_report_list(&parser->feature); 680 778 681 return; 779 682 } … … 785 688 * @param parser Opaque HID report parser structure. 786 689 * @param data Data for the report. 690 * @param callbacks Callbacks for report actions. 691 * @param arg Custom argument (passed through to the callbacks). 787 692 * @return Error code. 788 693 */ 789 int usb_hid_parse_report(const usb_hid_report_t *report, 790 const uint8_t *data, size_t size) 694 int usb_hid_parse_report(const usb_hid_report_parser_t *parser, 695 const uint8_t *data, size_t size, 696 usb_hid_report_path_t *path, int flags, 697 const usb_hid_report_in_callbacks_t *callbacks, void *arg) 791 698 { 792 699 link_t *list_item; 793 usb_hid_report_field_t *item; 794 700 usb_hid_report_item_t *item; 701 uint8_t *keys; 702 uint8_t item_value; 703 size_t key_count=0; 704 size_t i=0; 705 size_t j=0; 795 706 uint8_t report_id = 0; 796 usb_hid_report_description_t *report_des; 797 usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT; 798 799 if(report == NULL) { 707 708 if(parser == NULL) { 800 709 return EINVAL; 801 710 } 802 803 if(report->use_report_ids != 0) { 711 712 /* get the size of result array */ 713 key_count = usb_hid_report_input_length(parser, path, flags); 714 715 if(!(keys = malloc(sizeof(uint8_t) * key_count))){ 716 return ENOMEM; 717 } 718 719 if(parser->use_report_id != 0) { 804 720 report_id = data[0]; 805 } 806 807 report_des = usb_hid_report_find_description(report, report_id, type); 721 usb_hid_report_path_set_report_id(path, report_id); 722 } 808 723 809 724 /* read data */ 810 list_item = report_des->report_items.next; 811 while(list_item != &(report_des->report_items)) { 812 813 item = list_get_instance(list_item, usb_hid_report_field_t, link); 814 815 if(!USB_HID_ITEM_FLAG_CONSTANT(item->item_flags)) { 816 817 if((USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) || 818 ((item->usage_minimum == 0) && (item->usage_maximum == 0))) { 819 820 // variable item 821 item->value = usb_hid_translate_data(item, data,0); 822 823 // array item ??? 824 if(!((item->usage_minimum == 0) && (item->usage_maximum == 0))) { 825 item->usage = item->value + item->usage_minimum; 725 list_item = parser->input.next; 726 while(list_item != &(parser->input)) { 727 728 item = list_get_instance(list_item, usb_hid_report_item_t, link); 729 730 if(!USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) && 731 (usb_hid_report_compare_usage_path(item->usage_path, path, flags) == EOK)) { 732 for(j=0; j<(size_t)(item->count); j++) { 733 if((USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) || 734 ((item->usage_minimum == 0) && (item->usage_maximum == 0))) { 735 // variable item 736 keys[i++] = usb_hid_translate_data(item, data,j); 737 } 738 else { 739 // bitmapa 740 if((item_value = usb_hid_translate_data(item, data, j)) != 0) { 741 keys[i++] = (item->count - 1 - j) + item->usage_minimum; 742 } 743 else { 744 keys[i++] = 0; 745 } 826 746 } 827 747 } 828 else {829 // bitmapa830 // TODO: overit jestli vraci hodnoty podle phy min/max831 item->value = usb_hid_translate_data(item, data, 0);832 }833 748 } 834 749 list_item = list_item->next; 835 750 } 751 752 callbacks->keyboard(keys, key_count, report_id, arg); 836 753 754 free(keys); 837 755 return EOK; 838 756 … … 840 758 841 759 /** 842 * Translate data from the report as specified in report descriptor item760 * Translate data from the report as specified in report descriptor 843 761 * 844 762 * @param item Report descriptor item with definition of translation … … 847 765 * @return Translated data 848 766 */ 849 int usb_hid_translate_data(usb_hid_report_ field_t *item, const uint8_t *data, size_t j)767 int usb_hid_translate_data(usb_hid_report_item_t *item, const uint8_t *data, size_t j) 850 768 { 851 769 int resolution; … … 853 771 int part_size; 854 772 855 int32_t value =0;773 int32_t value; 856 774 int32_t mask; 857 775 const uint8_t *foo; 858 776 859 // now only shot tags are allowed777 // now only common numbers llowed 860 778 if(item->size > 32) { 861 779 return 0; … … 877 795 878 796 offset = item->offset + (j * item->size); 797 if(item->id != 0) { 798 offset += 8; 799 usb_log_debug("MOVED OFFSET BY 1Byte, REPORT_ID(%d)\n", item->id); 800 } 879 801 880 802 // FIXME 881 if((size_t)(offset/8) != (size_t)((offset+item->size-1)/8)) { 803 if((offset/8) != ((offset+item->size)/8)) { 804 usb_log_debug2("offset %d\n", offset); 882 805 883 806 part_size = ((offset+item->size)%8); 884 885 size_t i=0; 886 for(i=(size_t)(offset/8); i<=(size_t)(offset+item->size-1)/8; i++){ 887 if(i == (size_t)(offset/8)) { 888 // the higher one 889 foo = data + i; 890 mask = ((1 << (item->size-part_size))-1); 891 value = (*foo & mask) << part_size; 892 } 893 else if(i == ((offset+item->size-1)/8)){ 894 // the lower one 895 foo = data + i; 896 mask = ((1 << part_size)-1) << (8-part_size); 897 value += ((*foo & mask) >> (8-part_size)); 898 } 899 else { 900 value = value << 8; 901 value += *(data + 1); 902 } 903 } 807 usb_log_debug2("part size %d\n",part_size); 808 809 // the higher one 810 foo = data+(offset/8); 811 mask = ((1 << (item->size-part_size))-1); 812 value = (*foo & mask) << part_size; 813 814 usb_log_debug2("hfoo %x\n", *foo); 815 usb_log_debug2("hmaska %x\n", mask); 816 usb_log_debug2("hval %d\n", value); 817 818 // the lower one 819 foo = data+((offset+item->size)/8); 820 mask = ((1 << part_size)-1) << (8-part_size); 821 value += ((*foo & mask) >> (8-part_size)); 822 823 usb_log_debug2("lfoo %x\n", *foo); 824 usb_log_debug2("lmaska %x\n", mask); 825 usb_log_debug2("lval %d\n", ((*foo & mask) >> (8-(item->size-part_size)))); 826 usb_log_debug2("val %d\n", value); 827 828 904 829 } 905 830 else { … … 907 832 mask = ((1 << item->size)-1) << (8-((offset%8)+item->size)); 908 833 value = (*foo & mask) >> (8-((offset%8)+item->size)); 909 } 910 911 if(!(item->logical_minimum >= 0 && item->logical_maximum >= 0)){912 value = (int32_t)value;913 }914 else {915 value = (uint32_t)value;916 } 917 834 835 usb_log_debug2("offset %d\n", offset); 836 837 usb_log_debug2("foo %x\n", *foo); 838 usb_log_debug2("maska %x\n", mask); 839 usb_log_debug2("val %d\n", value); 840 } 841 842 usb_log_debug2("---\n\n"); 918 843 919 844 return (int)(((value - item->logical_minimum) / resolution) + item->physical_minimum); … … 922 847 923 848 /** 924 * Returns number of items in input report which are accessible by given usage path925 * 926 * @param parser Opaque report descriptor structure927 * @param path Usage path specification928 * @param flags Usage path comparison flags929 * @return Number of items in input report930 */ 931 size_t usb_hid_report_input_length(const usb_hid_report_ t *report,849 * 850 * 851 * @param parser 852 * @param path 853 * @param flags 854 * @return 855 */ 856 size_t usb_hid_report_input_length(const usb_hid_report_parser_t *parser, 932 857 usb_hid_report_path_t *path, int flags) 933 858 { 934 935 859 size_t ret = 0; 936 937 if(report == NULL) { 860 link_t *item; 861 usb_hid_report_item_t *report_item; 862 863 if(parser == NULL) { 938 864 return 0; 939 865 } 940 941 usb_hid_report_description_t *report_des; 942 report_des = usb_hid_report_find_description (report, path->report_id, USB_HID_REPORT_TYPE_INPUT); 943 if(report_des == NULL) { 944 return 0; 945 } 946 947 link_t *field_it = report_des->report_items.next; 948 usb_hid_report_field_t *field; 949 while(field_it != &report_des->report_items) { 950 951 field = list_get_instance(field_it, usb_hid_report_field_t, link); 952 if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0) { 953 954 usb_hid_report_path_append_item (field->collection_path, field->usage_page, field->usage); 955 if(usb_hid_report_compare_usage_path (field->collection_path, path, flags) == EOK) { 956 ret++; 957 } 958 usb_hid_report_remove_last_item (field->collection_path); 866 867 item = parser->input.next; 868 while(&parser->input != item) { 869 report_item = list_get_instance(item, usb_hid_report_item_t, link); 870 if(!USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags) && 871 (usb_hid_report_compare_usage_path(report_item->usage_path, path, flags) == EOK)) { 872 ret += report_item->count; 959 873 } 960 961 field_it = field_it->next;962 } 874 875 item = item->next; 876 } 963 877 964 878 return ret; 965 } 966 967 968 /** 969 * Appends one item (couple of usage_path and usage) into the usage path 970 * structure 971 * 972 * @param usage_path Usage path structure 973 * @param usage_page Usage page constant 974 * @param usage Usage constant 975 * @return Error code 879 } 880 881 882 /** 883 * 884 * @param usage_path 885 * @param usage_page 886 * @param usage 887 * @return 976 888 */ 977 889 int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, … … 987 899 item->usage = usage; 988 900 item->usage_page = usage_page; 989 item->flags = 0; 990 991 list_append (&item->link, &usage_path->head); 901 902 usb_log_debug("Appending usage %d, usage page %d\n", usage, usage_page); 903 904 list_append (&usage_path->link, &item->link); 992 905 usage_path->depth++; 993 906 return EOK; … … 995 908 996 909 /** 997 * Removes last item from the usage path structure998 * @param usage_path 999 * @return void910 * 911 * @param usage_path 912 * @return 1000 913 */ 1001 914 void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path) … … 1003 916 usb_hid_report_usage_path_t *item; 1004 917 1005 if(!list_empty(&usage_path-> head)){1006 item = list_get_instance(usage_path-> head.prev, usb_hid_report_usage_path_t, link);1007 list_remove(usage_path-> head.prev);918 if(!list_empty(&usage_path->link)){ 919 item = list_get_instance(usage_path->link.prev, usb_hid_report_usage_path_t, link); 920 list_remove(usage_path->link.prev); 1008 921 usage_path->depth--; 1009 922 free(item); … … 1012 925 1013 926 /** 1014 * Nulls last item of the usage path structure.1015 927 * 1016 928 * @param usage_path 1017 * @return void929 * @return 1018 930 */ 1019 931 void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path) … … 1021 933 usb_hid_report_usage_path_t *item; 1022 934 1023 if(!list_empty(&usage_path-> head)){1024 item = list_get_instance(usage_path-> head.prev, usb_hid_report_usage_path_t, link);935 if(!list_empty(&usage_path->link)){ 936 item = list_get_instance(usage_path->link.prev, usb_hid_report_usage_path_t, link); 1025 937 memset(item, 0, sizeof(usb_hid_report_usage_path_t)); 1026 938 } … … 1028 940 1029 941 /** 1030 * Modifies last item of usage path structure by given usage page or usage 1031 * 1032 * @param usage_path Opaque usage path structure 1033 * @param tag Class of currently processed tag (Usage page tag falls into Global 1034 * class but Usage tag into the Local) 1035 * @param data Value of the processed tag 1036 * @return void 942 * 943 * @param usage_path 944 * @param tag 945 * @param data 946 * @return 1037 947 */ 1038 948 void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, int32_t tag, int32_t data) … … 1040 950 usb_hid_report_usage_path_t *item; 1041 951 1042 if(!list_empty(&usage_path-> head)){1043 item = list_get_instance(usage_path-> head.prev, usb_hid_report_usage_path_t, link);952 if(!list_empty(&usage_path->link)){ 953 item = list_get_instance(usage_path->link.prev, usb_hid_report_usage_path_t, link); 1044 954 1045 955 switch(tag) { … … 1055 965 } 1056 966 1057 1058 void usb_hid_print_usage_path(usb_hid_report_path_t *path) 1059 { 1060 usb_log_debug("USAGE_PATH FOR RId(%d):\n", path->report_id); 1061 usb_log_debug("\tLENGTH: %d\n", path->depth); 1062 1063 link_t *item = path->head.next; 1064 usb_hid_report_usage_path_t *path_item; 1065 while(item != &path->head) { 1066 1067 path_item = list_get_instance(item, usb_hid_report_usage_path_t, link); 1068 usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page); 1069 usb_log_debug("\tUSAGE: %X\n", path_item->usage); 1070 usb_log_debug("\tFLAGS: %d\n", path_item->flags); 1071 1072 item = item->next; 1073 } 1074 } 1075 1076 /** 1077 * Compares two usage paths structures 1078 * 1079 * If USB_HID_PATH_COMPARE_COLLECTION_ONLY flag is given, the last item in report_path structure is forgotten 1080 * 1081 * @param report_path usage path structure to compare 1082 * @param path usage patrh structure to compare 1083 * @param flags Flags determining the mode of comparison 1084 * @return EOK if both paths are identical, non zero number otherwise 967 /** 968 * 969 * 970 * @param report_path 971 * @param path 972 * @param flags 973 * @return 1085 974 */ 1086 975 int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, … … 1116 1005 } 1117 1006 1118 report_link = report_path-> head.next;1119 path_link = path-> head.next;1007 report_link = report_path->link.next; 1008 path_link = path->link.next; 1120 1009 1121 while((report_link != &report_path-> head) && (path_link != &path->head)) {1010 while((report_link != &report_path->link) && (path_link != &path->link)) { 1122 1011 report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link); 1123 1012 path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link); … … 1133 1022 } 1134 1023 1135 if(((report_link == &report_path->head) && (path_link == &path->head)) || 1136 (((flags & USB_HID_PATH_COMPARE_COLLECTION_ONLY) != 0) && (path_link = &path->head) && (report_link == report_path->head.prev))) { 1024 if((report_link == &report_path->link) && (path_link == &path->link)) { 1137 1025 return EOK; 1138 1026 } … … 1144 1032 /* compare with only the end of path*/ 1145 1033 case USB_HID_PATH_COMPARE_END: 1146 1147 if((flags & USB_HID_PATH_COMPARE_COLLECTION_ONLY) != 0) { 1148 report_link = report_path->head.prev->prev; 1149 } 1150 else { 1151 report_link = report_path->head.prev; 1152 } 1153 path_link = path->head.prev; 1154 1155 if(list_empty(&path->head)){ 1034 report_link = report_path->link.prev; 1035 path_link = path->link.prev; 1036 1037 if(list_empty(&path->link)){ 1156 1038 return EOK; 1157 1039 } 1158 1040 1159 while((report_link != &report_path-> head) && (path_link != &path->head)) {1041 while((report_link != &report_path->link) && (path_link != &path->link)) { 1160 1042 report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link); 1161 1043 path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link); … … 1171 1053 } 1172 1054 1173 if(path_link == &path-> head) {1055 if(path_link == &path->link) { 1174 1056 return EOK; 1175 1057 } … … 1190 1072 1191 1073 /** 1192 * Allocates and initializes new usage path structure. 1193 * 1194 * @return Initialized usage path structure 1074 * 1075 * @return 1195 1076 */ 1196 1077 usb_hid_report_path_t *usb_hid_report_path(void) … … 1198 1079 usb_hid_report_path_t *path; 1199 1080 path = malloc(sizeof(usb_hid_report_path_t)); 1200 if( path == NULL){1081 if(!path){ 1201 1082 return NULL; 1202 1083 } … … 1205 1086 path->report_id = 0; 1206 1087 list_initialize(&path->link); 1207 list_initialize(&path->head);1208 1088 return path; 1209 1089 } … … 1211 1091 1212 1092 /** 1213 * Releases given usage path structure. 1214 * 1215 * @param path usage path structure to release 1093 * 1094 * @param path 1216 1095 * @return void 1217 1096 */ 1218 1097 void usb_hid_report_path_free(usb_hid_report_path_t *path) 1219 1098 { 1220 while(!list_empty(&path-> head)){1099 while(!list_empty(&path->link)){ 1221 1100 usb_hid_report_remove_last_item(path); 1222 1101 } 1223 1224 list_remove(&path->link);1225 free(path);1226 1102 } 1227 1103 … … 1230 1106 * Clone content of given usage path to the new one 1231 1107 * 1232 * @param usage_path Usage path structure to clone1233 * @return New copy of given usage path structure1108 * @param usage_path 1109 * @return 1234 1110 */ 1235 1111 usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path) 1236 1112 { 1113 usb_hid_report_usage_path_t *path_item; 1237 1114 link_t *path_link; 1238 usb_hid_report_usage_path_t *path_item;1239 usb_hid_report_usage_path_t *new_path_item;1240 1115 usb_hid_report_path_t *new_usage_path = usb_hid_report_path (); 1241 1116 … … 1244 1119 } 1245 1120 1246 if(list_empty(&usage_path-> head)){1121 if(list_empty(&usage_path->link)){ 1247 1122 return new_usage_path; 1248 1123 } 1249 1124 1250 path_link = usage_path-> head.next;1251 while(path_link != &usage_path-> head) {1125 path_link = usage_path->link.next; 1126 while(path_link != &usage_path->link) { 1252 1127 path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link); 1253 new_path_item = malloc(sizeof(usb_hid_report_usage_path_t)); 1254 if(new_path_item == NULL) { 1255 return NULL; 1256 } 1257 1258 list_initialize (&new_path_item->link); 1259 new_path_item->usage_page = path_item->usage_page; 1260 new_path_item->usage = path_item->usage; 1261 new_path_item->flags = path_item->flags; 1262 1263 list_append(&new_path_item->link, &new_usage_path->head); 1264 new_usage_path->depth++; 1128 usb_hid_report_path_append_item (new_usage_path, path_item->usage_page, path_item->usage); 1265 1129 1266 1130 path_link = path_link->next; … … 1273 1137 /*** OUTPUT API **/ 1274 1138 1275 /** 1276 * Allocates output report buffer for output report 1277 * 1278 * @param parser Report parsed structure 1279 * @param size Size of returned buffer 1280 * @param report_id Report id of created output report 1281 * @return Returns allocated output buffer for specified output 1282 */ 1283 uint8_t *usb_hid_report_output(usb_hid_report_t *report, size_t *size, uint8_t report_id) 1284 { 1285 if(report == NULL) { 1139 /** Allocates output report buffer 1140 * 1141 * @param parser 1142 * @param size 1143 * @return 1144 */ 1145 uint8_t *usb_hid_report_output(usb_hid_report_parser_t *parser, size_t *size) 1146 { 1147 if(parser == NULL) { 1286 1148 *size = 0; 1287 1149 return NULL; 1288 1150 } 1289 1290 link_t *report_it = report->reports.next; 1291 usb_hid_report_description_t *report_des = NULL; 1292 while(report_it != &report->reports) { 1293 report_des = list_get_instance(report_it, usb_hid_report_description_t, link); 1294 if((report_des->report_id == report_id) && (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)){ 1295 break; 1296 } 1297 1298 report_it = report_it->next; 1299 } 1300 1301 if(report_des == NULL){ 1302 *size = 0; 1151 1152 // read the last output report item 1153 usb_hid_report_item_t *last; 1154 link_t *link; 1155 1156 link = parser->output.prev; 1157 if(link != &parser->output) { 1158 last = list_get_instance(link, usb_hid_report_item_t, link); 1159 *size = (last->offset + (last->size * last->count)) / 8; 1160 1161 uint8_t *buffer = malloc(sizeof(uint8_t) * (*size)); 1162 memset(buffer, 0, sizeof(uint8_t) * (*size)); 1163 usb_log_debug("output buffer: %s\n", usb_debug_str_buffer(buffer, *size, 0)); 1164 1165 return buffer; 1166 } 1167 else { 1168 *size = 0; 1303 1169 return NULL; 1304 1170 } 1305 else {1306 *size = (report_des->bit_length + (8 - 1))/8;1307 uint8_t *ret = malloc((*size) * sizeof(uint8_t));1308 memset(ret, 0, (*size) * sizeof(uint8_t));1309 return ret;1310 }1311 1171 } 1312 1172 … … 1315 1175 * 1316 1176 * @param output Output report buffer 1317 * @return void1177 * @return 1318 1178 */ 1319 1179 void usb_hid_report_output_free(uint8_t *output) … … 1327 1187 /** Returns size of output for given usage path 1328 1188 * 1329 * @param parser Opaque report parser structure1330 * @param path Usage path specified which items will be thought for the output1331 * @param flags Flags of usage path structure comparison1332 * @return Number of items matching the given usage path1333 */ 1334 size_t usb_hid_report_output_size(usb_hid_report_ t *report,1189 * @param parser 1190 * @param path 1191 * @param flags 1192 * @return 1193 */ 1194 size_t usb_hid_report_output_size(usb_hid_report_parser_t *parser, 1335 1195 usb_hid_report_path_t *path, int flags) 1336 1196 { 1337 size_t ret = 0; 1338 usb_hid_report_description_t *report_des; 1339 1340 if(report == NULL) { 1197 size_t ret = 0; 1198 link_t *item; 1199 usb_hid_report_item_t *report_item; 1200 1201 if(parser == NULL) { 1341 1202 return 0; 1342 1203 } 1343 1204 1344 report_des = usb_hid_report_find_description (report, path->report_id, USB_HID_REPORT_TYPE_OUTPUT); 1345 if(report_des == NULL){ 1346 return 0; 1347 } 1348 1349 link_t *field_it = report_des->report_items.next; 1350 usb_hid_report_field_t *field; 1351 while(field_it != &report_des->report_items) { 1352 1353 field = list_get_instance(field_it, usb_hid_report_field_t, link); 1354 usb_hid_report_path_append_item (field->collection_path, field->usage_page, field->usage); 1355 if(usb_hid_report_compare_usage_path (field->collection_path, path, flags) == EOK) { 1356 ret++; 1205 item = parser->output.next; 1206 while(&parser->output != item) { 1207 report_item = list_get_instance(item, usb_hid_report_item_t, link); 1208 if(!USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags) && 1209 (usb_hid_report_compare_usage_path(report_item->usage_path, path, flags) == EOK)) { 1210 ret += report_item->count; 1357 1211 } 1358 usb_hid_report_remove_last_item (field->collection_path); 1359 1360 field_it = field_it->next; 1361 } 1212 1213 item = item->next; 1214 } 1362 1215 1363 1216 return ret; … … 1365 1218 } 1366 1219 1367 /** Makes the output report buffer for data given in the report structure 1368 * 1369 * @param parser Opaque report parser structure 1370 * @param path Usage path specifing which parts of output will be set 1371 * @param flags Usage path structure comparison flags 1372 * @param buffer Output buffer 1373 * @param size Size of output buffer 1374 * @return Error code 1375 */ 1376 int usb_hid_report_output_translate(usb_hid_report_t *report, uint8_t report_id, 1377 uint8_t *buffer, size_t size) 1378 { 1220 /** Updates the output report buffer by translated given data 1221 * 1222 * @param parser 1223 * @param path 1224 * @param flags 1225 * @param buffer 1226 * @param size 1227 * @param data 1228 * @param data_size 1229 * @return 1230 */ 1231 int usb_hid_report_output_translate(usb_hid_report_parser_t *parser, 1232 usb_hid_report_path_t *path, int flags, 1233 uint8_t *buffer, size_t size, 1234 int32_t *data, size_t data_size) 1235 { 1236 usb_hid_report_item_t *report_item; 1379 1237 link_t *item; 1238 size_t idx=0; 1239 int i=0; 1380 1240 int32_t value=0; 1381 1241 int offset; 1382 1242 int length; 1383 1243 int32_t tmp_value; 1384 1385 if(report == NULL) { 1244 size_t offset_prefix = 0; 1245 1246 if(parser == NULL) { 1386 1247 return EINVAL; 1387 1248 } 1388 1249 1389 if(report->use_report_ids != 0) { 1390 buffer[0] = report_id; 1250 if(parser->use_report_id != 0) { 1251 buffer[0] = path->report_id; 1252 offset_prefix = 8; 1391 1253 } 1392 1254 1393 1255 usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0)); 1394 1395 usb_hid_report_description_t *report_des; 1396 report_des = usb_hid_report_find_description (report, report_id, USB_HID_REPORT_TYPE_OUTPUT);1397 if(report_des == NULL){1398 re turn EINVAL;1399 } 1400 1401 usb_hid_report_field_t *report_item; 1402 item = report_des->report_items.next;1403 while(item != &report_des->report_items) {1404 report_item = list_get_instance(item, usb_hid_report_field_t, link);1256 usb_log_debug("OUTPUT DATA[0]: %d, DATA[1]: %d, DATA[2]: %d\n", data[0], data[1], data[2]); 1257 1258 item = parser->output.next; 1259 while(item != &parser->output) { 1260 report_item = list_get_instance(item, usb_hid_report_item_t, link); 1261 1262 for(i=0; i<report_item->count; i++) { 1263 1264 if(idx >= data_size) { 1265 break; 1266 } 1405 1267 1406 1268 if((USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0) || 1407 1269 ((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0))) { 1408 1270 1409 // variable item1410 value = usb_hid_translate_data_reverse(report_item, report_item->value);1411 offset = report_item->offset ;1271 // // variable item 1272 value = usb_hid_translate_data_reverse(report_item, data[idx++]); 1273 offset = report_item->offset + (i * report_item->size) + offset_prefix; 1412 1274 length = report_item->size; 1413 1275 } 1414 1276 else { 1415 1277 //bitmap 1416 value += usb_hid_translate_data_reverse(report_item, report_item->value);1417 offset = report_item->offset ;1418 length = report_item->size ;1278 value += usb_hid_translate_data_reverse(report_item, data[idx++]); 1279 offset = report_item->offset + offset_prefix; 1280 length = report_item->size * report_item->count; 1419 1281 } 1420 1282 … … 1435 1297 } 1436 1298 else { 1437 int i = 0; 1299 // je to ve dvou!! FIXME: melo by to umet delsi jak 2 1300 1301 // konec prvniho -- dolni x bitu 1302 tmp_value = value; 1303 tmp_value = tmp_value & ((1 << (8-(offset%8)))-1); 1304 tmp_value = tmp_value << (offset%8); 1305 1438 1306 uint8_t mask = 0; 1439 for(i = (offset/8); i <= ((offset+length-1)/8); i++) { 1440 if(i == (offset/8)) { 1441 tmp_value = value; 1442 tmp_value = tmp_value & ((1 << (8-(offset%8)))-1); 1443 tmp_value = tmp_value << (offset%8); 1444 1445 mask = ~(((1 << (8-(offset%8)))-1) << (offset%8)); 1446 buffer[i] = (buffer[i] & mask) | tmp_value; 1447 } 1448 else if (i == ((offset + length -1)/8)) { 1449 1450 value = value >> (length - ((offset + length) % 8)); 1451 value = value & ((1 << (length - ((offset + length) % 8))) - 1); 1307 mask = ~(((1 << (8-(offset%8)))-1) << (offset%8)); 1308 buffer[offset/8] = (buffer[offset/8] & mask) | tmp_value; 1309 1310 // a ted druhej -- hornich length-x bitu 1311 value = value >> (8 - (offset % 8)); 1312 value = value & ((1 << (length - (8 - (offset % 8)))) - 1); 1452 1313 1453 mask = (1 << (length - ((offset + length) % 8))) - 1; 1454 buffer[i] = (buffer[i] & mask) | value; 1455 } 1456 else { 1457 buffer[i] = value & (0xFF << i); 1458 } 1459 } 1314 mask = ((1 << (length - (8 - (offset % 8)))) - 1); 1315 buffer[(offset+length-1)/8] = (buffer[(offset+length-1)/8] & mask) | value; 1460 1316 } 1461 1317 1318 } 1462 1319 1463 1320 item = item->next; … … 1470 1327 1471 1328 /** 1472 * Translate given data for putting them into the outoput report1473 * @param item Report item structure1474 * @param value Value to translate1475 * @return ranslated value1476 */ 1477 uint32_t usb_hid_translate_data_reverse(usb_hid_report_field_t *item, int value)1329 * 1330 * @param item 1331 * @param value 1332 * @return 1333 */ 1334 int32_t usb_hid_translate_data_reverse(usb_hid_report_item_t *item, int value) 1478 1335 { 1479 1336 int ret=0; … … 1515 1372 1516 1373 1517 return (uint32_t)ret; 1518 } 1519 1520 /** 1521 * Sets report id in usage path structure 1522 * 1523 * @param path Usage path structure 1524 * @param report_id Report id to set 1525 * @return Error code 1526 */ 1374 return ret; 1375 } 1376 1377 1527 1378 int usb_hid_report_path_set_report_id(usb_hid_report_path_t *path, uint8_t report_id) 1528 1379 { … … 1535 1386 } 1536 1387 1537 /** 1538 * Clones given report item structure and returns the new one 1539 * 1540 * @param item Report item structure to clone 1541 * @return Clonned item 1542 */ 1388 1543 1389 usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item) 1544 1390 { … … 1554 1400 } 1555 1401 1556 1557 /**1558 *1559 *1560 *1561 *1562 *1563 */1564 int usb_hid_report_output_set_data(usb_hid_report_t *report,1565 usb_hid_report_path_t *path, int flags,1566 int *data, size_t data_size)1567 {1568 size_t data_idx = 0;1569 if(report == NULL){1570 return EINVAL;1571 }1572 1573 usb_hid_report_description_t *report_des;1574 report_des = usb_hid_report_find_description (report, path->report_id,1575 USB_HID_REPORT_TYPE_OUTPUT);1576 if(report_des == NULL){1577 return EINVAL;1578 }1579 1580 usb_hid_report_field_t *field;1581 link_t *field_it = report_des->report_items.next;1582 while(field_it != &report_des->report_items){1583 1584 field = list_get_instance(field_it, usb_hid_report_field_t, link);1585 if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0) {1586 usb_hid_report_path_append_item (field->collection_path, field->usage_page, field->usage);1587 if(usb_hid_report_compare_usage_path (field->collection_path, path,1588 flags) == EOK) {1589 1590 if(data_idx < data_size) {1591 field->value = data[data_idx++];1592 }1593 else {1594 field->value = 0;1595 }1596 }1597 usb_hid_report_remove_last_item (field->collection_path);1598 }1599 1600 field_it = field_it->next;1601 }1602 1603 return EOK;1604 }1605 1606 1402 /** 1607 1403 * @}
Note:
See TracChangeset
for help on using the changeset viewer.
