Changes in uspace/drv/usbhid/usbhid.c [dcb7d7cd:f3f9733] in mainline
- File:
-
- 1 edited
-
uspace/drv/usbhid/usbhid.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbhid/usbhid.c
rdcb7d7cd rf3f9733 78 78 } 79 79 80 assert(hid_dev->subdriver_count >= 0); 81 80 82 // set the init callback 81 hid_dev->subdrivers[ 0].init = usb_kbd_init;83 hid_dev->subdrivers[hid_dev->subdriver_count].init = usb_kbd_init; 82 84 83 85 // set the polling callback 84 hid_dev->subdrivers[0].poll = usb_kbd_polling_callback; 86 hid_dev->subdrivers[hid_dev->subdriver_count].poll = 87 usb_kbd_polling_callback; 85 88 86 89 // set the polling ended callback 87 hid_dev->subdrivers[ 0].poll_end = NULL;90 hid_dev->subdrivers[hid_dev->subdriver_count].poll_end = NULL; 88 91 89 92 // set the deinit callback 90 hid_dev->subdrivers[ 0].deinit = usb_kbd_deinit;93 hid_dev->subdrivers[hid_dev->subdriver_count].deinit = usb_kbd_deinit; 91 94 92 95 // set subdriver count 93 hid_dev->subdriver_count = 1;96 ++hid_dev->subdriver_count; 94 97 95 98 return EOK; … … 108 111 } 109 112 113 assert(hid_dev->subdriver_count >= 0); 114 110 115 // set the init callback 111 hid_dev->subdrivers[ 0].init = usb_mouse_init;116 hid_dev->subdrivers[hid_dev->subdriver_count].init = usb_mouse_init; 112 117 113 118 // set the polling callback 114 hid_dev->subdrivers[0].poll = usb_mouse_polling_callback; 119 hid_dev->subdrivers[hid_dev->subdriver_count].poll = 120 usb_mouse_polling_callback; 115 121 116 122 // set the polling ended callback 117 hid_dev->subdrivers[ 0].poll_end = NULL;123 hid_dev->subdrivers[hid_dev->subdriver_count].poll_end = NULL; 118 124 119 125 // set the deinit callback 120 hid_dev->subdrivers[ 0].deinit = usb_mouse_deinit;126 hid_dev->subdrivers[hid_dev->subdriver_count].deinit = usb_mouse_deinit; 121 127 122 128 // set subdriver count 123 hid_dev->subdriver_count = 1;129 ++hid_dev->subdriver_count; 124 130 125 131 return EOK; … … 138 144 } 139 145 146 assert(hid_dev->subdriver_count >= 0); 147 140 148 // set the init callback 141 hid_dev->subdrivers[0].init = usb_generic_hid_init; 149 hid_dev->subdrivers[hid_dev->subdriver_count].init = 150 usb_generic_hid_init; 142 151 143 152 // set the polling callback 144 hid_dev->subdrivers[0].poll = usb_generic_hid_polling_callback; 153 hid_dev->subdrivers[hid_dev->subdriver_count].poll = 154 usb_generic_hid_polling_callback; 145 155 146 156 // set the polling ended callback 147 hid_dev->subdrivers[ 0].poll_end = NULL;157 hid_dev->subdrivers[hid_dev->subdriver_count].poll_end = NULL; 148 158 149 159 // set the deinit callback 150 hid_dev->subdrivers[ 0].deinit = NULL;160 hid_dev->subdrivers[hid_dev->subdriver_count].deinit = NULL; 151 161 152 162 // set subdriver count 153 hid_dev->subdriver_count = 1;163 ++hid_dev->subdriver_count; 154 164 155 165 return EOK; … … 196 206 } 197 207 198 if (mapping->report_id >= 0) {199 usb_hid_report_path_set_report_id(usage_path,200 mapping->report_id);201 }208 // if (mapping->report_id >= 0) { 209 // usb_hid_report_path_set_report_id(usage_path, 210 // mapping->report_id); 211 // } 202 212 203 213 assert(hid_dev->report != NULL); … … 206 216 // size_t size = usb_hid_report_size(hid_dev->report, 0, 207 217 // USB_HID_REPORT_TYPE_INPUT); 208 size_t size = 0; 209 210 usb_hid_report_description_t *report_des = 211 usb_hid_report_find_description(hid_dev->report, 212 mapping->report_id, USB_HID_REPORT_TYPE_INPUT); 213 214 while(report_des != NULL) { 215 216 if((mapping->report_id) == 0 && (report_des->report_id != 0)) { 218 // size_t size = 0; 219 220 bool matches = false; 221 222 // usb_hid_report_description_t *report_des = 223 // usb_hid_report_find_description(hid_dev->report, 224 // mapping->report_id, USB_HID_REPORT_TYPE_INPUT); 225 uint8_t report_id = mapping->report_id; 226 227 /*while(report_des != NULL)*/do { 228 229 // if((mapping->report_id) == 0 && (report_des->report_id != 0)) { 230 // usb_hid_report_path_set_report_id(usage_path, 231 // report_des->report_id); 232 // } 233 234 usb_log_debug("Trying report id %u\n", report_id); 235 236 if (report_id != 0) { 217 237 usb_hid_report_path_set_report_id(usage_path, 218 report_des->report_id); 219 } 220 221 usb_hid_report_field_t *field = usb_hid_report_get_sibling ( 222 hid_dev->report, 223 NULL, usage_path, mapping->compare, 224 USB_HID_REPORT_TYPE_INPUT); 225 226 while(field != NULL) { 227 size++; 228 field = usb_hid_report_get_sibling (hid_dev->report, 229 field, usage_path, mapping->compare, 230 USB_HID_REPORT_TYPE_INPUT); 231 } 232 233 if((mapping->report_id == 0) && (report_des->report_id != 0)) { 234 uint8_t report_id = usb_hid_get_next_report_id( 235 hid_dev->report, report_des->report_id, 236 USB_HID_REPORT_TYPE_INPUT); 237 238 if(report_id == 0) { 239 break; 240 } 241 242 report_des = usb_hid_report_find_description( 243 hid_dev->report, report_id, 244 USB_HID_REPORT_TYPE_INPUT); 245 } 246 else { 238 report_id); 239 } 240 241 usb_hid_report_field_t *field = usb_hid_report_get_sibling( 242 hid_dev->report, 243 NULL, usage_path, mapping->compare, 244 USB_HID_REPORT_TYPE_INPUT); 245 246 usb_log_debug("Field: %p\n", field); 247 248 if (field != NULL) { 249 // size++; 250 // field = usb_hid_report_get_sibling(hid_dev->report, 251 // field, usage_path, mapping->compare, 252 // USB_HID_REPORT_TYPE_INPUT); 253 matches = true; 247 254 break; 248 255 } 249 } 250 251 usb_log_debug("Size of the input report: %zuB\n", size); 256 257 report_id = usb_hid_get_next_report_id( 258 hid_dev->report, report_id, 259 USB_HID_REPORT_TYPE_INPUT); 260 261 // if((mapping->report_id == 0) && (report_des->report_id != 0)) { 262 // uint8_t report_id = usb_hid_get_next_report_id( 263 // hid_dev->report, report_des->report_id, 264 // USB_HID_REPORT_TYPE_INPUT); 265 266 // if(report_id == 0) { 267 // break; 268 // } 269 270 // report_des = usb_hid_report_find_description( 271 // hid_dev->report, report_id, 272 // USB_HID_REPORT_TYPE_INPUT); 273 // } 274 // else { 275 // break; 276 // } 277 } while (!matches && report_id != 0); 278 279 // usb_log_debug("Size of the input report: %zu\n", size); 252 280 usb_hid_report_path_free(usage_path); 253 281 254 return (size > 0);282 return matches; 255 283 } 256 284 … … 401 429 402 430 do { 431 usb_log_debug("Getting size of the report.\n"); 403 432 size = usb_hid_report_byte_size(hid_dev->report, report_id, 404 433 USB_HID_REPORT_TYPE_INPUT); 405 434 usb_log_debug("Report ID: %u, size: %zu\n", report_id, size); 406 435 max_size = (size > max_size) ? size : max_size; 436 usb_log_debug("Getting next report ID\n"); 407 437 report_id = usb_hid_get_next_report_id(hid_dev->report, 408 438 report_id, USB_HID_REPORT_TYPE_INPUT); … … 534 564 hid_dev->subdriver_count); 535 565 //usb_hid_free(&hid_dev); 566 536 567 } else { 537 568 bool ok = false; … … 560 591 } 561 592 562 // save max input report size and allocate space for the report 563 rc = usb_hid_init_report(hid_dev); 564 if (rc != EOK) { 565 usb_log_error("Failed to initialize input report buffer.\n"); 566 } 593 594 if (rc == EOK) { 595 // save max input report size and allocate space for the report 596 rc = usb_hid_init_report(hid_dev); 597 if (rc != EOK) { 598 usb_log_error("Failed to initialize input report buffer" 599 ".\n"); 600 } 601 } 602 567 603 568 604 return rc; … … 587 623 usb_log_debug("Max input report size: %zu, buffer size: %zu\n", 588 624 hid_dev->max_input_report_size, buffer_size); 589 assert(hid_dev->max_input_report_size >= buffer_size); 590 591 // if (/*!allocated*/ 592 // /*|| *//*hid_dev->input_report_size < buffer_size*/) { 593 // uint8_t *input_old = hid_dev->input_report; 594 // uint8_t *input_new = (uint8_t *)malloc(buffer_size); 595 596 // if (input_new == NULL) { 597 // usb_log_error("Failed to allocate space for input " 598 // "buffer. This event may not be reported\n"); 599 // memset(hid_dev->input_report, 0, 600 // hid_dev->input_report_size); 601 // } else { 602 // memcpy(input_new, input_old, 603 // hid_dev->input_report_size); 604 // hid_dev->input_report = input_new; 605 // if (allocated) { 606 // free(input_old); 607 // } 608 // usb_hid_new_report(); 609 // } 610 // } 611 612 /*! @todo This should probably be atomic. */ 613 memcpy(hid_dev->input_report, buffer, buffer_size); 614 hid_dev->input_report_size = buffer_size; 615 usb_hid_new_report(hid_dev); 625 //assert(hid_dev->max_input_report_size >= buffer_size); 626 if (hid_dev->max_input_report_size >= buffer_size) { 627 /*! @todo This should probably be atomic. */ 628 memcpy(hid_dev->input_report, buffer, buffer_size); 629 hid_dev->input_report_size = buffer_size; 630 usb_hid_new_report(hid_dev); 631 } 616 632 617 633 bool cont = false;
Note:
See TracChangeset
for help on using the changeset viewer.
