Index: uspace/lib/usbdev/include/usb/dev/device.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/device.h (revision 8e4219abd8be9844df15e59ea2ac4481dbd47120) +++ uspace/lib/usbdev/include/usb/dev/device.h (revision d8d100c2d26b0dda1225f4f46bf1636bf03a63e8) @@ -95,8 +95,4 @@ void * usb_device_data_get(usb_device_t *); -/* Legacy support */ -usb_address_t usb_device_address(usb_device_t *); -devman_handle_t usb_device_hc_handle(usb_device_t*); - #endif /** Index: uspace/lib/usbdev/include/usb/dev/pipes.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/pipes.h (revision 8e4219abd8be9844df15e59ea2ac4481dbd47120) +++ uspace/lib/usbdev/include/usb/dev/pipes.h (revision d8d100c2d26b0dda1225f4f46bf1636bf03a63e8) @@ -41,5 +41,4 @@ #include #include -#include #include @@ -51,7 +50,4 @@ */ typedef struct { - /** The connection used for sending the data. */ - usb_device_connection_t *wire; - /** Endpoint number. */ usb_endpoint_t endpoint_no; @@ -71,4 +67,5 @@ bool auto_reset_halt; + /** The connection used for sending the data. */ usb_dev_session_t *bus_session; } usb_pipe_t; @@ -108,20 +105,14 @@ } usb_endpoint_mapping_t; -int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *, - usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t, - usb_dev_session_t *); -int usb_pipe_initialize_default_control(usb_pipe_t *, - usb_device_connection_t *, usb_dev_session_t *); +int usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t, + size_t, usb_direction_t, usb_dev_session_t *); +int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *); int usb_pipe_probe_default_control(usb_pipe_t *); int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *, - size_t, const uint8_t *, size_t, usb_device_connection_t *, - usb_dev_session_t *); + size_t, const uint8_t *, size_t, usb_dev_session_t *); int usb_pipe_register(usb_pipe_t *, unsigned); int usb_pipe_unregister(usb_pipe_t *); - -int usb_pipe_start_long_transfer(usb_pipe_t *); -int usb_pipe_end_long_transfer(usb_pipe_t *); int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *); Index: uspace/lib/usbdev/include/usb/dev/usb_device_connection.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/usb_device_connection.h (revision 8e4219abd8be9844df15e59ea2ac4481dbd47120) +++ (revision ) @@ -1,140 +1,0 @@ -/* - * Copyright (c) 2011 Jan Vesely - * 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 - * Common USB types and functions. - */ -#ifndef LIBUSBDEV_DEVICE_CONNECTION_H_ -#define LIBUSBDEV_DEVICE_CONNECTION_H_ - -#include -#include -#include -#include - - -/** Abstraction of a physical connection to the device. - * This type is an abstraction of the USB wire that connects the host and - * the function (device). - */ -typedef struct { - /** Connection to the host controller device is connected to. */ - usb_hc_connection_t *hc_connection; - /** Address of the device. */ - usb_address_t address; -} usb_device_connection_t; - -/** Initialize device connection. Set address and hc connection. - * @param instance Structure to initialize. - * @param hc_connection. Host controller connection to use. - * @param address USB address. - * @return Error code. - */ -static inline int usb_device_connection_initialize( - usb_device_connection_t *instance, usb_hc_connection_t *hc_connection, - usb_address_t address) -{ - assert(instance); - if (hc_connection == NULL) - return EBADMEM; - if (!usb_address_is_valid(address)) - return EINVAL; - - instance->hc_connection = hc_connection; - instance->address = address; - return EOK; -} - - -/** Get data from the device. - * @param[in] instance device connection structure to use. - * @param[in] ep target endpoint's number. - * @param[in] setup Setup stage data (control transfers). - * @param[in] data data buffer. - * @param[in] size size of the data buffer. - * @param[out] rsize bytes actually copied to the buffer. - * @return Error code. - */ -static inline int usb_device_control_read(usb_device_connection_t *instance, - usb_endpoint_t ep, uint64_t setup, void *data, size_t size, size_t *rsize) -{ - assert(instance); - return usb_hc_read(instance->hc_connection, - instance->address, ep, setup, data, size, rsize); -} - -/** Send data to the device. - * @param instance device connection structure to use. - * @param ep target endpoint's number. - * @param setup Setup stage data (control transfers). - * @param data data buffer. - * @param size size of the data buffer. - * @return Error code. - */ -static inline int usb_device_control_write(usb_device_connection_t *instance, - usb_endpoint_t ep, uint64_t setup, const void *data, size_t size) -{ - assert(instance); - return usb_hc_write(instance->hc_connection, - instance->address, ep, setup, data, size); -} - -/** Wrapper for read calls with no setup stage. - * @param[in] instance device connection structure. - * @param[in] address USB device address. - * @param[in] endpoint USB device endpoint. - * @param[in] data Data buffer. - * @param[in] size Size of the buffer. - * @param[out] real_size Size of the transferred data. - * @return Error code. - */ -static inline int usb_device_read(usb_device_connection_t *instance, - usb_endpoint_t ep, void *data, size_t size, size_t *real_size) -{ - return usb_device_control_read(instance, ep, 0, data, size, real_size); -} - -/** Wrapper for write calls with no setup stage. - * @param instance device connection structure. - * @param address USB device address. - * @param endpoint USB device endpoint. - * @param data Data buffer. - * @param size Size of the buffer. - * @return Error code. - */ -static inline int usb_device_write(usb_device_connection_t *instance, - usb_endpoint_t ep, const void *data, size_t size) -{ - return usb_device_control_write(instance, ep, 0, data, size); -} -#endif -/** - * @} - */