Index: uspace/lib/usbdev/src/devdrv.c =================================================================== --- uspace/lib/usbdev/src/devdrv.c (revision 086f8e3cf5291f49f36d971bad8d1e89c4d723fe) +++ uspace/lib/usbdev/src/devdrv.c (revision 585635856440deab73ad5891daab8fa87901aa68) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup libusbdev * @{ @@ -55,33 +56,43 @@ /** Connection to device on USB bus */ usb_dev_session_t *bus_session; + /** devman handle */ devman_handle_t handle; + /** The default control pipe. */ usb_pipe_t ctrl_pipe; - + /** Other endpoint pipes. + * * This is an array of other endpoint pipes in the same order as * in usb_driver_t. */ usb_endpoint_mapping_t *pipes; + /** Number of other endpoint pipes. */ size_t pipes_count; + /** Current interface. + * * Usually, drivers operate on single interface only. * This item contains the value of the interface or -1 for any. */ int interface_no; + /** Alternative interfaces. */ usb_alternate_interfaces_t alternate_interfaces; + /** Some useful descriptors for USB device. */ usb_device_descriptors_t descriptors; + /** Generic DDF device backing this one. DO NOT TOUCH! */ ddf_dev_t *ddf_dev; + /** Custom driver data. + * * Do not use the entry in generic device, that is already used * by the framework. */ void *driver_data; - } usb_device_t; @@ -135,5 +146,5 @@ return rc; } - + /* Change current alternative */ usb_dev->alternate_interfaces.current = alternate_setting; @@ -279,4 +290,5 @@ * * @param[in] usb_dev USB device. + * */ void usb_device_destroy_pipes(usb_device_t *usb_dev) @@ -284,4 +296,5 @@ assert(usb_dev); assert(usb_dev->pipes || usb_dev->pipes_count == 0); + /* Destroy the pipes. */ for (size_t i = 0; i < usb_dev->pipes_count; ++i) { @@ -291,4 +304,5 @@ usb_pipe_unregister(&usb_dev->pipes[i].pipe); } + free(usb_dev->pipes); usb_dev->pipes = NULL; @@ -448,7 +462,9 @@ assert(handle); assert(iface_no); + async_exch_t *exch = async_exchange_begin(sess); if (!exch) return EPARTY; + int ret = usb_get_my_device_handle(exch, handle); if (ret == EOK) { @@ -459,4 +475,5 @@ } } + async_exchange_end(exch); return ret; Index: uspace/lib/usbdev/src/devpoll.c =================================================================== --- uspace/lib/usbdev/src/devpoll.c (revision 086f8e3cf5291f49f36d971bad8d1e89c4d723fe) +++ uspace/lib/usbdev/src/devpoll.c (revision 585635856440deab73ad5891daab8fa87901aa68) @@ -33,4 +33,5 @@ * USB device driver framework - automatic interrupt polling. */ + #include #include @@ -85,6 +86,6 @@ if (params->debug > 0) { - const usb_endpoint_mapping_t *mapping - = data->polling_mapping; + const usb_endpoint_mapping_t *mapping = + data->polling_mapping; usb_log_debug("Poll (%p): started polling of `%s' - " \ "interface %d (%s,%d,%d), %zuB/%zu.\n", @@ -154,7 +155,8 @@ /* Take a rest before next request. */ - //TODO: This is broken, the time is in ms not us. + + // FIXME TODO: This is broken, the time is in ms not us. // but first we need to fix drivers to actually stop using this, - // since polling dealy should be implemented in HC schedule + // since polling delay should be implemented in HC schedule async_usleep(params->delay); } @@ -213,9 +215,9 @@ if (request_size == 0) return EINVAL; - + if (!epm || (epm->pipe.transfer_type != USB_TRANSFER_INTERRUPT) || (epm->pipe.direction != USB_DIRECTION_IN)) return EINVAL; - + polling_data_t *polling_data = malloc(sizeof(polling_data_t)); Index: uspace/lib/usbdev/src/pipes.c =================================================================== --- uspace/lib/usbdev/src/pipes.c (revision 086f8e3cf5291f49f36d971bad8d1e89c4d723fe) +++ uspace/lib/usbdev/src/pipes.c (revision 585635856440deab73ad5891daab8fa87901aa68) @@ -98,6 +98,6 @@ async_exch_t *exch = async_exchange_begin(pipe->bus_session); size_t act_size = 0; - const int rc = usb_read(exch, - pipe->endpoint_no, setup_packet, buffer, buffer_size, &act_size); + const int rc = usb_read(exch, pipe->endpoint_no, setup_packet, buffer, + buffer_size, &act_size); async_exchange_end(exch); Index: uspace/lib/usbdev/src/pipesinit.c =================================================================== --- uspace/lib/usbdev/src/pipesinit.c (revision 086f8e3cf5291f49f36d971bad8d1e89c4d723fe) +++ uspace/lib/usbdev/src/pipesinit.c (revision 585635856440deab73ad5891daab8fa87901aa68) @@ -286,10 +286,9 @@ usb_dev_session_t *bus_session) { - - if (config_descriptor == NULL) { + if (config_descriptor == NULL) return EBADMEM; - } - if (config_descriptor_size - < sizeof(usb_standard_configuration_descriptor_t)) { + + if (config_descriptor_size < + sizeof(usb_standard_configuration_descriptor_t)) { return ERANGE; } Index: uspace/lib/usbdev/src/recognise.c =================================================================== --- uspace/lib/usbdev/src/recognise.c (revision 086f8e3cf5291f49f36d971bad8d1e89c4d723fe) +++ uspace/lib/usbdev/src/recognise.c (revision 585635856440deab73ad5891daab8fa87901aa68) @@ -234,5 +234,5 @@ (int) device_descriptor->product_id, BCD_ARGS(device_descriptor->device_version)); - + /* Next, without release number. */ ADD_MATCHID_OR_RETURN(matches, 90, @@ -245,5 +245,5 @@ ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s", usb_str_class(device_descriptor->device_class)); - + /* As a last resort, try fallback driver. */ ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback"); Index: uspace/lib/usbdev/src/request.c =================================================================== --- uspace/lib/usbdev/src/request.c (revision 086f8e3cf5291f49f36d971bad8d1e89c4d723fe) +++ uspace/lib/usbdev/src/request.c (revision 585635856440deab73ad5891daab8fa87901aa68) @@ -50,19 +50,21 @@ * @see usb_pipe_control_write * - * @param pipe Pipe used for the communication. + * @param pipe Pipe used for the communication. * @param request_type Request type (standard/class/vendor). - * @param recipient Request recipient (e.g. device or endpoint). - * @param request Actual request (e.g. GET_DESCRIPTOR). - * @param value Value of @c wValue field of setup packet - * (must be in USB endianness). - * @param index Value of @c wIndex field of setup packet - * (must be in USB endianness). - * @param data Data to be sent during DATA stage - * (expected to be in USB endianness). - * @param data_size Size of the @p data buffer (in native endianness). + * @param recipient Request recipient (e.g. device or endpoint). + * @param request Actual request (e.g. GET_DESCRIPTOR). + * @param value Value of @c wValue field of setup packet + * (must be in USB endianness). + * @param index Value of @c wIndex field of setup packet + * (must be in USB endianness). + * @param data Data to be sent during DATA stage + * (expected to be in USB endianness). + * @param data_size Size of the @p data buffer (in native endianness). + * * @return Error code. * @retval EBADMEM @p pipe is NULL. * @retval EBADMEM @p data is NULL and @p data_size is not zero. * @retval ERANGE Data buffer too large. + * */ int usb_control_request_set(usb_pipe_t *pipe, @@ -100,27 +102,29 @@ } - /** Generic wrapper for GET requests using standard control request format. - * - * @see usb_pipe_control_read - * - * @param pipe Pipe used for the communication. - * @param request_type Request type (standard/class/vendor). - * @param recipient Request recipient (e.g. device or endpoint). - * @param request Actual request (e.g. GET_DESCRIPTOR). - * @param value Value of @c wValue field of setup packet - * (must be in USB endianness). - * @param index Value of @c wIndex field of setup packet - * (must be in USB endianness). - * @param data Buffer where to store data accepted during the DATA stage. - * (they will come in USB endianness). - * @param data_size Size of the @p data buffer - * (in native endianness). - * @param actual_data_size Actual size of transfered data - * (in native endianness). - * @return Error code. - * @retval EBADMEM @p pipe is NULL. - * @retval EBADMEM @p data is NULL and @p data_size is not zero. - * @retval ERANGE Data buffer too large. - */ +/** Generic wrapper for GET requests using standard control request format. + * + * @see usb_pipe_control_read + * + * @param pipe Pipe used for the communication. + * @param request_type Request type (standard/class/vendor). + * @param recipient Request recipient (e.g. device or endpoint). + * @param request Actual request (e.g. GET_DESCRIPTOR). + * @param value Value of @c wValue field of setup packet + * (must be in USB endianness). + * @param index Value of @c wIndex field of setup packet + * (must be in USB endianness). + * @param data Buffer where to store data accepted during + * the DATA stage (they will come in USB endianness). + * @param data_size Size of the @p data buffer + * (in native endianness). + * @param actual_data_size Actual size of transfered data + * (in native endianness). + * + * @return Error code. + * @retval EBADMEM @p pipe is NULL. + * @retval EBADMEM @p data is NULL and @p data_size is not zero. + * @retval ERANGE Data buffer too large. + * + */ int usb_control_request_get(usb_pipe_t *pipe, usb_request_type_t request_type, usb_request_recipient_t recipient, @@ -209,6 +213,5 @@ { if (request_type == USB_REQUEST_TYPE_STANDARD) { - if ((recipient == USB_REQUEST_RECIPIENT_DEVICE) && (index != 0)) - { + if ((recipient == USB_REQUEST_RECIPIENT_DEVICE) && (index != 0)) { return EINVAL; } @@ -234,6 +237,5 @@ { if (request_type == USB_REQUEST_TYPE_STANDARD) { - if ((recipient == USB_REQUEST_RECIPIENT_DEVICE) && (index != 0)) - { + if ((recipient == USB_REQUEST_RECIPIENT_DEVICE) && (index != 0)) { return EINVAL; } @@ -271,5 +273,6 @@ } - /* The wValue field specifies the descriptor type in the high byte + /* + * The wValue field specifies the descriptor type in the high byte * and the descriptor index in the low byte. USB 1.1 spec p. 189 */