Changeset 63517c2 in mainline for uspace/drv/usbhid/usbhid.c
- Timestamp:
- 2011-04-21T08:33:44Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 020559c9
- Parents:
- da1dd48 (diff), e50cd7f (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/drv/usbhid/usbhid.c
rda1dd48 r63517c2 341 341 } 342 342 343 hid_dev->parser = (usb_hid_report_ parser_t *)(malloc(sizeof(344 usb_hid_report_ parser_t)));343 hid_dev->parser = (usb_hid_report_t *)(malloc(sizeof( 344 usb_hid_report_t))); 345 345 if (hid_dev->parser == NULL) { 346 346 usb_log_fatal("No memory!\n"); … … 382 382 return rc; 383 383 } 384 385 /* Initialize the report parser. */ 386 rc = usb_hid_parser_init(hid_dev->parser); 387 if (rc != EOK) { 388 usb_log_error("Failed to initialize report parser.\n"); 389 //usb_hid_free(&hid_dev); 390 return rc; 391 } 392 384 393 385 /* Get the report descriptor and parse it. */ 394 386 rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, … … 592 584 // destroy the parser 593 585 if ((*hid_dev)->parser != NULL) { 594 usb_hid_free_report _parser((*hid_dev)->parser);586 usb_hid_free_report((*hid_dev)->parser); 595 587 } 596 588
Note:
See TracChangeset
for help on using the changeset viewer.