Changes in / [10849ffc:8cbd512] in mainline


Ignore:
Location:
uspace/lib/usb
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usb/include/usb/classes/hiddescriptor.h

    r10849ffc r8cbd512  
    7878uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size);
    7979
    80 usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path);
    8180#endif
    8281/**

  • uspace/lib/usb/src/hiddescriptor.c

    r10849ffc r8cbd512  
    5656#define USB_HID_UNKNOWN_TAG             -99
    5757
    58 usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path)
    59 {
     58
     59/**
     60 * Initialize the report descriptor parser structure
     61 *
     62 * @param parser Report descriptor parser structure
     63 * @return Error code
     64 */
     65int 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
     79int 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
    6085        /* find or append current collection path to the list */
    6186        link_t *path_it = report->collection_paths.next;
    … …  
    6489                path = list_get_instance(path_it, usb_hid_report_path_t, link);
    6590               
    66                 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){
    6792                        break;
    6893                }                       
    … …  
    7095        }
    7196        if(path_it == &report->collection_paths) {
    72                 path = usb_hid_report_path_clone(cmp_path);                     
     97                path = usb_hid_report_path_clone(report_item->usage_path);                     
    7398                list_append(&path->link, &report->collection_paths);                                   
    7499                report->collection_paths_count++;
    75 
    76                 return path;
    77         }
    78         else {
    79                 return list_get_instance(path_it, usb_hid_report_path_t, link);
    80         }
    81 }
    82 
    83 /**
    84  * Initialize the report descriptor parser structure
    85  *
    86  * @param parser Report descriptor parser structure
    87  * @return Error code
    88  */
    89 int usb_hid_report_init(usb_hid_report_t *report)
    90 {
    91         if(report == NULL) {
    92                 return EINVAL;
    93         }
    94 
    95         memset(report, 0, sizeof(usb_hid_report_t));
    96         list_initialize(&report->reports);
    97         list_initialize(&report->collection_paths);
    98 
    99         report->use_report_ids = 0;
    100     return EOK;   
    101 }
    102 
    103 int usb_hid_report_append_fields(usb_hid_report_t *report, usb_hid_report_item_t *report_item)
    104 {
    105         usb_hid_report_field_t *field;
    106         int i;
     100        }
    107101
    108102        for(i=0; i<report_item->usages_count; i++){
    … …  
    110104        }
    111105
    112         usb_hid_report_path_t *path = report_item->usage_path; 
     106       
    113107        for(i=0; i<report_item->count; i++){
    114108
    … …  
    118112
    119113                /* fill the attributes */               
     114                field->collection_path = path;
    120115                field->logical_minimum = report_item->logical_minimum;
    121116                field->logical_maximum = report_item->logical_maximum;
    … …  
    173168                }
    174169               
    175                 usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_GLOBAL, field->usage_page);
    176                 usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_LOCAL, field->usage);
    177 
    178                 field->collection_path = usb_hid_report_path_try_insert(report, path);
    179 
    180170                field->size = report_item->size;
    181171                field->offset = report_item->offset + (i * report_item->size);
    … …  
    359349                                        tmp_usage_path = list_get_instance(report_item->usage_path->link.prev, usb_hid_report_usage_path_t, link);
    360350                                       
    361                                         usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_GLOBAL, tmp_usage_path->usage_page);
    362                                         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);
    363352
    364353                                        usb_hid_report_path_free(report_item->usage_path);
    … …  
    651640                usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage);
    652641                usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page);
    653                
    654                 //usb_hid_print_usage_path(report_item->collection_path);
    655 
    656                 usb_log_debug("\n");           
     642                                               
     643//              usb_log_debug("\n");           
    657644
    658645        }
Note: See TracChangeset for help on using the changeset viewer.