Changes in uspace/lib/usb/src/hidreport.c [175ad13e:4125b7d] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/src/hidreport.c
r175ad13e r4125b7d 80 80 d = usb_dp_get_sibling_descriptor(&parser, &parser_data, 81 81 dev->descriptors.configuration, d); 82 ++i; 82 83 } 83 84 … … 108 109 109 110 if (*d != sizeof(usb_standard_hid_descriptor_t)) { 110 usb_log_error("HID descriptor has s wrong size (%u, expected %u"111 usb_log_error("HID descriptor has wrong size (%u, expected %zu" 111 112 ")\n", *d, sizeof(usb_standard_hid_descriptor_t)); 112 113 return EINVAL; … … 118 119 uint16_t length = hid_desc->report_desc_info.length; 119 120 size_t actual_size = 0; 120 121 /*122 * Start session for the control transfer.123 */124 int sess_rc = usb_pipe_start_session(&dev->ctrl_pipe);125 if (sess_rc != EOK) {126 usb_log_warning("Failed to start a session: %s.\n",127 str_error(sess_rc));128 return sess_rc;129 }130 121 131 122 /* … … 158 149 free(*report_desc); 159 150 *report_desc = NULL; 160 usb_log_error("Report descriptor has wrong size (% u, expected "151 usb_log_error("Report descriptor has wrong size (%zu, expected " 161 152 "%u)\n", actual_size, length); 162 153 return EINVAL; 163 154 } 164 155 165 /*166 * End session for the control transfer.167 */168 sess_rc = usb_pipe_end_session(&dev->ctrl_pipe);169 if (sess_rc != EOK) {170 usb_log_warning("Failed to end a session: %s.\n",171 str_error(sess_rc));172 free(*report_desc);173 *report_desc = NULL;174 return sess_rc;175 }176 177 156 *size = length; 178 157 … … 185 164 186 165 int usb_hid_process_report_descriptor(usb_device_t *dev, 187 usb_hid_report_ t *report)166 usb_hid_report_parser_t *parser) 188 167 { 189 if (dev == NULL || report== NULL) {168 if (dev == NULL || parser == NULL) { 190 169 usb_log_error("Failed to process Report descriptor: wrong " 191 170 "parameters given.\n"); … … 210 189 assert(report_desc != NULL); 211 190 212 rc = usb_hid_parse_report_descriptor( report, report_desc, report_size);191 rc = usb_hid_parse_report_descriptor(parser, report_desc, report_size); 213 192 if (rc != EOK) { 214 193 usb_log_error("Problem parsing Report descriptor: %s.\n", … … 218 197 } 219 198 220 usb_hid_descriptor_print( report);199 usb_hid_descriptor_print(parser); 221 200 free(report_desc); 222 201
Note:
See TracChangeset
for help on using the changeset viewer.