Index: uspace/lib/usbdev/Makefile =================================================================== --- uspace/lib/usbdev/Makefile (revision 277ff98f1f6a1813dcfb5789838b012e679daf11) +++ uspace/lib/usbdev/Makefile (revision 023a902cad1f2b33b53c2e4a1f7ec425235372dc) @@ -42,5 +42,4 @@ src/pipes.c \ src/pipesinit.c \ - src/pipesio.c \ src/recognise.c \ src/request.c Index: uspace/lib/usbdev/src/pipes.c =================================================================== --- uspace/lib/usbdev/src/pipes.c (revision 277ff98f1f6a1813dcfb5789838b012e679daf11) +++ uspace/lib/usbdev/src/pipes.c (revision 023a902cad1f2b33b53c2e4a1f7ec425235372dc) @@ -35,4 +35,5 @@ #include #include +#include #include #include @@ -63,5 +64,5 @@ return ret == EOK ? iface_no : ret; } - +/*----------------------------------------------------------------------------*/ /** Prepare pipe for a long transfer. * @@ -77,5 +78,5 @@ { } - +/*----------------------------------------------------------------------------*/ /** Terminate a long transfer on a pipe. * @@ -87,5 +88,228 @@ { } - +/*----------------------------------------------------------------------------*/ +/** Request an in transfer, no checking of input parameters. + * + * @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. + */ +static int usb_pipe_read_no_check(usb_pipe_t *pipe, uint64_t setup, + void *buffer, size_t size, size_t *size_transfered) +{ + /* Isochronous transfer are not supported (yet) */ + if (pipe->transfer_type != USB_TRANSFER_INTERRUPT && + pipe->transfer_type != USB_TRANSFER_BULK && + pipe->transfer_type != USB_TRANSFER_CONTROL) + return ENOTSUP; + + return usb_hc_control_read(pipe->wire->hc_connection, + pipe->wire->address, pipe->endpoint_no, setup, buffer, size, + size_transfered); +} +/*----------------------------------------------------------------------------*/ +/** Request an out transfer, no checking of input parameters. + * + * @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. + */ +static int usb_pipe_write_no_check(usb_pipe_t *pipe, uint64_t setup, + const void *buffer, size_t size) +{ + /* Only interrupt and bulk transfers are supported */ + if (pipe->transfer_type != USB_TRANSFER_INTERRUPT && + pipe->transfer_type != USB_TRANSFER_BULK && + pipe->transfer_type != USB_TRANSFER_CONTROL) + return ENOTSUP; + + return usb_hc_control_write(pipe->wire->hc_connection, + pipe->wire->address, pipe->endpoint_no, setup, buffer, size); +} +/*----------------------------------------------------------------------------*/ +/** Try to clear endpoint halt of default control pipe. + * + * @param pipe Pipe for control endpoint zero. + */ +static void clear_self_endpoint_halt(usb_pipe_t *pipe) +{ + assert(pipe != NULL); + + if (!pipe->auto_reset_halt || (pipe->endpoint_no != 0)) { + return; + } + + + /* Prevent infinite recursion. */ + pipe->auto_reset_halt = false; + usb_request_clear_endpoint_halt(pipe, 0); + pipe->auto_reset_halt = true; +} +/*----------------------------------------------------------------------------*/ +/** 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_pipe_control_read(usb_pipe_t *pipe, + const void *setup_buffer, size_t setup_buffer_size, + void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) +{ + assert(pipe); + + if ((setup_buffer == NULL) || (setup_buffer_size != 8)) { + return EINVAL; + } + + if ((data_buffer == NULL) || (data_buffer_size == 0)) { + return EINVAL; + } + + if ((pipe->direction != USB_DIRECTION_BOTH) + || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { + return EBADF; + } + + uint64_t setup_packet; + memcpy(&setup_packet, setup_buffer, 8); + + size_t act_size = 0; + const int rc = usb_pipe_read_no_check(pipe, setup_packet, + data_buffer, data_buffer_size, &act_size); + + if (rc == ESTALL) { + clear_self_endpoint_halt(pipe); + } + + if (rc == EOK && data_transfered_size != NULL) { + *data_transfered_size = act_size; + } + + 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_pipe_control_write(usb_pipe_t *pipe, + const void *setup_buffer, size_t setup_buffer_size, + const void *data_buffer, size_t data_buffer_size) +{ + assert(pipe); + + if ((setup_buffer == NULL) || (setup_buffer_size != 8)) { + return EINVAL; + } + + if ((data_buffer == NULL) && (data_buffer_size > 0)) { + return EINVAL; + } + + if ((data_buffer != NULL) && (data_buffer_size == 0)) { + return EINVAL; + } + + if ((pipe->direction != USB_DIRECTION_BOTH) + || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { + return EBADF; + } + + uint64_t setup_packet; + memcpy(&setup_packet, setup_buffer, 8); + + const int rc = usb_pipe_write_no_check(pipe, setup_packet, + data_buffer, data_buffer_size); + + if (rc == ESTALL) { + clear_self_endpoint_halt(pipe); + } + + return rc; +} +/*----------------------------------------------------------------------------*/ +/** 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_pipe_read(usb_pipe_t *pipe, + void *buffer, size_t size, size_t *size_transfered) +{ + assert(pipe); + + if (buffer == NULL) { + return EINVAL; + } + + if (size == 0) { + return EINVAL; + } + + if (pipe->direction != USB_DIRECTION_IN) { + return EBADF; + } + + if (pipe->transfer_type == USB_TRANSFER_CONTROL) { + return EBADF; + } + + size_t act_size = 0; + const int rc = usb_pipe_read_no_check(pipe, 0, buffer, size, &act_size); + + + if (rc == EOK && size_transfered != NULL) { + *size_transfered = act_size; + } + + 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_pipe_write(usb_pipe_t *pipe, const void *buffer, size_t size) +{ + assert(pipe); + + if (buffer == NULL || size == 0) { + return EINVAL; + } + + if (pipe->direction != USB_DIRECTION_OUT) { + return EBADF; + } + + if (pipe->transfer_type == USB_TRANSFER_CONTROL) { + return EBADF; + } + + return usb_pipe_write_no_check(pipe, 0, buffer, size); +} /** * @} Index: pace/lib/usbdev/src/pipesio.c =================================================================== --- uspace/lib/usbdev/src/pipesio.c (revision 277ff98f1f6a1813dcfb5789838b012e679daf11) +++ (revision ) @@ -1,278 +1,0 @@ -/* - * 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 libusbdev - * @{ - */ -/** @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. - * - * Note about the implementation: the transfer requests are always divided - * into two functions. - * The outer one does checking of input parameters (e.g. that session was - * already started, buffers are not NULL etc), while the inner one - * (with _no_checks suffix) does the actual IPC (it checks for IPC errors, - * obviously). - */ - -#include -#include -#include -#include - -/** Request an in transfer, no checking of input parameters. - * - * @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. - */ -static int usb_pipe_read_no_check(usb_pipe_t *pipe, uint64_t setup, - void *buffer, size_t size, size_t *size_transfered) -{ - /* Isochronous transfer are not supported (yet) */ - if (pipe->transfer_type != USB_TRANSFER_INTERRUPT && - pipe->transfer_type != USB_TRANSFER_BULK && - pipe->transfer_type != USB_TRANSFER_CONTROL) - return ENOTSUP; - - return usb_hc_control_read(pipe->wire->hc_connection, - pipe->wire->address, pipe->endpoint_no, setup, buffer, size, - size_transfered); -} - -/** Request an out transfer, no checking of input parameters. - * - * @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. - */ -static int usb_pipe_write_no_check(usb_pipe_t *pipe, uint64_t setup, - const void *buffer, size_t size) -{ - /* Only interrupt and bulk transfers are supported */ - if (pipe->transfer_type != USB_TRANSFER_INTERRUPT && - pipe->transfer_type != USB_TRANSFER_BULK && - pipe->transfer_type != USB_TRANSFER_CONTROL) - return ENOTSUP; - - return usb_hc_control_write(pipe->wire->hc_connection, - pipe->wire->address, pipe->endpoint_no, setup, buffer, size); -} - -/** Try to clear endpoint halt of default control pipe. - * - * @param pipe Pipe for control endpoint zero. - */ -static void clear_self_endpoint_halt(usb_pipe_t *pipe) -{ - assert(pipe != NULL); - - if (!pipe->auto_reset_halt || (pipe->endpoint_no != 0)) { - return; - } - - - /* Prevent infinite recursion. */ - pipe->auto_reset_halt = false; - usb_request_clear_endpoint_halt(pipe, 0); - pipe->auto_reset_halt = true; -} - -/** 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_pipe_control_read(usb_pipe_t *pipe, - const void *setup_buffer, size_t setup_buffer_size, - void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) -{ - assert(pipe); - - if ((setup_buffer == NULL) || (setup_buffer_size != 8)) { - return EINVAL; - } - - if ((data_buffer == NULL) || (data_buffer_size == 0)) { - return EINVAL; - } - - if ((pipe->direction != USB_DIRECTION_BOTH) - || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { - return EBADF; - } - - uint64_t setup_packet; - memcpy(&setup_packet, setup_buffer, 8); - - size_t act_size = 0; - const int rc = usb_pipe_read_no_check(pipe, setup_packet, - data_buffer, data_buffer_size, &act_size); - - if (rc == ESTALL) { - clear_self_endpoint_halt(pipe); - } - - if (rc == EOK && data_transfered_size != NULL) { - *data_transfered_size = act_size; - } - - 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_pipe_control_write(usb_pipe_t *pipe, - const void *setup_buffer, size_t setup_buffer_size, - const void *data_buffer, size_t data_buffer_size) -{ - assert(pipe); - - if ((setup_buffer == NULL) || (setup_buffer_size != 8)) { - return EINVAL; - } - - if ((data_buffer == NULL) && (data_buffer_size > 0)) { - return EINVAL; - } - - if ((data_buffer != NULL) && (data_buffer_size == 0)) { - return EINVAL; - } - - if ((pipe->direction != USB_DIRECTION_BOTH) - || (pipe->transfer_type != USB_TRANSFER_CONTROL)) { - return EBADF; - } - - uint64_t setup_packet; - memcpy(&setup_packet, setup_buffer, 8); - - const int rc = usb_pipe_write_no_check(pipe, setup_packet, - data_buffer, data_buffer_size); - - if (rc == ESTALL) { - clear_self_endpoint_halt(pipe); - } - - return rc; -} - -/** 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_pipe_read(usb_pipe_t *pipe, - void *buffer, size_t size, size_t *size_transfered) -{ - assert(pipe); - - if (buffer == NULL) { - return EINVAL; - } - - if (size == 0) { - return EINVAL; - } - - if (pipe->direction != USB_DIRECTION_IN) { - return EBADF; - } - - if (pipe->transfer_type == USB_TRANSFER_CONTROL) { - return EBADF; - } - - size_t act_size = 0; - const int rc = usb_pipe_read_no_check(pipe, 0, buffer, size, &act_size); - - - if (rc == EOK && size_transfered != NULL) { - *size_transfered = act_size; - } - - 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_pipe_write(usb_pipe_t *pipe, const void *buffer, size_t size) -{ - assert(pipe); - - if (buffer == NULL || size == 0) { - return EINVAL; - } - - if (pipe->direction != USB_DIRECTION_OUT) { - return EBADF; - } - - if (pipe->transfer_type == USB_TRANSFER_CONTROL) { - return EBADF; - } - - return usb_pipe_write_no_check(pipe, 0, buffer, size); -} - -/** - * @} - */