Index: uspace/lib/usb/include/usb/ddfiface.h =================================================================== --- uspace/lib/usb/include/usb/ddfiface.h (revision b47634799e396caab64087397a2c8d045089039f) +++ uspace/lib/usb/include/usb/ddfiface.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -0,0 +1,58 @@ +/* + * 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 + * Implementations of DDF interfaces functions. + */ +#ifndef LIBUSB_DDFIFACE_H_ +#define LIBUSB_DDFIFACE_H_ + +#include +#include +#include + +int usb_iface_get_hc_handle_hub_impl(device_t *, devman_handle_t *); +int usb_iface_get_address_hub_impl(device_t *, devman_handle_t, + usb_address_t *); +extern usb_iface_t usb_iface_hub_impl; + +int usb_iface_get_hc_handle_hub_child_impl(device_t *, devman_handle_t *); +int usb_iface_get_address_hub_child_impl(device_t *, devman_handle_t, + usb_address_t *); +extern usb_iface_t usb_iface_hub_child_impl; + +int usb_iface_get_hc_handle_hc_impl(device_t *, devman_handle_t *); + + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/dp.h =================================================================== --- uspace/lib/usb/include/usb/dp.h (revision 6bb83c7617113ccde4bfaaec20df6a91f8b48ebd) +++ uspace/lib/usb/include/usb/dp.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -45,4 +45,6 @@ } usb_dp_descriptor_nesting_t; +extern usb_dp_descriptor_nesting_t usb_dp_standard_descriptor_nesting[]; + typedef struct { usb_dp_descriptor_nesting_t *nesting; Index: uspace/lib/usb/include/usb/hub.h =================================================================== --- uspace/lib/usb/include/usb/hub.h (revision 6bb83c7617113ccde4bfaaec20df6a91f8b48ebd) +++ uspace/lib/usb/include/usb/hub.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -39,4 +39,6 @@ #include +int usb_hc_new_device_wrapper(device_t *, usb_hc_connection_t *, usb_speed_t, + int (*)(int, void *), int, void *, usb_address_t *, devman_handle_t *); /** Info about device attached to host controller. @@ -53,8 +55,8 @@ } usb_hc_attached_device_t; -int usb_hc_reserve_default_address(usb_hc_connection_t *, bool); +int usb_hc_reserve_default_address(usb_hc_connection_t *, usb_speed_t); int usb_hc_release_default_address(usb_hc_connection_t *); -usb_address_t usb_hc_request_address(usb_hc_connection_t *, bool); +usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t); int usb_hc_register_device(usb_hc_connection_t *, const usb_hc_attached_device_t *); Index: uspace/lib/usb/include/usb/pipes.h =================================================================== --- uspace/lib/usb/include/usb/pipes.h (revision 6bb83c7617113ccde4bfaaec20df6a91f8b48ebd) +++ uspace/lib/usb/include/usb/pipes.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -107,4 +107,6 @@ /** Endpoint description. */ const usb_endpoint_description_t *description; + /** Interface number the endpoint must belong to (-1 for any). */ + const int interface_no; /** Found descriptor fitting the description. */ usb_standard_endpoint_descriptor_t *descriptor; @@ -121,4 +123,6 @@ int usb_device_connection_initialize(usb_device_connection_t *, devman_handle_t, usb_address_t); + +int usb_device_get_assigned_interface(device_t *); int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *, Index: uspace/lib/usb/include/usb/recognise.h =================================================================== --- uspace/lib/usb/include/usb/recognise.h (revision 6bb83c7617113ccde4bfaaec20df6a91f8b48ebd) +++ uspace/lib/usb/include/usb/recognise.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -41,4 +41,8 @@ #include +int usb_device_create_match_ids_from_interface( + const usb_standard_device_descriptor_t *, + const usb_standard_interface_descriptor_t *, match_id_list_t *); + int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *); Index: uspace/lib/usb/include/usb/usb.h =================================================================== --- uspace/lib/usb/include/usb/usb.h (revision 6bb83c7617113ccde4bfaaec20df6a91f8b48ebd) +++ uspace/lib/usb/include/usb/usb.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -68,4 +68,14 @@ USB_DIRECTION_BOTH } usb_direction_t; + +/** USB speeds. */ +typedef enum { + /** USB 1.1 low speed (1.5Mbits/s). */ + USB_SPEED_LOW, + /** USB 1.1 full speed (12Mbits/s). */ + USB_SPEED_FULL, + /** USB 2.0 high speed (480Mbits/s). */ + USB_SPEED_HIGH +} usb_speed_t; /** USB request type target. */ Index: uspace/lib/usb/include/usb/usbdrv.h =================================================================== --- uspace/lib/usb/include/usb/usbdrv.h (revision 6bb83c7617113ccde4bfaaec20df6a91f8b48ebd) +++ uspace/lib/usb/include/usb/usbdrv.h (revision b47634799e396caab64087397a2c8d045089039f) @@ -103,7 +103,4 @@ int usb_drv_create_match_ids_from_device_descriptor(match_id_list_t *, const usb_standard_device_descriptor_t *); -int usb_drv_create_match_ids_from_configuration_descriptor(match_id_list_t *, - const void *, size_t); - #endif