Changeset 8d3f198 in mainline for uspace/lib/usbhid/src/hidparser.c
- Timestamp:
- 2011-05-26T10:06:24Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c0940a85
- Parents:
- fa8d346 (diff), 5f9b81af (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/hidparser.c
rfa8d346 r8d3f198 31 31 */ 32 32 /** @file 33 * HID report descriptor andreport data parser implementation.33 * USB HID report data parser implementation. 34 34 */ 35 35 #include <usb/hid/hidparser.h> … … 41 41 #include <assert.h> 42 42 43 43 /*---------------------------------------------------------------------------*/ 44 44 /* 45 45 * Data translation private functions 46 46 */ 47 47 uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size); 48 //inline size_t usb_hid_count_item_offset(usb_hid_report_item_t * report_item, size_t offset); 48 49 49 int usb_hid_translate_data(usb_hid_report_field_t *item, const uint8_t *data); 50 uint32_t usb_hid_translate_data_reverse(usb_hid_report_field_t *item, int32_t value); 50 51 uint32_t usb_hid_translate_data_reverse(usb_hid_report_field_t *item, 52 int32_t value); 53 51 54 int usb_pow(int a, int b); 52 55 56 /*---------------------------------------------------------------------------*/ 53 57 54 58 // TODO: tohle ma bejt asi jinde … … 56 60 { 57 61 switch(b) { 58 59 60 61 62 63 64 65 66 67 } 68 } 69 62 case 0: 63 return 1; 64 break; 65 case 1: 66 return a; 67 break; 68 default: 69 return a * usb_pow(a, b-1); 70 break; 71 } 72 } 73 /*---------------------------------------------------------------------------*/ 70 74 71 75 /** Returns size of report of specified report id and type in items … … 94 98 } 95 99 100 /** Returns size of report of specified report id and type in bytes 101 * 102 * @param parser Opaque report parser structure 103 * @param report_id 104 * @param type 105 * @return Number of items in specified report 106 */ 107 size_t usb_hid_report_byte_size(usb_hid_report_t *report, uint8_t report_id, 108 usb_hid_report_type_t type) 109 { 110 usb_hid_report_description_t *report_des; 111 112 if(report == NULL) { 113 return 0; 114 } 115 116 report_des = usb_hid_report_find_description (report, report_id, type); 117 if(report_des == NULL){ 118 return 0; 119 } 120 else { 121 return (report_des->bit_length + 7) / 8; 122 } 123 } 124 /*---------------------------------------------------------------------------*/ 96 125 97 126 /** Parse and act upon a HID report. … … 103 132 * @return Error code. 104 133 */ 105 int usb_hid_parse_report(const usb_hid_report_t *report, 106 const uint8_t *data,size_t size, uint8_t *report_id)134 int usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data, 135 size_t size, uint8_t *report_id) 107 136 { 108 137 link_t *list_item; … … 139 168 item->value = usb_hid_translate_data(item, data); 140 169 141 item->usage = USB_HID_EXTENDED_USAGE(item->usages[item->value - item->physical_minimum]); 142 item->usage_page = USB_HID_EXTENDED_USAGE_PAGE(item->usages[item->value - item->physical_minimum]); 170 item->usage = USB_HID_EXTENDED_USAGE( 171 item->usages[item->value - item->physical_minimum]); 172 item->usage_page = USB_HID_EXTENDED_USAGE_PAGE( 173 item->usages[item->value - item->physical_minimum]); 143 174 144 175 usb_hid_report_set_last_item (item->collection_path, 145 USB_HID_TAG_CLASS_GLOBAL, 146 item->usage_page); 176 USB_HID_TAG_CLASS_GLOBAL, item->usage_page); 147 177 usb_hid_report_set_last_item (item->collection_path, 148 USB_HID_TAG_CLASS_LOCAL, 149 item->usage); 178 USB_HID_TAG_CLASS_LOCAL, item->usage); 150 179 151 180 } … … 162 191 } 163 192 193 /*---------------------------------------------------------------------------*/ 164 194 /** 165 195 * Translate data from the report as specified in report descriptor item … … 167 197 * @param item Report descriptor item with definition of translation 168 198 * @param data Data to translate 169 * @param j Index of processed field in report descriptor item170 199 * @return Translated data 171 200 */ … … 240 269 } 241 270 242 /*** OUTPUT API **/ 271 /*---------------------------------------------------------------------------*/ 272 /* OUTPUT API */ 243 273 244 274 /** … … 250 280 * @return Returns allocated output buffer for specified output 251 281 */ 252 uint8_t *usb_hid_report_output(usb_hid_report_t *report, size_t *size, uint8_t report_id) 282 uint8_t *usb_hid_report_output(usb_hid_report_t *report, size_t *size, 283 uint8_t report_id) 253 284 { 254 285 if(report == NULL) { … … 260 291 usb_hid_report_description_t *report_des = NULL; 261 292 while(report_it != &report->reports) { 262 report_des = list_get_instance(report_it, usb_hid_report_description_t, link); 263 if((report_des->report_id == report_id) && (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)){ 293 report_des = list_get_instance(report_it, 294 usb_hid_report_description_t, link); 295 296 if((report_des->report_id == report_id) && 297 (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)){ 264 298 break; 265 299 } … … 303 337 * @return Error code 304 338 */ 305 int usb_hid_report_output_translate(usb_hid_report_t *report, uint8_t report_id,306 339 int usb_hid_report_output_translate(usb_hid_report_t *report, 340 uint8_t report_id, uint8_t *buffer, size_t size) 307 341 { 308 342 link_t *item; … … 320 354 } 321 355 322 usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0));323 324 356 usb_hid_report_description_t *report_des; 325 report_des = usb_hid_report_find_description (report, report_id, USB_HID_REPORT_TYPE_OUTPUT); 357 report_des = usb_hid_report_find_description (report, report_id, 358 USB_HID_REPORT_TYPE_OUTPUT); 359 326 360 if(report_des == NULL){ 327 361 return EINVAL; … … 333 367 report_item = list_get_instance(item, usb_hid_report_field_t, link); 334 368 335 usb_log_debug("OUTPUT ITEM usage(%x), value(%x)\n", report_item->usage, report_item->value);336 337 369 if(USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0) { 338 370 339 371 // array 340 value = usb_hid_translate_data_reverse(report_item, report_item->value); 372 value = usb_hid_translate_data_reverse(report_item, 373 report_item->value); 374 341 375 offset = report_item->offset; 342 376 length = report_item->size; … … 344 378 else { 345 379 // variable item 346 value = usb_hid_translate_data_reverse(report_item, report_item->value); 380 value = usb_hid_translate_data_reverse(report_item, 381 report_item->value); 382 347 383 offset = report_item->offset; 348 384 length = report_item->size; … … 353 389 if((offset/8) == ((offset+length-1)/8)) { 354 390 // je to v jednom bytu 355 if(((size_t)(offset/8) >= size) || ((size_t)(offset+length-1)/8) >= size) { 391 if(((size_t)(offset/8) >= size) || 392 ((size_t)(offset+length-1)/8) >= size) { 356 393 break; // TODO ErrorCode 357 394 } … … 379 416 380 417 value = value >> (length - ((offset + length) % 8)); 381 value = value & ((1 << (length - ((offset + length) % 8))) - 1); 418 value = value & 419 ((1 << (length - ((offset + length) % 8))) - 1); 382 420 383 421 mask = (1 << (length - ((offset + length) % 8))) - 1; … … 396 434 } 397 435 398 usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0));399 400 436 return EOK; 401 437 } 402 438 439 /*---------------------------------------------------------------------------*/ 403 440 /** 404 441 * Translate given data for putting them into the outoput report … … 407 444 * @return ranslated value 408 445 */ 409 uint32_t usb_hid_translate_data_reverse(usb_hid_report_field_t *item, int value) 446 uint32_t usb_hid_translate_data_reverse(usb_hid_report_field_t *item, 447 int value) 410 448 { 411 449 int ret=0; … … 431 469 } 432 470 433 ret = ((value - item->physical_minimum) * resolution) + item->logical_minimum; 434 usb_log_debug("\tvalue(%x), resolution(%x), phymin(%x) logmin(%x), ret(%x)\n", value, resolution, item->physical_minimum, item->logical_minimum, ret); 471 ret = ((value - item->physical_minimum) * resolution) + 472 item->logical_minimum; 473 474 usb_log_debug("\tvalue(%x), resolution(%x), phymin(%x) logmin(%x), \ 475 ret(%x)\n", value, resolution, item->physical_minimum, 476 item->logical_minimum, ret); 435 477 436 478 if((item->logical_minimum < 0) || (item->logical_maximum < 0)){ … … 440 482 } 441 483 442 usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item) 484 /*---------------------------------------------------------------------------*/ 485 /** 486 * Clones given state table 487 * 488 * @param item State table to clone 489 * @return Pointer to the cloned item 490 */ 491 usb_hid_report_item_t *usb_hid_report_item_clone( 492 const usb_hid_report_item_t *item) 443 493 { 444 494 usb_hid_report_item_t *new_report_item; … … 453 503 } 454 504 455 505 /*---------------------------------------------------------------------------*/ 506 /** 507 * Function for sequence walking through the report. Returns next field in the 508 * report or the first one when no field is given. 509 * 510 * @param report Searched report structure 511 * @param field Current field. If NULL is given, the first one in the report 512 * is returned. Otherwise the next one i nthe list is returned. 513 * @param path Usage path specifying which fields wa are interested in. 514 * @param flags Flags defining mode of usage paths comparison 515 * @param type Type of report we search. 516 * @retval NULL if no field is founded 517 * @retval Pointer to the founded report structure when founded 518 */ 456 519 usb_hid_report_field_t *usb_hid_report_get_sibling(usb_hid_report_t *report, 457 usb_hid_report_field_t *field, 458 usb_hid_report_path_t *path, int flags, 459 usb_hid_report_type_t type) 460 { 461 usb_hid_report_description_t *report_des = usb_hid_report_find_description (report, path->report_id, type); 520 usb_hid_report_field_t *field, usb_hid_report_path_t *path, int flags, 521 usb_hid_report_type_t type) 522 { 523 usb_hid_report_description_t *report_des = usb_hid_report_find_description( 524 report, path->report_id, type); 525 462 526 link_t *field_it; 463 527 … … 467 531 468 532 if(field == NULL){ 469 // vezmu prvni co mathuje podle path!!470 533 field_it = report_des->report_items.next; 471 534 } … … 478 541 479 542 if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0) { 480 usb_hid_report_path_append_item (field->collection_path, field->usage_page, field->usage); 481 if(usb_hid_report_compare_usage_path (field->collection_path, path, flags) == EOK){ 482 usb_hid_report_remove_last_item (field->collection_path); 543 usb_hid_report_path_append_item (field->collection_path, 544 field->usage_page, field->usage); 545 546 if(usb_hid_report_compare_usage_path(field->collection_path, path, 547 flags) == EOK){ 548 549 usb_hid_report_remove_last_item(field->collection_path); 483 550 return field; 484 551 } … … 491 558 } 492 559 493 uint8_t usb_hid_report_get_report_id(usb_hid_report_t *report, uint8_t report_id, usb_hid_report_type_t type) 560 /*---------------------------------------------------------------------------*/ 561 /** 562 * Returns next report_id of report of specified type. If zero is given than 563 * first report_id of specified type is returned (0 is not legal value for 564 * repotr_id) 565 * 566 * @param report_id Current report_id, 0 if there is no current report_id 567 * @param type Type of searched report 568 * @param report Report structure inwhich we search 569 * @retval 0 if report structure is null or there is no specified report 570 * @retval report_id otherwise 571 */ 572 uint8_t usb_hid_get_next_report_id(usb_hid_report_t *report, 573 uint8_t report_id, usb_hid_report_type_t type) 494 574 { 495 575 if(report == NULL){ … … 500 580 link_t *report_it; 501 581 502 if(report_id == 0) { 503 report_it = usb_hid_report_find_description (report, report_id, type)->link.next; 582 if(report_id > 0) { 583 report_it = usb_hid_report_find_description(report, report_id, 584 type)->link.next; 504 585 } 505 586 else { … … 508 589 509 590 while(report_it != &report->reports) { 510 report_des = list_get_instance(report_it, usb_hid_report_description_t, link); 591 report_des = list_get_instance(report_it, 592 usb_hid_report_description_t, link); 593 511 594 if(report_des->type == type){ 512 595 return report_des->report_id; … … 517 600 } 518 601 602 /*---------------------------------------------------------------------------*/ 603 /** 604 * Reset all local items in given state table 605 * 606 * @param report_item State table containing current state of report 607 * descriptor parsing 608 * 609 * @return void 610 */ 519 611 void usb_hid_report_reset_local_items(usb_hid_report_item_t *report_item) 520 612 {
Note:
See TracChangeset
for help on using the changeset viewer.