Index: uspace/lib/usb/include/usb/addrkeep.h =================================================================== --- uspace/lib/usb/include/usb/addrkeep.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/addrkeep.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010 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 + * USB address keeping for host controller drivers. + */ +#ifndef LIBUSB_ADDRKEEP_H_ +#define LIBUSB_ADDRKEEP_H_ + +#include +#include +#include + +/** Info about used address. */ +typedef struct { + /** Linked list member. */ + link_t link; + /** Address. */ + usb_address_t address; + /** Corresponding devman handle. */ + devman_handle_t devman_handle; +} usb_address_keeping_used_t; + +/** Structure for keeping track of free and used USB addresses. */ +typedef struct { + /** Head of list of used addresses. */ + link_t used_addresses; + /** Upper bound for USB addresses. */ + usb_address_t max_address; + /** Mutex protecting used address. */ + fibril_mutex_t used_addresses_guard; + /** Condition variable for used addresses. */ + fibril_condvar_t used_addresses_condvar; + + /** Condition variable mutex for default address. */ + fibril_mutex_t default_condvar_guard; + /** Condition variable for default address. */ + fibril_condvar_t default_condvar; + /** Whether is default address available. */ + bool default_available; +} usb_address_keeping_t; + +void usb_address_keeping_init(usb_address_keeping_t *, usb_address_t); + +void usb_address_keeping_reserve_default(usb_address_keeping_t *); +void usb_address_keeping_release_default(usb_address_keeping_t *); + +usb_address_t usb_address_keeping_request(usb_address_keeping_t *); +int usb_address_keeping_release(usb_address_keeping_t *, usb_address_t); +void usb_address_keeping_devman_bind(usb_address_keeping_t *, usb_address_t, + devman_handle_t); +usb_address_t usb_address_keeping_find(usb_address_keeping_t *, + devman_handle_t); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/classes/classes.h =================================================================== --- uspace/lib/usb/include/usb/classes/classes.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/classes/classes.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ Index: uspace/lib/usb/include/usb/classes/hid.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/classes/hid.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ @@ -37,6 +37,6 @@ #include -#include #include +#include /** USB/HID device requests. */ @@ -51,4 +51,21 @@ } usb_hid_request_t; +typedef enum { + USB_HID_REPORT_TYPE_INPUT = 1, + USB_HID_REPORT_TYPE_OUTPUT = 2, + USB_HID_REPORT_TYPE_FEATURE = 3 +} usb_hid_report_type_t; + +typedef enum { + USB_HID_PROTOCOL_BOOT = 0, + USB_HID_PROTOCOL_REPORT = 1 +} usb_hid_protocol_t; + +/** USB/HID subclass constants. */ +typedef enum { + USB_HID_SUBCLASS_NONE = 0, + USB_HID_SUBCLASS_BOOT = 1 +} usb_hid_subclass_t; + /** USB/HID interface protocols. */ typedef enum { @@ -56,5 +73,5 @@ USB_HID_PROTOCOL_KEYBOARD = 1, USB_HID_PROTOCOL_MOUSE = 2 -} usb_hid_protocol_t; +} usb_hid_iface_protocol_t; /** Part of standard USB HID descriptor specifying one class descriptor. @@ -63,9 +80,9 @@ */ typedef struct { - /** Type of class descriptor (Report or Physical). */ - uint8_t class_descriptor_type; - /** Length of class descriptor. */ - uint16_t class_descriptor_length; -} __attribute__ ((packed)) usb_standard_hid_descriptor_class_item_t; + /** Type of class-specific descriptor (Report or Physical). */ + uint8_t type; + /** Length of class-specific descriptor in bytes. */ + uint16_t length; +} __attribute__ ((packed)) usb_standard_hid_class_descriptor_info_t; /** Standard USB HID descriptor. @@ -73,9 +90,14 @@ * (See HID Specification, p.22) * - * It is actually only the "header" of the descriptor, as it may have arbitrary - * length if more than one class descritor is provided. + * It is actually only the "header" of the descriptor, it does not contain + * the last two mandatory fields (type and length of the first class-specific + * descriptor). */ typedef struct { - /** Size of this descriptor in bytes. */ + /** Total size of this descriptor in bytes. + * + * This includes all class-specific descriptor info - type + length + * for each descriptor. + */ uint8_t length; /** Descriptor type (USB_DESCTYPE_HID). */ @@ -85,22 +107,14 @@ /** Country code of localized hardware. */ uint8_t country_code; - /** Total number of class (i.e. Report and Physical) descriptors. */ - uint8_t class_count; - /** First mandatory class descriptor info. */ - usb_standard_hid_descriptor_class_item_t class_descriptor; + /** Total number of class-specific (i.e. Report and Physical) + * descriptors. + * + * @note There is always only one Report descriptor. + */ + uint8_t class_desc_count; + /** First mandatory class descriptor (Report) info. */ + usb_standard_hid_class_descriptor_info_t report_desc_info; } __attribute__ ((packed)) usb_standard_hid_descriptor_t; - -/** - * @brief USB/HID keyboard device type. - * - * Quite dummy right now. - */ -typedef struct { - device_t *device; - usb_address_t address; - usb_endpoint_t poll_endpoint; - usb_hid_report_parser_t *parser; -} usb_hid_dev_kbd_t; #endif Index: uspace/lib/usb/include/usb/classes/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/classes/hidparser.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -37,10 +37,7 @@ #include -#include - -#include /** - * Items prefix + * Item prefix */ #define USB_HID_ITEM_SIZE(data) ((uint8_t)(data & 0x3)) @@ -62,24 +59,4 @@ #define USB_HID_ITEM_FLAG_VOLATILE(flags) (flags & 0x80) #define USB_HID_ITEM_FLAG_BUFFERED(flags) (flags & 0x100) - - -/** - * Collection Item Types - */ -#define USB_HID_COLLECTION_TYPE_PHYSICAL 0x00 -#define USB_HID_COLLECTION_TYPE_APPLICATION 0x01 -#define USB_HID_COLLECTION_TYPE_LOGICAL 0x02 -#define USB_HID_COLLECTION_TYPE_REPORT 0x03 -#define USB_HID_COLLECTION_TYPE_NAMED_ARRAY 0x04 -#define USB_HID_COLLECTION_TYPE_USAGE_SWITCH 0x05 - -/* - * modifiers definitions - */ -#define USB_HID_BOOT_KEYBOARD_NUM_LOCK 0x01 -#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK 0x02 -#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK 0x04 -#define USB_HID_BOOT_KEYBOARD_COMPOSE 0x08 -#define USB_HID_BOOT_KEYBOARD_KANA 0x10 @@ -128,4 +105,5 @@ + /** HID parser callbacks for IN items. */ typedef struct { @@ -139,9 +117,60 @@ } usb_hid_report_in_callbacks_t; + +typedef enum { + USB_HID_MOD_LCTRL = 0x01, + USB_HID_MOD_LSHIFT = 0x02, + USB_HID_MOD_LALT = 0x04, + USB_HID_MOD_LGUI = 0x08, + USB_HID_MOD_RCTRL = 0x10, + USB_HID_MOD_RSHIFT = 0x20, + USB_HID_MOD_RALT = 0x40, + USB_HID_MOD_RGUI = 0x80, + USB_HID_MOD_COUNT = 8 +} usb_hid_modifiers_t; + +typedef enum { + USB_HID_LED_NUM_LOCK = 0x1, + USB_HID_LED_CAPS_LOCK = 0x2, + USB_HID_LED_SCROLL_LOCK = 0x4, + USB_HID_LED_COMPOSE = 0x8, + USB_HID_LED_KANA = 0x10, + USB_HID_LED_COUNT = 5 +} usb_hid_led_t; + +static const usb_hid_modifiers_t + usb_hid_modifiers_consts[USB_HID_MOD_COUNT] = { + USB_HID_MOD_LCTRL, + USB_HID_MOD_LSHIFT, + USB_HID_MOD_LALT, + USB_HID_MOD_LGUI, + USB_HID_MOD_RCTRL, + USB_HID_MOD_RSHIFT, + USB_HID_MOD_RALT, + USB_HID_MOD_RGUI +}; + +//static const usb_hid_led_t usb_hid_led_consts[USB_HID_LED_COUNT] = { +// USB_HID_LED_NUM_LOCK, +// USB_HID_LED_CAPS_LOCK, +// USB_HID_LED_SCROLL_LOCK, +// USB_HID_LED_COMPOSE, +// USB_HID_LED_KANA +//}; + +//#define USB_HID_BOOT_KEYBOARD_NUM_LOCK 0x01 +//#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK 0x02 +//#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK 0x04 +//#define USB_HID_BOOT_KEYBOARD_COMPOSE 0x08 +//#define USB_HID_BOOT_KEYBOARD_KANA 0x10 + +/* + * modifiers definitions + */ + int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size, const usb_hid_report_in_callbacks_t *callbacks, void *arg); int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size); - int usb_hid_parser_init(usb_hid_report_parser_t *parser); @@ -157,4 +186,5 @@ void usb_hid_descriptor_print(usb_hid_report_parser_t *parser); + #endif /** Index: uspace/lib/usb/include/usb/classes/hidut.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidut.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/classes/hidut.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ Index: uspace/lib/usb/include/usb/classes/hidutkbd.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidutkbd.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/classes/hidutkbd.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ Index: uspace/lib/usb/include/usb/classes/hub.h =================================================================== --- uspace/lib/usb/include/usb/classes/hub.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/classes/hub.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2010 Vojtech Horky + * Copyright (c) 2010 Matus Dekanek * All rights reserved. * @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ @@ -33,10 +33,8 @@ * @brief USB hub related structures. */ -#ifndef LIBUSB_HUB_H_ -#define LIBUSB_HUB_H_ +#ifndef LIBUSB_CLASS_HUB_H_ +#define LIBUSB_CLASS_HUB_H_ #include -#include - /** Hub class feature selector. @@ -68,5 +66,5 @@ * For more information see Universal Serial Bus Specification Revision 1.1 chapter 11.16.2 */ -typedef struct hub_descriptor_type{ +typedef struct usb_hub_descriptor_type { /** Number of bytes in this descriptor, including this byte */ //uint8_t bDescLength; @@ -80,5 +78,5 @@ /** D1...D0: Logical Power Switching Mode - 00: Ganged power switching (all ports’ power at + 00: Ganged power switching (all ports power at once) 01: Individual port power switching @@ -91,5 +89,5 @@ 00: Global Over-current Protection. The hub reports over-current as a summation of all - ports’ current draw, without a breakdown of + ports current draw, without a breakdown of individual port over-current status. 01: Individual Port Over-current Protection. The @@ -198,19 +196,4 @@ extern size_t USB_HUB_MAX_DESCRIPTOR_SIZE; -/** - * @brief create uint8_t array with serialized descriptor - * - * @param descriptor - */ -void * usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor); - -/** - * @brief create deserialized desriptor structure out of serialized descriptor - * - * The serialized descriptor must be proper usb hub descriptor, otherwise an eerror might occur. - * - * @param sdescriptor serialized descriptor - */ -usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * sdescriptor); Index: uspace/lib/usb/include/usb/ddfiface.h =================================================================== --- uspace/lib/usb/include/usb/ddfiface.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/ddfiface.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -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(ddf_fun_t *, devman_handle_t *); +int usb_iface_get_address_hub_impl(ddf_fun_t *, devman_handle_t, + usb_address_t *); +extern usb_iface_t usb_iface_hub_impl; + +int usb_iface_get_hc_handle_hub_child_impl(ddf_fun_t *, devman_handle_t *); +int usb_iface_get_address_hub_child_impl(ddf_fun_t *, devman_handle_t, + usb_address_t *); +extern usb_iface_t usb_iface_hub_child_impl; + +int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *, devman_handle_t *); + + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/debug.h =================================================================== --- uspace/lib/usb/include/usb/debug.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/debug.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2010 Vojtech Horky + * Copyright (c) 2010-2011 Vojtech Horky * All rights reserved. * @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ @@ -35,8 +35,53 @@ #ifndef LIBUSB_DEBUG_H_ #define LIBUSB_DEBUG_H_ +#include +#include +#include void usb_dprintf(const char *tag, int level, const char *format, ...); void usb_dprintf_enable(const char *tag, int level); +void usb_dump_standard_descriptor(FILE *, const char *, const char *, + const uint8_t *, size_t); + +/** Logging level. */ +typedef enum { + USB_LOG_LEVEL_FATAL, + USB_LOG_LEVEL_ERROR, + USB_LOG_LEVEL_WARNING, + USB_LOG_LEVEL_INFO, + USB_LOG_LEVEL_DEBUG, + USB_LOG_LEVEL_DEBUG2, + USB_LOG_LEVEL_MAX +} usb_log_level_t; + + +void usb_log_enable(usb_log_level_t, const char *); + +void usb_log_printf(usb_log_level_t, const char *, ...); + +#define usb_log_fatal(format, ...) \ + usb_log_printf(USB_LOG_LEVEL_FATAL, format, ##__VA_ARGS__) + +#define usb_log_error(format, ...) \ + usb_log_printf(USB_LOG_LEVEL_ERROR, format, ##__VA_ARGS__) + +#define usb_log_warning(format, ...) \ + usb_log_printf(USB_LOG_LEVEL_WARNING, format, ##__VA_ARGS__) + +#define usb_log_info(format, ...) \ + usb_log_printf(USB_LOG_LEVEL_INFO, format, ##__VA_ARGS__) + +#define usb_log_debug(format, ...) \ + usb_log_printf(USB_LOG_LEVEL_DEBUG, format, ##__VA_ARGS__) + +#define usb_log_debug2(format, ...) \ + usb_log_printf(USB_LOG_LEVEL_DEBUG2, format, ##__VA_ARGS__) + + #endif +/** + * @} + */ + Index: uspace/lib/usb/include/usb/descriptor.h =================================================================== --- uspace/lib/usb/include/usb/descriptor.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/descriptor.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ @@ -36,5 +36,4 @@ #define LIBUSB_DESCRIPTOR_H_ -#include #include Index: uspace/lib/usb/include/usb/devreq.h =================================================================== --- uspace/lib/usb/include/usb/devreq.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ (revision ) @@ -1,113 +1,0 @@ -/* - * Copyright (c) 2010 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 usb - * @{ - */ -/** @file - * @brief Standard USB device requests. - */ -#ifndef LIBUSB_DEVREQ_H_ -#define LIBUSB_DEVREQ_H_ - -#include -#include -#include -#include - -/** Standard device request. */ -typedef enum { - USB_DEVREQ_GET_STATUS = 0, - USB_DEVREQ_CLEAR_FEATURE = 1, - USB_DEVREQ_SET_FEATURE = 3, - USB_DEVREQ_SET_ADDRESS = 5, - USB_DEVREQ_GET_DESCRIPTOR = 6, - USB_DEVREQ_SET_DESCRIPTOR = 7, - USB_DEVREQ_GET_CONFIGURATION = 8, - USB_DEVREQ_SET_CONFIGURATION = 9, - USB_DEVREQ_GET_INTERFACE = 10, - USB_DEVREQ_SET_INTERFACE = 11, - USB_DEVREQ_SYNCH_FRAME = 12, - USB_DEVREQ_LAST_STD -} usb_stddevreq_t; - -/** Device request setup packet. - * The setup packet describes the request. - */ -typedef struct { - /** Request type. - * The type combines transfer direction, request type and - * intended recipient. - */ - uint8_t request_type; - /** Request identification. */ - uint8_t request; - /** Main parameter to the request. */ - union { - /* FIXME: add #ifdefs according to host endianess */ - struct { - uint8_t value_low; - uint8_t value_high; - }; - uint16_t value; - }; - /** Auxiliary parameter to the request. - * Typically, it is offset to something. - */ - uint16_t index; - /** Length of extra data. */ - uint16_t length; -} __attribute__ ((packed)) usb_device_request_setup_packet_t; - - -int usb_drv_req_get_status(int, usb_address_t, usb_request_recipient_t, - uint16_t, uint16_t *); -int usb_drv_req_clear_feature(int, usb_address_t, usb_request_recipient_t, - uint16_t, uint16_t); -int usb_drv_req_set_feature(int, usb_address_t, usb_request_recipient_t, - uint16_t, uint16_t); -int usb_drv_req_set_address(int, usb_address_t, usb_address_t); -int usb_drv_req_get_descriptor(int, usb_address_t, usb_request_type_t, - uint8_t, uint8_t, uint16_t, void *, size_t, size_t *); -int usb_drv_req_get_device_descriptor(int, usb_address_t, - usb_standard_device_descriptor_t *); -int usb_drv_req_get_bare_configuration_descriptor(int, usb_address_t, int, - usb_standard_configuration_descriptor_t *); -int usb_drv_req_get_full_configuration_descriptor(int, usb_address_t, int, - void *, size_t, size_t *); -int usb_drv_req_set_descriptor(int, usb_address_t, uint8_t, uint8_t, uint16_t, - void *, size_t); -int usb_drv_req_get_configuration(int, usb_address_t, uint8_t *); -int usb_drv_req_set_configuration(int, usb_address_t, uint8_t); -int usb_drv_req_get_interface(int, usb_address_t, uint16_t, uint8_t *); -int usb_drv_req_set_interface(int, usb_address_t, uint16_t, uint8_t); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/dp.h =================================================================== --- uspace/lib/usb/include/usb/dp.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/dp.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -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/hcd.h =================================================================== --- uspace/lib/usb/include/usb/hcd.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ (revision ) @@ -1,84 +1,0 @@ -/* - * Copyright (c) 2010 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 usb - * @{ - */ -/** @file - * @brief HC driver. - */ -#ifndef LIBUSB_HCD_H_ -#define LIBUSB_HCD_H_ - -#include -#include -#include - -/** Info about used address. */ -typedef struct { - /** Linked list member. */ - link_t link; - /** Address. */ - usb_address_t address; - /** Corresponding devman handle. */ - devman_handle_t devman_handle; -} usb_address_keeping_used_t; - -/** Structure for keeping track of free and used USB addresses. */ -typedef struct { - /** Head of list of used addresses. */ - link_t used_addresses; - /** Upper bound for USB addresses. */ - usb_address_t max_address; - /** Mutex protecting used address. */ - fibril_mutex_t used_addresses_guard; - /** Condition variable for used addresses. */ - fibril_condvar_t used_addresses_condvar; - - /** Condition variable mutex for default address. */ - fibril_mutex_t default_condvar_guard; - /** Condition variable for default address. */ - fibril_condvar_t default_condvar; - /** Whether is default address available. */ - bool default_available; -} usb_address_keeping_t; - -void usb_address_keeping_init(usb_address_keeping_t *, usb_address_t); - -void usb_address_keeping_reserve_default(usb_address_keeping_t *); -void usb_address_keeping_release_default(usb_address_keeping_t *); - -usb_address_t usb_address_keeping_request(usb_address_keeping_t *); -int usb_address_keeping_release(usb_address_keeping_t *, usb_address_t); -void usb_address_keeping_devman_bind(usb_address_keeping_t *, usb_address_t, - devman_handle_t); -usb_address_t usb_address_keeping_find(usb_address_keeping_t *, - devman_handle_t); - - -#endif Index: uspace/lib/usb/include/usb/hcdhubd.h =================================================================== --- uspace/lib/usb/include/usb/hcdhubd.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ (revision ) @@ -1,214 +1,0 @@ -/* - * Copyright (c) 2010 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 usb - * @{ - */ -/** @file - * @brief HC driver and hub driver. - */ -#ifndef LIBUSB_HCDHUBD_H_ -#define LIBUSB_HCDHUBD_H_ - -#include -#include -#include -#include - -/** Endpoint properties. */ -typedef struct { - /** Endpoint number. */ - usb_endpoint_t endpoint; - /** Transfer type. */ - usb_transfer_type_t transfer_type; - /** Endpoint direction. */ - usb_direction_t direction; - /** Data toggle bit. */ - int data_toggle; -} usb_hc_endpoint_info_t; - -/** Information about attached USB device. */ -typedef struct { - /** Assigned address. */ - usb_address_t address; - /** Number of endpoints. */ - size_t endpoint_count; - /** Endpoint properties. */ - usb_hc_endpoint_info_t *endpoints; - /** Link to other attached devices of the same HC. */ - link_t link; -} usb_hcd_attached_device_info_t; - - -/** Host controller device. */ -typedef struct usb_hc_device usb_hc_device_t; - -/** Callback for OUT transfers. */ -typedef void (*usb_hcd_transfer_callback_out_t) - (usb_hc_device_t *, usb_transaction_outcome_t, void *); - -/** Callback for IN transfers. */ -typedef void (*usb_hcd_transfer_callback_in_t) - (usb_hc_device_t *, size_t, usb_transaction_outcome_t, void *); - - -/** Transfer functions provided by each USB host controller driver. */ -typedef struct { - /** OUT transfer. - * @param hc Host controller that shall enqueue the transfer. - * @param dev Target device. - * @param ep Target endpoint. - * @param buffer Buffer to be sent. - * @param size Buffer size. - * @param callback Callback after transfer was processed by hardware. - * @param arg Callback argument. - */ - int (*transfer_out)(usb_hc_device_t *hc, - usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *ep, - void *buffer, size_t size, - usb_hcd_transfer_callback_out_t callback, void *arg); - - /** SETUP transfer. */ - int (*transfer_setup)(usb_hc_device_t *, - usb_hcd_attached_device_info_t *, usb_hc_endpoint_info_t *, - void *, size_t, - usb_hcd_transfer_callback_out_t, void *); - - /** IN transfer. */ - int (*transfer_in)(usb_hc_device_t *, - usb_hcd_attached_device_info_t *, usb_hc_endpoint_info_t *, - void *, size_t, - usb_hcd_transfer_callback_in_t, void *); -} usb_hcd_transfer_ops_t; - -/** - * @brief structure holding information about free and used addresses - * - * This structure should not be used outside usb hcd driver. - * You better consider it to be 'private'. - */ -typedef struct { - /** lower bound included in the interval */ - usb_address_t lower_bound; - - /** upper bound, excluded from the interval */ - usb_address_t upper_bound; - - /** */ - link_t link; -}usb_address_list_t; - -struct usb_hc_device { - /** Transfer operations. */ - usb_hcd_transfer_ops_t *transfer_ops; - - /** Custom HC data. */ - void *data; - - /** Generic device entry (read-only). */ - device_t *generic; - - /** List of attached devices. */ - link_t attached_devices; - - /** List of hubs operating from this HC. */ - link_t hubs; - - /** Structure with free and used addresses */ - link_t addresses; - - /** Link to other driven HCs. */ - link_t link; -}; - -/** Host controller driver. */ -typedef struct { - /** Driver name. */ - const char *name; - /** Callback when device (host controller) is added. */ - int (*add_hc)(usb_hc_device_t *device); -} usb_hc_driver_t; - - -int usb_hcd_main(usb_hc_driver_t *); -int usb_hcd_add_root_hub(device_t *dev); - -/** - * find first not yet used address on this host controller and use it - * @param this_hcd - * @return number in the range of allowed usb addresses or - * a negative number if not succesful - */ -usb_address_t usb_use_free_address(usb_hc_device_t * this_hcd); - -/** - * @brief free the address in the address space of this hcd. - * - * if address is not used, nothing happens - * @param this_hcd - * @param addr - */ -void usb_free_used_address(usb_hc_device_t * this_hcd, usb_address_t addr ); - - -/* - * Functions to be used by drivers within same task as the HC driver. - * This will probably include only hub drivers. - */ - -device_t *usb_hc_connect(device_t *); - -int usb_hc_async_interrupt_out(usb_hc_device_t *, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_hc_async_interrupt_in(usb_hc_device_t *, usb_target_t, - void *, size_t, size_t *, usb_handle_t *); - -int usb_hc_async_control_write_setup(usb_hc_device_t *, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_hc_async_control_write_data(usb_hc_device_t *, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_hc_async_control_write_status(usb_hc_device_t *, usb_target_t, - usb_handle_t *); - -int usb_hc_async_control_read_setup(usb_hc_device_t *, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_hc_async_control_read_data(usb_hc_device_t *, usb_target_t, - void *, size_t, size_t *, usb_handle_t *); -int usb_hc_async_control_read_status(usb_hc_device_t *, usb_target_t, - usb_handle_t *); - -int usb_hc_async_wait_for(usb_handle_t); - -int usb_hc_add_child_device(device_t *, const char *, const char *, bool); - - -/** - * @} - */ - -#endif Index: uspace/lib/usb/include/usb/hub.h =================================================================== --- uspace/lib/usb/include/usb/hub.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/hub.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -0,0 +1,70 @@ +/* + * 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 + * Functions needed by hub drivers. + */ +#ifndef LIBUSB_HUB_H_ +#define LIBUSB_HUB_H_ + +#include +#include + +int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t, + int (*)(int, void *), int, void *, + usb_address_t *, devman_handle_t *, + ddf_dev_ops_t *, void *, ddf_fun_t **); + +/** Info about device attached to host controller. + * + * This structure exists only to keep the same signature of + * usb_hc_register_device() when more properties of the device + * would have to be passed to the host controller. + */ +typedef struct { + /** Device address. */ + usb_address_t address; + /** Devman handle of the device. */ + devman_handle_t handle; +} usb_hc_attached_device_t; + +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 *, usb_speed_t); +int usb_hc_register_device(usb_hc_connection_t *, + const usb_hc_attached_device_t *); +int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/pipes.h =================================================================== --- uspace/lib/usb/include/usb/pipes.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/pipes.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -0,0 +1,152 @@ +/* + * 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 + * USB pipes representation. + */ +#ifndef LIBUSB_PIPES_H_ +#define LIBUSB_PIPES_H_ + +#include +#include +#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 { + /** Handle of the host controller device is connected to. */ + devman_handle_t hc_handle; + /** Address of the device. */ + usb_address_t address; +} usb_device_connection_t; + +/** + * Abstraction of a logical connection to USB device endpoint. + * It encapsulates endpoint attributes (transfer type etc.) as well + * as information about currently running sessions. + * This endpoint must be bound with existing usb_device_connection_t + * (i.e. the wire to send data over). + */ +typedef struct { + /** The connection used for sending the data. */ + usb_device_connection_t *wire; + + /** Endpoint number. */ + usb_endpoint_t endpoint_no; + + /** Endpoint transfer type. */ + usb_transfer_type_t transfer_type; + + /** Endpoint direction. */ + usb_direction_t direction; + + /** Maximum packet size for the endpoint. */ + size_t max_packet_size; + + /** Phone to the host controller. + * Negative when no session is active. + */ + int hc_phone; +} usb_endpoint_pipe_t; + + +/** Description of endpoint characteristics. */ +typedef struct { + /** Transfer type (e.g. control or interrupt). */ + usb_transfer_type_t transfer_type; + /** Transfer direction (to or from a device). */ + usb_direction_t direction; + /** Interface class this endpoint belongs to (-1 for any). */ + int interface_class; + /** Interface subclass this endpoint belongs to (-1 for any). */ + int interface_subclass; + /** Interface protocol this endpoint belongs to (-1 for any). */ + int interface_protocol; + /** Extra endpoint flags. */ + unsigned int flags; +} usb_endpoint_description_t; + +/** Mapping of endpoint pipes and endpoint descriptions. */ +typedef struct { + /** Endpoint pipe. */ + usb_endpoint_pipe_t *pipe; + /** 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; + /** Interface the endpoint belongs to. */ + usb_standard_interface_descriptor_t *interface; + /** Whether the endpoint was actually found. */ + bool present; +} usb_endpoint_mapping_t; + +int usb_device_connection_initialize_on_default_address( + usb_device_connection_t *, usb_hc_connection_t *); +int usb_device_connection_initialize_from_device(usb_device_connection_t *, + ddf_dev_t *); +int usb_device_connection_initialize(usb_device_connection_t *, + devman_handle_t, usb_address_t); + +int usb_device_get_assigned_interface(ddf_dev_t *); + +int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *, + usb_device_connection_t *, + usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t); +int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *, + usb_device_connection_t *); +int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *, + size_t, uint8_t *, size_t, usb_device_connection_t *); + + +int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *); +int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *); +bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *); + +int usb_endpoint_pipe_read(usb_endpoint_pipe_t *, void *, size_t, size_t *); +int usb_endpoint_pipe_write(usb_endpoint_pipe_t *, void *, size_t); + +int usb_endpoint_pipe_control_read(usb_endpoint_pipe_t *, void *, size_t, + void *, size_t, size_t *); +int usb_endpoint_pipe_control_write(usb_endpoint_pipe_t *, void *, size_t, + void *, size_t); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/recognise.h =================================================================== --- uspace/lib/usb/include/usb/recognise.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/recognise.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -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 + * USB device recognition. + */ +#ifndef LIBUSB_RECOGNISE_H_ +#define LIBUSB_RECOGNISE_H_ + +#include +#include +#include +#include + +int usb_device_create_match_ids_from_device_descriptor( + const usb_standard_device_descriptor_t *, match_id_list_t *); + +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 *); + +int usb_device_register_child_in_devman(usb_address_t, devman_handle_t, + ddf_dev_t *, devman_handle_t *, ddf_dev_ops_t *, void *, ddf_fun_t **); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/request.h =================================================================== --- uspace/lib/usb/include/usb/request.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/request.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -0,0 +1,118 @@ +/* + * 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 + * Standard USB requests. + */ +#ifndef LIBUSB_REQUEST_H_ +#define LIBUSB_REQUEST_H_ + +#include +#include +#include +#include +#include + +/** Standard device request. */ +typedef enum { + USB_DEVREQ_GET_STATUS = 0, + USB_DEVREQ_CLEAR_FEATURE = 1, + USB_DEVREQ_SET_FEATURE = 3, + USB_DEVREQ_SET_ADDRESS = 5, + USB_DEVREQ_GET_DESCRIPTOR = 6, + USB_DEVREQ_SET_DESCRIPTOR = 7, + USB_DEVREQ_GET_CONFIGURATION = 8, + USB_DEVREQ_SET_CONFIGURATION = 9, + USB_DEVREQ_GET_INTERFACE = 10, + USB_DEVREQ_SET_INTERFACE = 11, + USB_DEVREQ_SYNCH_FRAME = 12, + USB_DEVREQ_LAST_STD +} usb_stddevreq_t; + +/** Device request setup packet. + * The setup packet describes the request. + */ +typedef struct { + /** Request type. + * The type combines transfer direction, request type and + * intended recipient. + */ + uint8_t request_type; + /** Request identification. */ + uint8_t request; + /** Main parameter to the request. */ + union { + uint16_t value; + /* FIXME: add #ifdefs according to host endianess */ + struct { + uint8_t value_low; + uint8_t value_high; + }; + }; + /** Auxiliary parameter to the request. + * Typically, it is offset to something. + */ + uint16_t index; + /** Length of extra data. */ + uint16_t length; +} __attribute__ ((packed)) usb_device_request_setup_packet_t; + +int usb_control_request_set(usb_endpoint_pipe_t *, + usb_request_type_t, usb_request_recipient_t, uint8_t, + uint16_t, uint16_t, void *, size_t); + +int usb_control_request_get(usb_endpoint_pipe_t *, + usb_request_type_t, usb_request_recipient_t, uint8_t, + uint16_t, uint16_t, void *, size_t, size_t *); + +int usb_request_set_address(usb_endpoint_pipe_t *, usb_address_t); +int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_t, + usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t, + size_t *); +int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t *, usb_request_type_t, + usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *); +int usb_request_get_device_descriptor(usb_endpoint_pipe_t *, + usb_standard_device_descriptor_t *); +int usb_request_get_bare_configuration_descriptor(usb_endpoint_pipe_t *, int, + usb_standard_configuration_descriptor_t *); +int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *, int, + void *, size_t, size_t *); +int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t); + +int usb_request_get_supported_languages(usb_endpoint_pipe_t *, + l18_win_locales_t **, size_t *); +int usb_request_get_string(usb_endpoint_pipe_t *, size_t, l18_win_locales_t, + char **); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/usb.h =================================================================== --- uspace/lib/usb/include/usb/usb.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ uspace/lib/usb/include/usb/usb.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libusb usb +/** @addtogroup libusb * @{ */ @@ -37,5 +37,18 @@ #include -#include +#include + +/** Convert 16bit value from native (host) endianness to USB endianness. */ +#define uint16_host2usb(n) host2uint16_t_le((n)) + +/** Convert 32bit value from native (host) endianness to USB endianness. */ +#define uint32_host2usb(n) host2uint32_t_le((n)) + +/** Convert 16bit value from USB endianness into native (host) one. */ +#define uint16_usb2host(n) uint16_t_le2host((n)) + +/** Convert 32bit value from USB endianness into native (host) one. */ +#define uint32_usb2host(n) uint32_t_le2host((n)) + /** USB transfer type. */ @@ -52,6 +65,17 @@ typedef enum { USB_DIRECTION_IN, - USB_DIRECTION_OUT + USB_DIRECTION_OUT, + 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. */ @@ -68,13 +92,4 @@ USB_REQUEST_RECIPIENT_ENDPOINT = 2 } usb_request_recipient_t; - -/** USB transaction outcome. */ -typedef enum { - USB_OUTCOME_OK, - USB_OUTCOME_CRCERROR, - USB_OUTCOME_BABBLE -} usb_transaction_outcome_t; - -const char * usb_str_transaction_outcome(usb_transaction_outcome_t o); /** USB address type. Index: uspace/lib/usb/include/usb/usbdevice.h =================================================================== --- uspace/lib/usb/include/usb/usbdevice.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/usbdevice.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -0,0 +1,67 @@ +/* + * 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 + * General communication between device drivers and host controller driver. + */ +#ifndef LIBUSB_USBDEVICE_H_ +#define LIBUSB_USBDEVICE_H_ + +#include +#include +#include +#include +#include + +/** Connection to the host controller driver. */ +typedef struct { + /** Devman handle of the host controller. */ + devman_handle_t hc_handle; + /** Phone to the host controller. */ + int hc_phone; +} usb_hc_connection_t; + +int usb_hc_find(devman_handle_t, devman_handle_t *); + +int usb_hc_connection_initialize_from_device(usb_hc_connection_t *, + ddf_dev_t *); +int usb_hc_connection_initialize(usb_hc_connection_t *, devman_handle_t); + +int usb_hc_connection_open(usb_hc_connection_t *); +bool usb_hc_connection_is_opened(const usb_hc_connection_t *); +int usb_hc_connection_close(usb_hc_connection_t *); + + + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/usbdrv.h =================================================================== --- uspace/lib/usb/include/usb/usbdrv.h (revision 976f5467374c4083883e264c4bac5dc6e98c2a1c) +++ (revision ) @@ -1,111 +1,0 @@ -/* - * Copyright (c) 2010 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 usb - * @{ - */ -/** @file - * @brief USB driver. - */ -#ifndef LIBUSB_USBDRV_H_ -#define LIBUSB_USBDRV_H_ - -#include -#include -#include -#include - -int usb_drv_find_hc(device_t *, devman_handle_t *); -int usb_drv_hc_connect(device_t *, devman_handle_t, unsigned int); -int usb_drv_hc_connect_auto(device_t *, unsigned int); - -int usb_drv_reserve_default_address(int); -int usb_drv_release_default_address(int); -usb_address_t usb_drv_request_address(int); -int usb_drv_bind_address(int, usb_address_t, devman_handle_t); -int usb_drv_release_address(int, usb_address_t); - -usb_address_t usb_drv_get_my_address(int, device_t *); - -int usb_drv_async_interrupt_out(int, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_drv_async_interrupt_in(int, usb_target_t, - void *, size_t, size_t *, usb_handle_t *); - -int usb_drv_psync_interrupt_out(int, usb_target_t, void *, size_t); -int usb_drv_psync_interrupt_in(int, usb_target_t, void *, size_t, size_t *); - - - -int usb_drv_async_control_write_setup(int, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_drv_async_control_write_data(int, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_drv_async_control_write_status(int, usb_target_t, - usb_handle_t *); - -int usb_drv_psync_control_write_setup(int, usb_target_t, void *, size_t); -int usb_drv_psync_control_write_data(int, usb_target_t, void *, size_t); -int usb_drv_psync_control_write_status(int, usb_target_t); - -int usb_drv_psync_control_write(int, usb_target_t, - void *, size_t, void *, size_t); - - -int usb_drv_async_control_read_setup(int, usb_target_t, - void *, size_t, usb_handle_t *); -int usb_drv_async_control_read_data(int, usb_target_t, - void *, size_t, size_t *, usb_handle_t *); -int usb_drv_async_control_read_status(int, usb_target_t, - usb_handle_t *); - -int usb_drv_psync_control_read_setup(int, usb_target_t, void *, size_t); -int usb_drv_psync_control_read_data(int, usb_target_t, void *, size_t, size_t *); -int usb_drv_psync_control_read_status(int, usb_target_t); - -int usb_drv_psync_control_read(int, usb_target_t, - void *, size_t, void *, size_t, size_t *); - - - -int usb_drv_async_wait_for(usb_handle_t); - -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); - -int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t); -int usb_drv_register_child_in_devman(int, device_t *, usb_address_t, - devman_handle_t *); - - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/usbmem.h =================================================================== --- uspace/lib/usb/include/usb/usbmem.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) +++ uspace/lib/usb/include/usb/usbmem.h (revision 19a18004a56ed89f716b2310c889ca6b22618bbd) @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2011 Matus Dekanek + * 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. + */ + +#ifndef USBMEM_H +#define USBMEM_H + + +// group should be changed - this is not usb specific +/** @addtogroup usb + * @{ + */ +/** @file definitions of memory management with address translation, used mostly in usb stack + * + * USB HCD needs traslation between physical and virtual addresses. These + * functions implement such functionality. For each allocated virtual address + * the memory manager gets also it`s physical translation and remembers it. + * Addresses allocated byt this manager can be therefore translated from and to + * physical addresses. + * Typical use: + * void * address = mman_malloc(some_size); + * void * physical_address = mman_getPA(address); + * void * the_same_address = mman_getVA(physical_address); + * void * null_address = mman_getPA(non_existing_address); + * mman_free(address); + * // physical_address, adress and the_same_address are no longer valid here + * + * + * @note Addresses allocated by this memory manager should be as well + * deallocated byt it. + * + */ + +#include + +extern void * mman_malloc( + size_t size, + size_t alignment, + unsigned long max_physical_address); + +extern void * mman_getVA(void * addr); + +extern void * mman_getPA(void * addr); + +extern void mman_free(void * addr); + + + + + + +/** @} + */ + + +#endif /* USBMEM_H */ +