Changes in uspace/drv/usbhid/hiddev.c [77ab674:24d943f] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbhid/hiddev.c
r77ab674 r24d943f 53 53 /* Non-API functions */ 54 54 /*----------------------------------------------------------------------------*/ 55 /** 56 * Retreives HID Report descriptor from the device. 57 * 58 * This function first parses the HID descriptor from the Interface descriptor 59 * to get the size of the Report descriptor and then requests the Report 60 * descriptor from the device. 61 * 62 * @param hid_dev HID device structure. 63 * @param config_desc Full configuration descriptor (including all nested 64 * descriptors). 65 * @param config_desc_size Size of the full configuration descriptor (in bytes). 66 * @param iface_desc Pointer to the interface descriptor inside the full 67 * configuration descriptor (@a config_desc) for the interface 68 * assigned with this device (@a hid_dev). 69 * 70 * @retval EOK if successful. 71 * @retval ENOENT if no HID descriptor could be found. 72 * @retval EINVAL if the HID descriptor or HID report descriptor have different 73 * size than expected. 74 * @retval ENOMEM if some allocation failed. 75 * @return Other value inherited from function usb_request_get_descriptor(). 76 * 77 * @sa usb_request_get_descriptor() 78 */ 55 79 56 static int usbhid_dev_get_report_descriptor(usbhid_dev_t *hid_dev, 80 57 uint8_t *config_desc, size_t config_desc_size, uint8_t *iface_desc) … … 164 141 165 142 /*----------------------------------------------------------------------------*/ 166 /** 167 * Retreives descriptors from the device, initializes pipes and stores 168 * important information from descriptors. 169 * 170 * Initializes the polling pipe described by the given endpoint description 171 * (@a poll_ep_desc). 172 * 173 * Information retreived from descriptors and stored in the HID device structure: 174 * - Assigned interface number (the interface controlled by this instance of 175 * the driver) 176 * - Polling interval (from the interface descriptor) 177 * - Report descriptor 178 * 179 * @param hid_dev HID device structure to be initialized. 180 * @param poll_ep_desc Description of the polling (Interrupt In) endpoint 181 * that has to be present in the device in order to 182 * successfuly initialize the structure. 183 * 184 * @sa usb_endpoint_pipe_initialize_from_configuration(), 185 * usbhid_dev_get_report_descriptor() 186 */ 143 187 144 static int usbhid_dev_process_descriptors(usbhid_dev_t *hid_dev, 188 145 usb_endpoint_description_t *poll_ep_desc) … … 273 230 /* API functions */ 274 231 /*----------------------------------------------------------------------------*/ 275 /** 276 * Creates new uninitialized HID device structure. 277 * 278 * @return Pointer to the new HID device structure, or NULL if an error occured. 279 */ 232 280 233 usbhid_dev_t *usbhid_dev_new(void) 281 234 { … … 296 249 297 250 /*----------------------------------------------------------------------------*/ 298 /** 299 * Properly destroys the HID device structure. 300 * 301 * @note Currently does not clean-up the used pipes, as there are no functions 302 * offering such functionality. 303 * 304 * @param hid_dev Pointer to the structure to be destroyed. 305 */ 251 306 252 void usbhid_dev_free(usbhid_dev_t **hid_dev) 307 253 { … … 326 272 327 273 /*----------------------------------------------------------------------------*/ 328 /** 329 * Initializes HID device structure. 330 * 331 * @param hid_dev HID device structure to be initialized. 332 * @param dev DDF device representing the HID device. 333 * @param poll_ep_desc Description of the polling (Interrupt In) endpoint 334 * that has to be present in the device in order to 335 * successfuly initialize the structure. 336 * 337 * @retval EOK if successful. 338 * @retval EINVAL if some argument is missing. 339 * @return Other value inherited from one of functions 340 * usb_device_connection_initialize_from_device(), 341 * usb_endpoint_pipe_initialize_default_control(), 342 * usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(), 343 * usbhid_dev_process_descriptors(). 344 * 345 * @sa usbhid_dev_process_descriptors() 346 */ 274 347 275 int usbhid_dev_init(usbhid_dev_t *hid_dev, ddf_dev_t *dev, 348 276 usb_endpoint_description_t *poll_ep_desc) … … 395 323 * Get descriptors, parse descriptors and save endpoints. 396 324 */ 397 rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe); 398 if (rc != EOK) { 399 usb_log_error("Failed to start session on the control pipe: %s" 400 ".\n", str_error(rc)); 401 return rc; 402 } 325 usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe); 403 326 404 327 rc = usbhid_dev_process_descriptors(hid_dev, poll_ep_desc); 405 if (rc != EOK) { 406 /* TODO: end session?? */ 328 329 usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe); 330 if (rc != EOK) { 407 331 usb_log_error("Failed to process descriptors: %s.\n", 408 332 str_error(rc)); 409 return rc;410 }411 412 rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);413 if (rc != EOK) {414 usb_log_warning("Failed to start session on the control pipe: "415 "%s.\n", str_error(rc));416 333 return rc; 417 334 }
Note:
See TracChangeset
for help on using the changeset viewer.