Changes in uspace/drv/usbhid/hiddev.c [3954a63b:00b13408] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbhid/hiddev.c
r3954a63b r00b13408 184 184 * successfuly initialize the structure. 185 185 * 186 * @sa usb_ pipe_initialize_from_configuration(),186 * @sa usb_endpoint_pipe_initialize_from_configuration(), 187 187 * usbhid_dev_get_report_descriptor() 188 188 */ … … 218 218 }; 219 219 220 rc = usb_ pipe_initialize_from_configuration(220 rc = usb_endpoint_pipe_initialize_from_configuration( 221 221 endpoint_mapping, 1, descriptors, descriptors_size, 222 222 &hid_dev->wire); … … 359 359 * @return Other value inherited from one of functions 360 360 * usb_device_connection_initialize_from_device(), 361 * usb_ pipe_initialize_default_control(),362 * usb_ pipe_start_session(), usb_pipe_end_session(),361 * usb_endpoint_pipe_initialize_default_control(), 362 * usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(), 363 363 * usbhid_dev_process_descriptors(). 364 364 * … … 404 404 * Initialize device pipes. 405 405 */ 406 rc = usb_ pipe_initialize_default_control(&hid_dev->ctrl_pipe,406 rc = usb_endpoint_pipe_initialize_default_control(&hid_dev->ctrl_pipe, 407 407 &hid_dev->wire); 408 408 if (rc != EOK) { … … 411 411 return rc; 412 412 } 413 rc = usb_ pipe_probe_default_control(&hid_dev->ctrl_pipe);413 rc = usb_endpoint_pipe_probe_default_control(&hid_dev->ctrl_pipe); 414 414 if (rc != EOK) { 415 415 usb_log_error("Probing default control pipe failed: %s.\n", … … 430 430 * Get descriptors, parse descriptors and save endpoints. 431 431 */ 432 rc = usb_ pipe_start_session(&hid_dev->ctrl_pipe);432 rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe); 433 433 if (rc != EOK) { 434 434 usb_log_error("Failed to start session on the control pipe: %s" … … 440 440 if (rc != EOK) { 441 441 /* TODO: end session?? */ 442 usb_ pipe_end_session(&hid_dev->ctrl_pipe);442 usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe); 443 443 usb_log_error("Failed to process descriptors: %s.\n", 444 444 str_error(rc)); … … 446 446 } 447 447 448 rc = usb_ pipe_end_session(&hid_dev->ctrl_pipe);448 rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe); 449 449 if (rc != EOK) { 450 450 usb_log_warning("Failed to start session on the control pipe: "
Note:
See TracChangeset
for help on using the changeset viewer.