Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e) +++ uspace/lib/drv/generic/remote_usbhc.c (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -540,4 +540,5 @@ .endpoint = DEV_IPC_GET_ARG2(*call) }; + size_t data_buffer_len = DEV_IPC_GET_ARG3(*call); int rc; @@ -546,5 +547,4 @@ void *data_buffer = NULL; size_t setup_packet_len = 0; - size_t data_buffer_len = 0; rc = async_data_write_accept(&setup_packet, false, @@ -554,10 +554,13 @@ return; } - rc = async_data_write_accept(&data_buffer, false, - 1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len); - if (rc != EOK) { - async_answer_0(callid, rc); - free(setup_packet); - return; + + if (data_buffer_len > 0) { + rc = async_data_write_accept(&data_buffer, false, + 1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len); + if (rc != EOK) { + async_answer_0(callid, rc); + free(setup_packet); + return; + } } @@ -596,5 +599,4 @@ } - size_t data_len = DEV_IPC_GET_ARG3(*call); usb_target_t target = { .address = DEV_IPC_GET_ARG1(*call), @@ -606,4 +608,5 @@ void *setup_packet = NULL; size_t setup_packet_len = 0; + size_t data_len = 0; rc = async_data_write_accept(&setup_packet, false, Index: uspace/lib/usb/Makefile =================================================================== --- uspace/lib/usb/Makefile (revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e) +++ uspace/lib/usb/Makefile (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -42,4 +42,5 @@ src/pipes.c \ src/pipesinit.c \ + src/pipesio.c \ src/recognise.c \ src/request.c \ Index: uspace/lib/usb/include/usb/recognise.h =================================================================== --- uspace/lib/usb/include/usb/recognise.h (revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e) +++ uspace/lib/usb/include/usb/recognise.h (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -39,4 +39,5 @@ #include #include +#include int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *); Index: uspace/lib/usb/src/pipes.c =================================================================== --- uspace/lib/usb/src/pipes.c (revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e) +++ uspace/lib/usb/src/pipes.c (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -31,14 +31,5 @@ */ /** @file - * Communication between device drivers and host controller driver. - * - * Note on synchronousness of the operations: there is ABSOLUTELY NO - * guarantee that a call to particular function will not trigger a fibril - * switch. - * The initialization functions may actually involve contacting some other - * task, starting/ending a session might involve asynchronous IPC and since - * the transfer functions uses IPC, asynchronous nature of them is obvious. - * The pseudo synchronous versions for the transfers internally call the - * asynchronous ones and so fibril switch is possible in them as well. + * USB endpoint pipes miscellaneous functions. */ #include @@ -47,10 +38,4 @@ #include #include - -#define _PREPARE_TARGET(varname, pipe) \ - usb_target_t varname = { \ - .address = (pipe)->wire->address, \ - .endpoint = (pipe)->endpoint_no \ - } /** Initialize connection to USB device. @@ -117,51 +102,4 @@ } -/** Initialize USB endpoint pipe. - * - * @param pipe Endpoint pipe to be initialized. - * @param connection Connection to the USB device backing this pipe (the wire). - * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15). - * @param transfer_type Transfer type (e.g. interrupt or bulk). - * @param max_packet_size Maximum packet size in bytes. - * @param direction Endpoint direction (in/out). - * @return Error code. - */ -int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe, - usb_device_connection_t *connection, usb_endpoint_t endpoint_no, - usb_transfer_type_t transfer_type, size_t max_packet_size, - usb_direction_t direction) -{ - assert(pipe); - assert(connection); - - pipe->wire = connection; - pipe->hc_phone = -1; - pipe->endpoint_no = endpoint_no; - pipe->transfer_type = transfer_type; - pipe->max_packet_size = max_packet_size; - pipe->direction = direction; - - return EOK; -} - - -/** Initialize USB endpoint pipe as the default zero control pipe. - * - * @param pipe Endpoint pipe to be initialized. - * @param connection Connection to the USB device backing this pipe (the wire). - * @return Error code. - */ -int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *pipe, - usb_device_connection_t *connection) -{ - assert(pipe); - assert(connection); - - int rc = usb_endpoint_pipe_initialize(pipe, connection, - 0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH); - - return rc; -} - /** Start a session on the endpoint pipe. @@ -224,305 +162,4 @@ } - -/** Request a read (in) transfer on an endpoint pipe. - * - * @param[in] pipe Pipe used for the transfer. - * @param[out] buffer Buffer where to store the data. - * @param[in] size Size of the buffer (in bytes). - * @param[out] size_transfered Number of bytes that were actually transfered. - * @return Error code. - */ -int usb_endpoint_pipe_read(usb_endpoint_pipe_t *pipe, - void *buffer, size_t size, size_t *size_transfered) -{ - assert(pipe); - - int rc; - usb_handle_t handle; - - rc = usb_endpoint_pipe_async_read(pipe, buffer, size, size_transfered, - &handle); - if (rc != EOK) { - return rc; - } - - rc = usb_endpoint_pipe_wait_for(pipe, handle); - return rc; -} - -/** Request a write (out) transfer on an endpoint pipe. - * - * @param[in] pipe Pipe used for the transfer. - * @param[in] buffer Buffer with data to transfer. - * @param[in] size Size of the buffer (in bytes). - * @return Error code. - */ -int usb_endpoint_pipe_write(usb_endpoint_pipe_t *pipe, - void *buffer, size_t size) -{ - assert(pipe); - - int rc; - usb_handle_t handle; - - rc = usb_endpoint_pipe_async_write(pipe, buffer, size, &handle); - if (rc != EOK) { - return rc; - } - - rc = usb_endpoint_pipe_wait_for(pipe, handle); - return rc; -} - - -/** Request a control read transfer on an endpoint pipe. - * - * This function encapsulates all three stages of a control transfer. - * - * @param[in] pipe Pipe used for the transfer. - * @param[in] setup_buffer Buffer with the setup packet. - * @param[in] setup_buffer_size Size of the setup packet (in bytes). - * @param[out] data_buffer Buffer for incoming data. - * @param[in] data_buffer_size Size of the buffer for incoming data (in bytes). - * @param[out] data_transfered_size Number of bytes that were actually - * transfered during the DATA stage. - * @return Error code. - */ -int usb_endpoint_pipe_control_read(usb_endpoint_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, - void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) -{ - assert(pipe); - - int rc; - usb_handle_t handle; - - rc = usb_endpoint_pipe_async_control_read(pipe, - setup_buffer, setup_buffer_size, - data_buffer, data_buffer_size, data_transfered_size, - &handle); - if (rc != EOK) { - return rc; - } - - rc = usb_endpoint_pipe_wait_for(pipe, handle); - return rc; -} - - -/** Request a control write transfer on an endpoint pipe. - * - * This function encapsulates all three stages of a control transfer. - * - * @param[in] pipe Pipe used for the transfer. - * @param[in] setup_buffer Buffer with the setup packet. - * @param[in] setup_buffer_size Size of the setup packet (in bytes). - * @param[in] data_buffer Buffer with data to be sent. - * @param[in] data_buffer_size Size of the buffer with outgoing data (in bytes). - * @return Error code. - */ -int usb_endpoint_pipe_control_write(usb_endpoint_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, - void *data_buffer, size_t data_buffer_size) -{ - assert(pipe); - - int rc; - usb_handle_t handle; - - rc = usb_endpoint_pipe_async_control_write(pipe, - setup_buffer, setup_buffer_size, - data_buffer, data_buffer_size, - &handle); - if (rc != EOK) { - return rc; - } - - rc = usb_endpoint_pipe_wait_for(pipe, handle); - return rc; -} - - -/** Request a read (in) transfer on an endpoint pipe (asynchronous version). - * - * @param[in] pipe Pipe used for the transfer. - * @param[out] buffer Buffer where to store the data. - * @param[in] size Size of the buffer (in bytes). - * @param[out] size_transfered Number of bytes that were actually transfered. - * @param[out] handle Handle of the transfer. - * @return Error code. - */ -int usb_endpoint_pipe_async_read(usb_endpoint_pipe_t *pipe, - void *buffer, size_t size, size_t *size_transfered, - usb_handle_t *handle) -{ - assert(pipe); - - if (pipe->hc_phone < 0) { - return EBADF; - } - - if (pipe->direction != USB_DIRECTION_IN) { - return EBADF; - } - - int rc; - _PREPARE_TARGET(target, pipe); - - switch (pipe->transfer_type) { - case USB_TRANSFER_INTERRUPT: - rc = usb_drv_async_interrupt_in(pipe->hc_phone, target, - buffer, size, size_transfered, handle); - break; - case USB_TRANSFER_CONTROL: - rc = EBADF; - break; - default: - rc = ENOTSUP; - break; - } - - return rc; -} - - -/** Request a write (out) transfer on an endpoint pipe (asynchronous version). - * - * @param[in] pipe Pipe used for the transfer. - * @param[in] buffer Buffer with data to transfer. - * @param[in] size Size of the buffer (in bytes). - * @param[out] handle Handle of the transfer. - * @return Error code. - */ -int usb_endpoint_pipe_async_write(usb_endpoint_pipe_t *pipe, - void *buffer, size_t size, - usb_handle_t *handle) -{ - assert(pipe); - - if (pipe->hc_phone < 0) { - return EBADF; - } - - if (pipe->direction != USB_DIRECTION_OUT) { - return EBADF; - } - - int rc; - _PREPARE_TARGET(target, pipe); - - switch (pipe->transfer_type) { - case USB_TRANSFER_INTERRUPT: - rc = usb_drv_async_interrupt_out(pipe->hc_phone, target, - buffer, size, handle); - break; - case USB_TRANSFER_CONTROL: - rc = EBADF; - break; - default: - rc = ENOTSUP; - break; - } - - return rc; -} - - -/** Request a control read transfer on an endpoint pipe (asynchronous version). - * - * This function encapsulates all three stages of a control transfer. - * - * @param[in] pipe Pipe used for the transfer. - * @param[in] setup_buffer Buffer with the setup packet. - * @param[in] setup_buffer_size Size of the setup packet (in bytes). - * @param[out] data_buffer Buffer for incoming data. - * @param[in] data_buffer_size Size of the buffer for incoming data (in bytes). - * @param[out] data_transfered_size Number of bytes that were actually - * transfered during the DATA stage. - * @param[out] handle Handle of the transfer. - * @return Error code. - */ -int usb_endpoint_pipe_async_control_read(usb_endpoint_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, - void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size, - usb_handle_t *handle) -{ - assert(pipe); - - if (pipe->hc_phone < 0) { - return EBADF; - } - - if ((pipe->direction != USB_DIRECTION_BOTH) - || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { - return EBADF; - } - - int rc; - _PREPARE_TARGET(target, pipe); - - rc = usb_drv_async_control_read(pipe->hc_phone, target, - setup_buffer, setup_buffer_size, - data_buffer, data_buffer_size, data_transfered_size, - handle); - - return rc; -} - - -/** Request a control write transfer on an endpoint pipe (asynchronous version). - * - * This function encapsulates all three stages of a control transfer. - * - * @param[in] pipe Pipe used for the transfer. - * @param[in] setup_buffer Buffer with the setup packet. - * @param[in] setup_buffer_size Size of the setup packet (in bytes). - * @param[in] data_buffer Buffer with data to be sent. - * @param[in] data_buffer_size Size of the buffer with outgoing data (in bytes). - * @param[out] handle Handle of the transfer. - * @return Error code. - */ -int usb_endpoint_pipe_async_control_write(usb_endpoint_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, - void *data_buffer, size_t data_buffer_size, - usb_handle_t *handle) -{ - assert(pipe); - - if (pipe->hc_phone < 0) { - return EBADF; - } - - if ((pipe->direction != USB_DIRECTION_BOTH) - || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { - return EBADF; - } - - int rc; - _PREPARE_TARGET(target, pipe); - - rc = usb_drv_async_control_write(pipe->hc_phone, target, - setup_buffer, setup_buffer_size, - data_buffer, data_buffer_size, - handle); - - return rc; -} - -/** Wait for transfer completion. - * - * The function blocks the caller fibril until the transfer associated - * with given @p handle is completed. - * - * @param[in] pipe Pipe the transfer executed on. - * @param[in] handle Transfer handle. - * @return Error code. - */ -int usb_endpoint_pipe_wait_for(usb_endpoint_pipe_t *pipe, usb_handle_t handle) -{ - return usb_drv_async_wait_for(handle); -} - - /** * @} Index: uspace/lib/usb/src/pipesinit.c =================================================================== --- uspace/lib/usb/src/pipesinit.c (revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e) +++ uspace/lib/usb/src/pipesinit.c (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -320,4 +320,51 @@ } +/** Initialize USB endpoint pipe. + * + * @param pipe Endpoint pipe to be initialized. + * @param connection Connection to the USB device backing this pipe (the wire). + * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15). + * @param transfer_type Transfer type (e.g. interrupt or bulk). + * @param max_packet_size Maximum packet size in bytes. + * @param direction Endpoint direction (in/out). + * @return Error code. + */ +int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe, + usb_device_connection_t *connection, usb_endpoint_t endpoint_no, + usb_transfer_type_t transfer_type, size_t max_packet_size, + usb_direction_t direction) +{ + assert(pipe); + assert(connection); + + pipe->wire = connection; + pipe->hc_phone = -1; + pipe->endpoint_no = endpoint_no; + pipe->transfer_type = transfer_type; + pipe->max_packet_size = max_packet_size; + pipe->direction = direction; + + return EOK; +} + + +/** Initialize USB endpoint pipe as the default zero control pipe. + * + * @param pipe Endpoint pipe to be initialized. + * @param connection Connection to the USB device backing this pipe (the wire). + * @return Error code. + */ +int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *pipe, + usb_device_connection_t *connection) +{ + assert(pipe); + assert(connection); + + int rc = usb_endpoint_pipe_initialize(pipe, connection, + 0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH); + + return rc; +} + /** * @} Index: uspace/lib/usb/src/pipesio.c =================================================================== --- uspace/lib/usb/src/pipesio.c (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) +++ uspace/lib/usb/src/pipesio.c (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -0,0 +1,359 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libusb + * @{ + */ +/** @file + * Input and output functions (reads and writes) on endpoint pipes. + * + * Note on synchronousness of the operations: there is ABSOLUTELY NO + * guarantee that a call to particular function will not trigger a fibril + * switch. + * The initialization functions may actually involve contacting some other + * task, starting/ending a session might involve asynchronous IPC and since + * the transfer functions uses IPC, asynchronous nature of them is obvious. + * The pseudo synchronous versions for the transfers internally call the + * asynchronous ones and so fibril switch is possible in them as well. + */ +#include +#include +#include +#include +#include + +#define _PREPARE_TARGET(varname, pipe) \ + usb_target_t varname = { \ + .address = (pipe)->wire->address, \ + .endpoint = (pipe)->endpoint_no \ + } + + +/** Request a read (in) transfer on an endpoint pipe. + * + * @param[in] pipe Pipe used for the transfer. + * @param[out] buffer Buffer where to store the data. + * @param[in] size Size of the buffer (in bytes). + * @param[out] size_transfered Number of bytes that were actually transfered. + * @return Error code. + */ +int usb_endpoint_pipe_read(usb_endpoint_pipe_t *pipe, + void *buffer, size_t size, size_t *size_transfered) +{ + assert(pipe); + + int rc; + usb_handle_t handle; + + rc = usb_endpoint_pipe_async_read(pipe, buffer, size, size_transfered, + &handle); + if (rc != EOK) { + return rc; + } + + rc = usb_endpoint_pipe_wait_for(pipe, handle); + return rc; +} + +/** Request a write (out) transfer on an endpoint pipe. + * + * @param[in] pipe Pipe used for the transfer. + * @param[in] buffer Buffer with data to transfer. + * @param[in] size Size of the buffer (in bytes). + * @return Error code. + */ +int usb_endpoint_pipe_write(usb_endpoint_pipe_t *pipe, + void *buffer, size_t size) +{ + assert(pipe); + + int rc; + usb_handle_t handle; + + rc = usb_endpoint_pipe_async_write(pipe, buffer, size, &handle); + if (rc != EOK) { + return rc; + } + + rc = usb_endpoint_pipe_wait_for(pipe, handle); + return rc; +} + + +/** Request a control read transfer on an endpoint pipe. + * + * This function encapsulates all three stages of a control transfer. + * + * @param[in] pipe Pipe used for the transfer. + * @param[in] setup_buffer Buffer with the setup packet. + * @param[in] setup_buffer_size Size of the setup packet (in bytes). + * @param[out] data_buffer Buffer for incoming data. + * @param[in] data_buffer_size Size of the buffer for incoming data (in bytes). + * @param[out] data_transfered_size Number of bytes that were actually + * transfered during the DATA stage. + * @return Error code. + */ +int usb_endpoint_pipe_control_read(usb_endpoint_pipe_t *pipe, + void *setup_buffer, size_t setup_buffer_size, + void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) +{ + assert(pipe); + + int rc; + usb_handle_t handle; + + rc = usb_endpoint_pipe_async_control_read(pipe, + setup_buffer, setup_buffer_size, + data_buffer, data_buffer_size, data_transfered_size, + &handle); + if (rc != EOK) { + return rc; + } + + rc = usb_endpoint_pipe_wait_for(pipe, handle); + return rc; +} + + +/** Request a control write transfer on an endpoint pipe. + * + * This function encapsulates all three stages of a control transfer. + * + * @param[in] pipe Pipe used for the transfer. + * @param[in] setup_buffer Buffer with the setup packet. + * @param[in] setup_buffer_size Size of the setup packet (in bytes). + * @param[in] data_buffer Buffer with data to be sent. + * @param[in] data_buffer_size Size of the buffer with outgoing data (in bytes). + * @return Error code. + */ +int usb_endpoint_pipe_control_write(usb_endpoint_pipe_t *pipe, + void *setup_buffer, size_t setup_buffer_size, + void *data_buffer, size_t data_buffer_size) +{ + assert(pipe); + + int rc; + usb_handle_t handle; + + rc = usb_endpoint_pipe_async_control_write(pipe, + setup_buffer, setup_buffer_size, + data_buffer, data_buffer_size, + &handle); + if (rc != EOK) { + return rc; + } + + rc = usb_endpoint_pipe_wait_for(pipe, handle); + return rc; +} + + +/** Request a read (in) transfer on an endpoint pipe (asynchronous version). + * + * @param[in] pipe Pipe used for the transfer. + * @param[out] buffer Buffer where to store the data. + * @param[in] size Size of the buffer (in bytes). + * @param[out] size_transfered Number of bytes that were actually transfered. + * @param[out] handle Handle of the transfer. + * @return Error code. + */ +int usb_endpoint_pipe_async_read(usb_endpoint_pipe_t *pipe, + void *buffer, size_t size, size_t *size_transfered, + usb_handle_t *handle) +{ + assert(pipe); + + if (pipe->hc_phone < 0) { + return EBADF; + } + + if (pipe->direction != USB_DIRECTION_IN) { + return EBADF; + } + + int rc; + _PREPARE_TARGET(target, pipe); + + switch (pipe->transfer_type) { + case USB_TRANSFER_INTERRUPT: + rc = usb_drv_async_interrupt_in(pipe->hc_phone, target, + buffer, size, size_transfered, handle); + break; + case USB_TRANSFER_CONTROL: + rc = EBADF; + break; + default: + rc = ENOTSUP; + break; + } + + return rc; +} + + +/** Request a write (out) transfer on an endpoint pipe (asynchronous version). + * + * @param[in] pipe Pipe used for the transfer. + * @param[in] buffer Buffer with data to transfer. + * @param[in] size Size of the buffer (in bytes). + * @param[out] handle Handle of the transfer. + * @return Error code. + */ +int usb_endpoint_pipe_async_write(usb_endpoint_pipe_t *pipe, + void *buffer, size_t size, + usb_handle_t *handle) +{ + assert(pipe); + + if (pipe->hc_phone < 0) { + return EBADF; + } + + if (pipe->direction != USB_DIRECTION_OUT) { + return EBADF; + } + + int rc; + _PREPARE_TARGET(target, pipe); + + switch (pipe->transfer_type) { + case USB_TRANSFER_INTERRUPT: + rc = usb_drv_async_interrupt_out(pipe->hc_phone, target, + buffer, size, handle); + break; + case USB_TRANSFER_CONTROL: + rc = EBADF; + break; + default: + rc = ENOTSUP; + break; + } + + return rc; +} + + +/** Request a control read transfer on an endpoint pipe (asynchronous version). + * + * This function encapsulates all three stages of a control transfer. + * + * @param[in] pipe Pipe used for the transfer. + * @param[in] setup_buffer Buffer with the setup packet. + * @param[in] setup_buffer_size Size of the setup packet (in bytes). + * @param[out] data_buffer Buffer for incoming data. + * @param[in] data_buffer_size Size of the buffer for incoming data (in bytes). + * @param[out] data_transfered_size Number of bytes that were actually + * transfered during the DATA stage. + * @param[out] handle Handle of the transfer. + * @return Error code. + */ +int usb_endpoint_pipe_async_control_read(usb_endpoint_pipe_t *pipe, + void *setup_buffer, size_t setup_buffer_size, + void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size, + usb_handle_t *handle) +{ + assert(pipe); + + if (pipe->hc_phone < 0) { + return EBADF; + } + + if ((pipe->direction != USB_DIRECTION_BOTH) + || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { + return EBADF; + } + + int rc; + _PREPARE_TARGET(target, pipe); + + rc = usb_drv_async_control_read(pipe->hc_phone, target, + setup_buffer, setup_buffer_size, + data_buffer, data_buffer_size, data_transfered_size, + handle); + + return rc; +} + + +/** Request a control write transfer on an endpoint pipe (asynchronous version). + * + * This function encapsulates all three stages of a control transfer. + * + * @param[in] pipe Pipe used for the transfer. + * @param[in] setup_buffer Buffer with the setup packet. + * @param[in] setup_buffer_size Size of the setup packet (in bytes). + * @param[in] data_buffer Buffer with data to be sent. + * @param[in] data_buffer_size Size of the buffer with outgoing data (in bytes). + * @param[out] handle Handle of the transfer. + * @return Error code. + */ +int usb_endpoint_pipe_async_control_write(usb_endpoint_pipe_t *pipe, + void *setup_buffer, size_t setup_buffer_size, + void *data_buffer, size_t data_buffer_size, + usb_handle_t *handle) +{ + assert(pipe); + + if (pipe->hc_phone < 0) { + return EBADF; + } + + if ((pipe->direction != USB_DIRECTION_BOTH) + || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { + return EBADF; + } + + int rc; + _PREPARE_TARGET(target, pipe); + + rc = usb_drv_async_control_write(pipe->hc_phone, target, + setup_buffer, setup_buffer_size, + data_buffer, data_buffer_size, + handle); + + return rc; +} + +/** Wait for transfer completion. + * + * The function blocks the caller fibril until the transfer associated + * with given @p handle is completed. + * + * @param[in] pipe Pipe the transfer executed on. + * @param[in] handle Transfer handle. + * @return Error code. + */ +int usb_endpoint_pipe_wait_for(usb_endpoint_pipe_t *pipe, usb_handle_t handle) +{ + return usb_drv_async_wait_for(handle); +} + + +/** + * @} + */ Index: uspace/lib/usb/src/usbdrv.c =================================================================== --- uspace/lib/usb/src/usbdrv.c (revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e) +++ uspace/lib/usb/src/usbdrv.c (revision b53ca1e5af11c50fcb9c1998cfd8bd46654c135f) @@ -464,6 +464,6 @@ assert(setup_packet != NULL); assert(setup_packet_size > 0); - assert(buffer != NULL); - assert(buffer_size > 0); + assert(((buffer != NULL) && (buffer_size > 0)) + || ((buffer == NULL) && (buffer_size == 0))); assert(handle != NULL); @@ -494,8 +494,10 @@ } - rc = async_data_write_start(phone, buffer, buffer_size); - if (rc != EOK) { - async_wait_for(transfer->request, NULL); - return rc; + if (buffer_size > 0) { + rc = async_data_write_start(phone, buffer, buffer_size); + if (rc != EOK) { + async_wait_for(transfer->request, NULL); + return rc; + } }