Index: uspace/lib/usb/include/usb/addrkeep.h =================================================================== --- uspace/lib/usb/include/usb/addrkeep.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,86 +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 - * @{ - */ -/** @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/hid.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,117 +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 - * @{ - */ -/** @file - * @brief USB HID device related types. - */ -#ifndef LIBUSB_HID_H_ -#define LIBUSB_HID_H_ - -#include -#include -#include - -/** USB/HID device requests. */ -typedef enum { - USB_HIDREQ_GET_REPORT = 1, - USB_HIDREQ_GET_IDLE = 2, - USB_HIDREQ_GET_PROTOCOL = 3, - /* Values 4 to 8 are reserved. */ - USB_HIDREQ_SET_REPORT = 9, - USB_HIDREQ_SET_IDLE = 10, - USB_HIDREQ_SET_PROTOCOL = 11 -} usb_hid_request_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 { - USB_HID_PROTOCOL_NONE = 0, - USB_HID_PROTOCOL_KEYBOARD = 1, - USB_HID_PROTOCOL_MOUSE = 2 -} usb_hid_iface_protocol_t; - -/** Part of standard USB HID descriptor specifying one class descriptor. - * - * (See HID Specification, p.22) - */ -typedef struct { - /** 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. - * - * (See HID Specification, p.22) - * - * 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 { - /** 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). */ - uint8_t descriptor_type; - /** HID Class Specification release. */ - uint16_t spec_release; - /** Country code of localized hardware. */ - uint8_t country_code; - /** 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; - - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hid/iface.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid/iface.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,47 +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 libusb - * @{ - */ -/** @file - * Client functions for accessing USB HID interface. - */ -#ifndef LIBUSB_CLASSES_HID_IFACE_H_ -#define LIBUSB_CLASSES_HID_IFACE_H_ - -#include - -int usbhid_dev_get_event_length(int); -int usbhid_dev_get_event(int, uint16_t *, uint16_t *, size_t, size_t *, - unsigned int); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hid/utled.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid/utled.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,122 +1,0 @@ -/* - * Copyright (c) 2010 Lubos Slovak - * 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 - * @brief USB HID Usage Tables - LED page. - */ -#ifndef LIBUSB_UTLED_H_ -#define LIBUSB_UTLED_H_ - -typedef enum { - USB_HID_LED_UNDEFINED = 0, - USB_HID_LED_NUM_LOCK, - USB_HID_LED_CAPS_LOCK, - USB_HID_LED_SCROLL_LOCK, - USB_HID_LED_COMPOSE, - USB_HID_LED_KANA, - USB_HID_LED_POWER, - USB_HID_LED_SHIFT, - USB_HID_LED_DND, - USB_HID_LED_MUTE, - USB_HID_LED_TONE_ENABLE, - USB_HID_LED_HIGH_CUT_FILTER, - USB_HID_LED_LOW_CUT_FILTER, - USB_HID_LED_EQ_ENABLE, - USB_HID_LED_SOUND_FIELD_ON, - USB_HID_LED_SURROUND_ON, - USB_HID_LED_REPEAT, - USB_HID_LED_STEREO, - USB_HID_LED_SAMPLING_RATE_DETECT, - USB_HID_LED_SPINNING, - USB_HID_LED_CAV, - USB_HID_LED_CLV, - USB_HID_LED_RECORDING_FORMAT_DETECT, - USB_HID_LED_OFF_HOOK, - USB_HID_LED_RING, - USB_HID_LED_MESSAGE_WAITING, - USB_HID_LED_DATA_MODE, - USB_HID_LED_BATTERY_OPERATION, - USB_HID_LED_BATTERY_OK, - USB_HID_LED_BATTERY_LOW, - USB_HID_LED_SPEAKER, - USB_HID_LED_HEAD_SET, - USB_HID_LED_HOLD, - USB_HID_LED_MICRO, - USB_HID_LED_COVERAGE, - USB_HID_LED_NIGHT_MODE, - USB_HID_LED_SEND_CALLS, - USB_HID_LED_CALL_PICKUP, - USB_HID_LED_CONFERENCE, - USB_HID_LED_STAND_BY, - USB_HID_LED_CAMERA_ON, - USB_HID_LED_CAMERA_OFF, - USB_HID_LED_ON_LINE, - USB_HID_LED_OFF_LINE, - USB_HID_LED_BUSY, - USB_HID_LED_READY, - USB_HID_LED_PAPER_OUT, - USB_HID_LED_PAPER_JAM, - USB_HID_LED_REMOTE, - USB_HID_LED_FORWARD, - USB_HID_LED_REVERSE, - USB_HID_LED_STOP, - USB_HID_LED_REWIND, - USB_HID_LED_FAST_FORWARD, - USB_HID_LED_PLAY, - USB_HID_LED_PAUSE, - USB_HID_LED_RECORD, - USB_HID_LED_ERROR, - USB_HID_LED_USAGE_SELECTED_IND, - USB_HID_LED_USAGE_IN_USE_IND, - USB_HID_LED_USAGE_MULTI_MODE_IND, - USB_HID_LED_IND_ON, - USB_HID_LED_IND_FLASH, - USB_HID_LED_IND_SLOW_BLINK, - USB_HID_LED_IND_FAST_BLINK, - USB_HID_LED_IND_OFF, - USB_HID_LED_FLASH_ON_TIME, - USB_HID_LED_SLOW_BLINK_ON_TIME, - USB_HID_LED_SLOW_BLINK_OFF_TIME, - USB_HID_LED_FAST_BLINK_ON_TIME, - USB_HID_LED_FAST_BLINK_OFF_TIME, - USB_HID_LED_USAGE_IND_COLOR, - USB_HID_LED_IND_RED, - USB_HID_LED_IND_GREEN, - USB_HID_LED_IND_AMBER, - USB_HID_LED_GENERIC_IND, - USB_HID_LED_SYSTEM_SUSPEND, - USB_HID_LED_EXTERNAL_POWER -} usb_hid_usage_led_t; - -#endif /* LIBUSB_UTLED_H_ */ -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hid_report_items.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid_report_items.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,106 +1,0 @@ -/* - * Copyright (c) 2011 Matej Klonfar - * 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 - * @brief USB HID parser. - */ -#ifndef LIBUSB_HID_REPORT_ITEMS_H_ -#define LIBUSB_HID_REPORT_ITEMS_H_ - -#include - -/** - * Item prefix - */ -#define USB_HID_ITEM_SIZE(data) ((uint8_t)(data & 0x3)) -#define USB_HID_ITEM_TAG(data) ((uint8_t)((data & 0xF0) >> 4)) -#define USB_HID_ITEM_TAG_CLASS(data) ((uint8_t)((data & 0xC) >> 2)) -#define USB_HID_ITEM_IS_LONG(data) (data == 0xFE) - - -/** - * Input/Output/Feature Item flags - */ -/** Constant (1) / Variable (0) */ -#define USB_HID_ITEM_FLAG_CONSTANT(flags) ((flags & 0x1) == 0x1) -/** Variable (1) / Array (0) */ -#define USB_HID_ITEM_FLAG_VARIABLE(flags) ((flags & 0x2) == 0x2) -/** Absolute / Relative*/ -#define USB_HID_ITEM_FLAG_RELATIVE(flags) ((flags & 0x4) == 0x4) -/** Wrap / No Wrap */ -#define USB_HID_ITEM_FLAG_WRAP(flags) ((flags & 0x8) == 0x8) -#define USB_HID_ITEM_FLAG_LINEAR(flags) ((flags & 0x10) == 0x10) -#define USB_HID_ITEM_FLAG_PREFERRED(flags) ((flags & 0x20) == 0x20) -#define USB_HID_ITEM_FLAG_POSITION(flags) ((flags & 0x40) == 0x40) -#define USB_HID_ITEM_FLAG_VOLATILE(flags) ((flags & 0x80) == 0x80) -#define USB_HID_ITEM_FLAG_BUFFERED(flags) ((flags & 0x100) == 0x100) - -/* MAIN ITEMS */ -#define USB_HID_TAG_CLASS_MAIN 0x0 -#define USB_HID_REPORT_TAG_INPUT 0x8 -#define USB_HID_REPORT_TAG_OUTPUT 0x9 -#define USB_HID_REPORT_TAG_FEATURE 0xB -#define USB_HID_REPORT_TAG_COLLECTION 0xA -#define USB_HID_REPORT_TAG_END_COLLECTION 0xC - -/* GLOBAL ITEMS */ -#define USB_HID_TAG_CLASS_GLOBAL 0x1 -#define USB_HID_REPORT_TAG_USAGE_PAGE 0x0 -#define USB_HID_REPORT_TAG_LOGICAL_MINIMUM 0x1 -#define USB_HID_REPORT_TAG_LOGICAL_MAXIMUM 0x2 -#define USB_HID_REPORT_TAG_PHYSICAL_MINIMUM 0x3 -#define USB_HID_REPORT_TAG_PHYSICAL_MAXIMUM 0x4 -#define USB_HID_REPORT_TAG_UNIT_EXPONENT 0x5 -#define USB_HID_REPORT_TAG_UNIT 0x6 -#define USB_HID_REPORT_TAG_REPORT_SIZE 0x7 -#define USB_HID_REPORT_TAG_REPORT_ID 0x8 -#define USB_HID_REPORT_TAG_REPORT_COUNT 0x9 -#define USB_HID_REPORT_TAG_PUSH 0xA -#define USB_HID_REPORT_TAG_POP 0xB - - -/* LOCAL ITEMS */ -#define USB_HID_TAG_CLASS_LOCAL 0x2 -#define USB_HID_REPORT_TAG_USAGE 0x0 -#define USB_HID_REPORT_TAG_USAGE_MINIMUM 0x1 -#define USB_HID_REPORT_TAG_USAGE_MAXIMUM 0x2 -#define USB_HID_REPORT_TAG_DESIGNATOR_INDEX 0x3 -#define USB_HID_REPORT_TAG_DESIGNATOR_MINIMUM 0x4 -#define USB_HID_REPORT_TAG_DESIGNATOR_MAXIMUM 0x5 -#define USB_HID_REPORT_TAG_STRING_INDEX 0x7 -#define USB_HID_REPORT_TAG_STRING_MINIMUM 0x8 -#define USB_HID_REPORT_TAG_STRING_MAXIMUM 0x9 -#define USB_HID_REPORT_TAG_DELIMITER 0xA - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hiddescriptor.h =================================================================== --- uspace/lib/usb/include/usb/classes/hiddescriptor.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,84 +1,0 @@ -/* - * Copyright (c) 2011 Matej Klonfar - * 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 HID report descriptor and report data parser - */ -#ifndef LIBUSB_HIDDESCRIPTOR_H_ -#define LIBUSB_HIDDESCRIPTOR_H_ - -#include -#include -#include -#include -#include - - -/* - * Descriptor parser functions - */ - -/** */ -int usb_hid_parse_report_descriptor(usb_hid_report_t *report, - const uint8_t *data, size_t size); - -/** */ -void usb_hid_free_report(usb_hid_report_t *report); - -/** */ -void usb_hid_descriptor_print(usb_hid_report_t *report); - - -int usb_hid_report_init(usb_hid_report_t *report); -int usb_hid_report_append_fields(usb_hid_report_t *report, - usb_hid_report_item_t *report_item); - -usb_hid_report_description_t * usb_hid_report_find_description(const usb_hid_report_t *report, uint8_t report_id, usb_hid_report_type_t type); -int usb_hid_report_parse_tag(uint8_t tag, uint8_t class, const uint8_t *data, size_t item_size, - usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); -int usb_hid_report_parse_main_tag(uint8_t tag, const uint8_t *data, size_t item_size, - usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); -int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, size_t item_size, - usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); -int usb_hid_report_parse_local_tag(uint8_t tag, const uint8_t *data, size_t item_size, - usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); - -void usb_hid_descriptor_print_list(link_t *head); -void usb_hid_report_reset_local_items(usb_hid_report_item_t *report_item); -void usb_hid_free_report_list(link_t *head); -usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item); -uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size); - -usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path); -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,90 +1,0 @@ -/* - * Copyright (c) 2011 Matej Klonfar - * 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 HID report descriptor and report data parser - */ -#ifndef LIBUSB_HIDPARSER_H_ -#define LIBUSB_HIDPARSER_H_ - -#include -#include -#include -#include -#include -#include - - -/* - * Input report parser functions - */ -/** */ -int usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data, - size_t size, uint8_t *report_id); - -/** */ -size_t usb_hid_report_input_length(const usb_hid_report_t *report, - usb_hid_report_path_t *path, int flags); - -/* - * Output report parser functions - */ -/** Allocates output report buffer*/ -uint8_t *usb_hid_report_output(usb_hid_report_t *report, size_t *size, - uint8_t report_id); - -/** Frees output report buffer*/ -void usb_hid_report_output_free(uint8_t *output); - -/** Returns size of output for given usage path */ -size_t usb_hid_report_output_size(usb_hid_report_t *report, - usb_hid_report_path_t *path, int flags); - -/** Makes the output report buffer by translated given data */ -int usb_hid_report_output_translate(usb_hid_report_t *report, uint8_t report_id, - uint8_t *buffer, size_t size); - -/** */ -usb_hid_report_field_t *usb_hid_report_get_sibling(usb_hid_report_t *report, - usb_hid_report_field_t *field, - usb_hid_report_path_t *path, - int flags, - usb_hid_report_type_t type); - -/** */ -uint8_t usb_hid_report_get_report_id(usb_hid_report_t *report, - uint8_t report_id, - usb_hid_report_type_t type); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidpath.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidpath.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,118 +1,0 @@ -/* - * Copyright (c) 2011 Matej Klonfar - * 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 HID report descriptor and report data parser - */ -#ifndef LIBUSB_HIDPATH_H_ -#define LIBUSB_HIDPATH_H_ - -#include -#include -#include - -/** - * Description of path of usage pages and usages in report descriptor - */ -/** Wanted usage path must be exactly the same as the searched one */ -#define USB_HID_PATH_COMPARE_STRICT 0 -/** Wanted usage path must be the suffix in the searched one */ -#define USB_HID_PATH_COMPARE_END 1 -/** */ -#define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 2 -/** Searched usage page must be prefix of the other one */ -#define USB_HID_PATH_COMPARE_BEGIN 4 -/** Searched couple of usage page and usage can be anywhere in usage path */ -#define USB_HID_PATH_COMPARE_ANYWHERE 8 - - -/** Collection usage path structure */ -typedef struct { - /** */ - uint32_t usage_page; - /** */ - uint32_t usage; - - uint8_t flags; - /** */ - link_t link; -} usb_hid_report_usage_path_t; - -/** */ -typedef struct { - /** */ - int depth; - uint8_t report_id; - - /** */ - link_t link; /* list */ - - link_t head; /* head of list of usage paths */ - -} usb_hid_report_path_t; - -/** */ -usb_hid_report_path_t *usb_hid_report_path(void); - -/** */ -void usb_hid_report_path_free(usb_hid_report_path_t *path); - -/** */ -int usb_hid_report_path_set_report_id(usb_hid_report_path_t *usage_path, - uint8_t report_id); - -/** */ -int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, - int32_t usage_page, int32_t usage); - -/** */ -void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path); - -/** */ -void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path); - -/** */ -void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, - int32_t tag, int32_t data); - -/** */ -int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, - usb_hid_report_path_t *path, int flags); - -/** */ -usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path); - -void usb_hid_print_usage_path(usb_hid_report_path_t *path); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidreport.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidreport.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,65 +1,0 @@ -/* - * Copyright (c) 2011 Lubos Slovak - * 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 HID report parser initialization from descriptors. - */ - -#ifndef LIBUSB_HIDREPORT_H_ -#define LIBUSB_HIDREPORT_H_ - -#include -#include - -/** - * Retrieves the Report descriptor from the USB device and initializes the - * report parser. - * - * \param dev USB device representing a HID device. - * \param parser HID Report parser. - * - * \retval EOK if successful. - * \retval EINVAL if one of the parameters is not given (is NULL). - * \retval ENOENT if there are some descriptors missing. - * \retval ENOMEM if an error with allocation occured. - * \retval EINVAL if the Report descriptor's size does not match the size - * from the interface descriptor. - * \return Other value inherited from function usb_pipe_start_session(), - * usb_pipe_end_session() or usb_request_get_descriptor(). - */ -int usb_hid_process_report_descriptor(usb_device_t *dev, - usb_hid_report_t *report); - -#endif /* LIBUSB_HIDREPORT_H_ */ - -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidreq.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidreq.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,69 +1,0 @@ -/* - * Copyright (c) 2011 Lubos Slovak - * 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 - * HID class-specific requests. - */ - -#ifndef USB_KBD_HIDREQ_H_ -#define USB_KBD_HIDREQ_H_ - -#include - -#include -#include - -/*----------------------------------------------------------------------------*/ - -int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no, - usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size); - -int usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no, - usb_hid_protocol_t protocol); - -int usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration); - -int usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no, - usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size, - size_t *actual_size); - -int usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no, - usb_hid_protocol_t *protocol); - -int usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration); - -/*----------------------------------------------------------------------------*/ - -#endif /* USB_KBD_HIDREQ_H_ */ - -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidtypes.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidtypes.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,210 +1,0 @@ -/* - * Copyright (c) 2011 Matej Klonfar - * 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 HID report descriptor and report data parser - */ -#ifndef LIBUSB_HIDTYPES_H_ -#define LIBUSB_HIDTYPES_H_ - -#include -#include - -#define USB_HID_MAX_USAGES 20 - -#define USB_HID_UINT32_TO_INT32(x, size) ((((x) & (1 << ((size) - 1))) != 0) ? -(~(x - 1) & ((1 << size) - 1)) : (x)) //(-(~((x) - 1))) -#define USB_HID_INT32_TO_UINT32(x, size) (((x) < 0 ) ? ((1 << (size)) + (x)) : (x)) - - -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 struct { - /** */ - int report_count; - link_t reports; /** list of usb_hid_report_description_t */ - - link_t collection_paths; - int collection_paths_count; - - int use_report_ids; - uint8_t last_report_id; - -} usb_hid_report_t; - -typedef struct { - uint8_t report_id; - usb_hid_report_type_t type; - - size_t bit_length; - size_t item_length; - - link_t report_items; /** list of report items (fields) */ - - link_t link; -} usb_hid_report_description_t; - -typedef struct { - - int offset; - size_t size; - - uint16_t usage_page; - uint16_t usage; - - uint8_t item_flags; - usb_hid_report_path_t *collection_path; - - int32_t logical_minimum; - int32_t logical_maximum; - int32_t physical_minimum; - int32_t physical_maximum; - uint32_t usage_minimum; - uint32_t usage_maximum; - uint32_t unit; - uint32_t unit_exponent; - - - int32_t value; - - link_t link; -} usb_hid_report_field_t; - - - -/** - * state table - */ -typedef struct { - /** report id */ - int32_t id; - - /** */ - uint16_t extended_usage_page; - uint32_t usages[USB_HID_MAX_USAGES]; - int usages_count; - - /** */ - uint32_t usage_page; - - /** */ - uint32_t usage_minimum; - /** */ - uint32_t usage_maximum; - /** */ - int32_t logical_minimum; - /** */ - int32_t logical_maximum; - /** */ - int32_t size; - /** */ - int32_t count; - /** */ - size_t offset; - /** */ - int32_t unit_exponent; - /** */ - int32_t unit; - - /** */ - uint32_t string_index; - /** */ - uint32_t string_minimum; - /** */ - uint32_t string_maximum; - /** */ - uint32_t designator_index; - /** */ - uint32_t designator_minimum; - /** */ - uint32_t designator_maximum; - /** */ - int32_t physical_minimum; - /** */ - int32_t physical_maximum; - - /** */ - uint8_t item_flags; - - usb_hid_report_type_t type; - - /** current collection path*/ - usb_hid_report_path_t *usage_path; - /** */ - link_t link; - - int in_delimiter; -} usb_hid_report_item_t; - -/** HID parser callbacks for IN items. */ -typedef struct { - /** Callback for keyboard. - * - * @param key_codes Array of pressed key (including modifiers). - * @param count Length of @p key_codes. - * @param arg Custom argument. - */ - void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t report_id, void *arg); -} 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; - -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 -}; - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidut.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidut.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,73 +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 - * @{ - */ -/** @file - * @brief USB HID Usage Tables. - */ -#ifndef LIBUSB_HIDUT_H_ -#define LIBUSB_HIDUT_H_ - -/** USB/HID Usage Pages. */ -typedef enum { - USB_HIDUT_PAGE_GENERIC_DESKTOP = 1, - USB_HIDUT_PAGE_SIMULATION = 2, - USB_HIDUT_PAGE_VR = 3, - USB_HIDUT_PAGE_SPORT = 4, - USB_HIDUT_PAGE_GAME = 5, - USB_HIDUT_PAGE_GENERIC_DEVICE = 6, - USB_HIDUT_PAGE_KEYBOARD = 7, - USB_HIDUT_PAGE_LED = 8, - USB_HIDUT_PAGE_BUTTON = 9, - USB_HIDUT_PAGE_ORDINAL = 0x0a, - USB_HIDUT_PAGE_TELEPHONY_DEVICE = 0x0b, - USB_HIDUT_PAGE_CONSUMER = 0x0c -} usb_hidut_usage_page_t; - -/** Usages for Generic Desktop Page. */ -typedef enum { - USB_HIDUT_USAGE_GENERIC_DESKTOP_POINTER = 1, - USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE = 2, - USB_HIDUT_USAGE_GENERIC_DESKTOP_JOYSTICK = 4, - USB_HIDUT_USAGE_GENERIC_DESKTOP_GAMEPAD = 5, - USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD = 6, - USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7, - USB_HIDUT_USAGE_GENERIC_DESKTOP_X = 0x30, - USB_HIDUT_USAGE_GENERIC_DESKTOP_Y = 0x31, - USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL = 0x38 - /* USB_HIDUT_USAGE_GENERIC_DESKTOP_ = , */ - -} usb_hidut_usage_generic_desktop_t; - - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/classes/hidutkbd.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidutkbd.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,175 +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 - * @{ - */ -/** @file - * @brief USB HID key codes. - * @details - * This is not a typical header as by default it is equal to empty file. - * However, by cleverly defining the USB_HIDUT_KBD_KEY you can use it - * to generate conversion tables etc. - * - * For example, this creates enum for known keys: - * @code -#define USB_HIDUT_KBD_KEY(name, usage_id, l, lc, l1, l2) \ - USB_KBD_KEY_##name = usage_id, -typedef enum { - #include -} usb_key_code_t; - @endcode - * - * Maybe, it might be better that you would place such enums into separate - * files and create them as separate step before compiling to allow tools - * such as Doxygen get the definitions right. - * - * @warning This file does not include guard to prevent multiple inclusions - * into a single file. - */ - - -#ifndef USB_HIDUT_KBD_KEY -/** Declare keyboard key. - * @param name Key name (identifier). - * @param usage_id Key code (see Keyboard/Keypad Page (0x07) in HUT1.12. - * @param letter Corresponding character (0 if not applicable). - * @param letter_caps Corresponding character with Caps on. - * @param letter_mod1 Corresponding character with modifier #1 on. - * @param letter_mod2 Corresponding character with modifier #2 on. - */ -#define USB_HIDUT_KBD_KEY(name, usage_id, letter, letter_caps, letter_mod1, letter_mod2) - -#endif - -#define __NONPRINT(name, usage_id) \ - USB_HIDUT_KBD_KEY(name, usage_id, 0, 0, 0, 0) - -/* US alphabet letters */ -USB_HIDUT_KBD_KEY(A, 0x04, 'a', 'A', 0, 0) -USB_HIDUT_KBD_KEY(B, 0x05, 'b', 'B', 0, 0) -USB_HIDUT_KBD_KEY(C, 0x06, 'c', 'C', 0, 0) -USB_HIDUT_KBD_KEY(D, 0x07, 'd', 'D', 0, 0) -USB_HIDUT_KBD_KEY(E, 0x08, 'e', 'E', 0, 0) -USB_HIDUT_KBD_KEY(F, 0x09, 'f', 'F', 0, 0) -USB_HIDUT_KBD_KEY(G, 0x0A, 'g', 'G', 0, 0) -USB_HIDUT_KBD_KEY(H, 0x0B, 'h', 'H', 0, 0) -USB_HIDUT_KBD_KEY(I, 0x0C, 'i', 'I', 0, 0) -USB_HIDUT_KBD_KEY(J, 0x0D, 'j', 'J', 0, 0) -USB_HIDUT_KBD_KEY(K, 0x0E, 'k', 'K', 0, 0) -USB_HIDUT_KBD_KEY(L, 0x0F, 'l', 'L', 0, 0) -USB_HIDUT_KBD_KEY(M, 0x10, 'm', 'M', 0, 0) -USB_HIDUT_KBD_KEY(N, 0x11, 'n', 'N', 0, 0) -USB_HIDUT_KBD_KEY(O, 0x12, 'o', 'O', 0, 0) -USB_HIDUT_KBD_KEY(P, 0x13, 'p', 'P', 0, 0) -USB_HIDUT_KBD_KEY(Q, 0x14, 'q', 'Q', 0, 0) -USB_HIDUT_KBD_KEY(R, 0x15, 'r', 'R', 0, 0) -USB_HIDUT_KBD_KEY(S, 0x16, 's', 'S', 0, 0) -USB_HIDUT_KBD_KEY(T, 0x17, 't', 'T', 0, 0) -USB_HIDUT_KBD_KEY(U, 0x18, 'u', 'U', 0, 0) -USB_HIDUT_KBD_KEY(V, 0x19, 'v', 'V', 0, 0) -USB_HIDUT_KBD_KEY(W, 0x1A, 'w', 'W', 0, 0) -USB_HIDUT_KBD_KEY(X, 0x1B, 'x', 'X', 0, 0) -USB_HIDUT_KBD_KEY(Y, 0x1C, 'y', 'Y', 0, 0) -USB_HIDUT_KBD_KEY(Z, 0x1D, 'z', 'Z', 0, 0) - -/* Keyboard digits */ -USB_HIDUT_KBD_KEY(1, 0x1E, '1', '!', 0, 0) -USB_HIDUT_KBD_KEY(2, 0x1F, '2', '@', 0, 0) -USB_HIDUT_KBD_KEY(3, 0x20, '3', '#', 0, 0) -USB_HIDUT_KBD_KEY(4, 0x21, '4', '$', 0, 0) -USB_HIDUT_KBD_KEY(5, 0x22, '5', '%', 0, 0) -USB_HIDUT_KBD_KEY(6, 0x23, '6', '^', 0, 0) -USB_HIDUT_KBD_KEY(7, 0x24, '7', '&', 0, 0) -USB_HIDUT_KBD_KEY(8, 0x25, '8', '*', 0, 0) -USB_HIDUT_KBD_KEY(9, 0x26, '9', '(', 0, 0) -USB_HIDUT_KBD_KEY(0, 0x27, '0', ')', 0, 0) - -/* More-or-less typewriter command keys */ -USB_HIDUT_KBD_KEY(ENTER, 0x28, '\n', 0, 0, 0) -USB_HIDUT_KBD_KEY(ESCAPE, 0x29, 0, 0, 0, 0) -USB_HIDUT_KBD_KEY(BACKSPACE, 0x2A, '\b', 0, 0, 0) -USB_HIDUT_KBD_KEY(TAB, 0x2B, '\t', 0, 0, 0) -USB_HIDUT_KBD_KEY(SPACE, 0x2C, ' ', 0, 0, 0) - -/* Special (printable) characters */ -USB_HIDUT_KBD_KEY(DASH, 0x2D, '-', '_', 0, 0) -USB_HIDUT_KBD_KEY(EQUALS, 0x2E, '=', '+', 0, 0) -USB_HIDUT_KBD_KEY(LEFT_BRACKET, 0x2F, '[', '{', 0, 0) -USB_HIDUT_KBD_KEY(RIGHT_BRACKET, 0x30, ']', '}', 0, 0) -USB_HIDUT_KBD_KEY(BACKSLASH, 0x31, '\\', '|', 0, 0) -USB_HIDUT_KBD_KEY(HASH, 0x32, '#', '~', 0, 0) -USB_HIDUT_KBD_KEY(SEMICOLON, 0x33, ';', ':', 0, 0) -USB_HIDUT_KBD_KEY(APOSTROPHE, 0x34, '\'', '"', 0, 0) -USB_HIDUT_KBD_KEY(GRAVE_ACCENT, 0x35, '`', '~', 0, 0) -USB_HIDUT_KBD_KEY(COMMA, 0x36, ',', '<', 0, 0) -USB_HIDUT_KBD_KEY(PERIOD, 0x37, '.', '>', 0, 0) -USB_HIDUT_KBD_KEY(SLASH, 0x38, '/', '?', 0, 0) - -USB_HIDUT_KBD_KEY(CAPS_LOCK, 0x39, 0, 0, 0, 0) - -/* Function keys */ -__NONPRINT( F1, 0x3A) -__NONPRINT( F2, 0x3B) -__NONPRINT( F3, 0x3C) -__NONPRINT( F4, 0x3D) -__NONPRINT( F5, 0x3E) -__NONPRINT( F6, 0x3F) -__NONPRINT( F7, 0x40) -__NONPRINT( F8, 0x41) -__NONPRINT( F9, 0x42) -__NONPRINT(F10, 0x43) -__NONPRINT(F11, 0x44) -__NONPRINT(F12, 0x45) - -/* Cursor movement keys & co. */ -__NONPRINT(PRINT_SCREEN, 0x46) -__NONPRINT(SCROLL_LOCK, 0x47) -__NONPRINT(PAUSE, 0x48) -__NONPRINT(INSERT, 0x49) -__NONPRINT(HOME, 0x4A) -__NONPRINT(PAGE_UP, 0x4B) -__NONPRINT(DELETE, 0x4C) -__NONPRINT(END, 0x4D) -__NONPRINT(PAGE_DOWN, 0x4E) -__NONPRINT(RIGHT_ARROW, 0x4F) -__NONPRINT(LEFT_ARROW, 0x50) -__NONPRINT(DOWN_ARROW, 0x51) -__NONPRINT(UP_ARROW, 0x52) - - - - -/* USB_HIDUT_KBD_KEY(, 0x, '', '', 0, 0) */ - -#undef __NONPRINT - -/** - * @} - */ - Index: uspace/lib/usb/include/usb/ddfiface.h =================================================================== --- uspace/lib/usb/include/usb/ddfiface.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ uspace/lib/usb/include/usb/ddfiface.h (revision 64a36e2580645d7e590bb9e258bfb8e66c39e52c) @@ -37,5 +37,4 @@ #include -#include #include Index: uspace/lib/usb/include/usb/descriptor.h =================================================================== --- uspace/lib/usb/include/usb/descriptor.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ uspace/lib/usb/include/usb/descriptor.h (revision 64a36e2580645d7e590bb9e258bfb8e66c39e52c) @@ -167,4 +167,46 @@ } __attribute__ ((packed)) usb_standard_endpoint_descriptor_t; +/** Part of standard USB HID descriptor specifying one class descriptor. + * + * (See HID Specification, p.22) + */ +typedef struct { + /** 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. + * + * (See HID Specification, p.22) + * + * 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 { + /** 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). */ + uint8_t descriptor_type; + /** HID Class Specification release. */ + uint16_t spec_release; + /** Country code of localized hardware. */ + uint8_t country_code; + /** 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; + #endif /** Index: uspace/lib/usb/include/usb/devdrv.h =================================================================== --- uspace/lib/usb/include/usb/devdrv.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,178 +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 libusb - * @{ - */ -/** @file - * USB device driver framework. - */ -#ifndef LIBUSB_DEVDRV_H_ -#define LIBUSB_DEVDRV_H_ - -#include - -/** Descriptors for USB device. */ -typedef struct { - /** Standard device descriptor. */ - usb_standard_device_descriptor_t device; - /** Full configuration descriptor of current configuration. */ - uint8_t *configuration; - size_t configuration_size; -} usb_device_descriptors_t; - -/** Wrapper for data related to alternate interface setting. - * The pointers will typically point inside configuration descriptor and - * thus you shall not deallocate them. - */ -typedef struct { - /** Interface descriptor. */ - usb_standard_interface_descriptor_t *interface; - /** Pointer to start of descriptor tree bound with this interface. */ - uint8_t *nested_descriptors; - /** Size of data pointed by nested_descriptors in bytes. */ - size_t nested_descriptors_size; -} usb_alternate_interface_descriptors_t; - -/** Alternate interface settings. */ -typedef struct { - /** Array of alternate interfaces descriptions. */ - usb_alternate_interface_descriptors_t *alternatives; - /** Size of @c alternatives array. */ - size_t alternative_count; - /** Index of currently selected one. */ - size_t current; -} usb_alternate_interfaces_t; - -/** USB device structure. */ -typedef struct { - /** The default control pipe. */ - usb_pipe_t ctrl_pipe; - /** Other endpoint pipes. - * This is an array of other endpoint pipes in the same order as - * in usb_driver_t. - */ - usb_endpoint_mapping_t *pipes; - /** Number of other endpoint pipes. */ - size_t pipes_count; - /** Current interface. - * Usually, drivers operate on single interface only. - * This item contains the value of the interface or -1 for any. - */ - int interface_no; - - /** Alternative interfaces. - * Set to NULL when the driver controls whole device - * (i.e. more (or any) interfaces). - */ - usb_alternate_interfaces_t *alternate_interfaces; - - /** Some useful descriptors. */ - usb_device_descriptors_t descriptors; - - /** Generic DDF device backing this one. */ - ddf_dev_t *ddf_dev; - /** Custom driver data. - * Do not use the entry in generic device, that is already used - * by the framework. - */ - void *driver_data; - - /** Connection backing the pipes. - * Typically, you will not need to use this attribute at all. - */ - usb_device_connection_t wire; -} usb_device_t; - -/** USB driver ops. */ -typedef struct { - /** Callback when new device is about to be controlled by the driver. */ - int (*add_device)(usb_device_t *); -} usb_driver_ops_t; - -/** USB driver structure. */ -typedef struct { - /** Driver name. - * This name is copied to the generic driver name and must be exactly - * the same as the directory name where the driver executable resides. - */ - const char *name; - /** Expected endpoints description. - * This description shall exclude default control endpoint (pipe zero) - * and must be NULL terminated. - * When only control endpoint is expected, you may set NULL directly - * without creating one item array containing NULL. - * - * When the driver expect single interrupt in endpoint, - * the initialization may look like this: -\code -static usb_endpoint_description_t poll_endpoint_description = { - .transfer_type = USB_TRANSFER_INTERRUPT, - .direction = USB_DIRECTION_IN, - .interface_class = USB_CLASS_HUB, - .interface_subclass = 0, - .interface_protocol = 0, - .flags = 0 -}; - -static usb_endpoint_description_t *hub_endpoints[] = { - &poll_endpoint_description, - NULL -}; - -static usb_driver_t hub_driver = { - .endpoints = hub_endpoints, - ... -}; -\endcode - */ - usb_endpoint_description_t **endpoints; - /** Driver ops. */ - usb_driver_ops_t *ops; -} usb_driver_t; - -int usb_driver_main(usb_driver_t *); - -int usb_device_select_interface(usb_device_t *, uint8_t, - usb_endpoint_description_t **); - -int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *); -int usb_device_create_pipes(ddf_dev_t *, usb_device_connection_t *, - usb_endpoint_description_t **, uint8_t *, size_t, int, int, - usb_endpoint_mapping_t **, size_t *); -int usb_device_destroy_pipes(ddf_dev_t *, usb_endpoint_mapping_t *, size_t); -int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **); - -size_t usb_interface_count_alternates(uint8_t *, size_t, uint8_t); -int usb_alternate_interfaces_create(uint8_t *, size_t, int, - usb_alternate_interfaces_t **); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/devpoll.h =================================================================== --- uspace/lib/usb/include/usb/devpoll.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,99 +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 libusb - * @{ - */ -/** @file - * USB device polling functions. - */ -#ifndef LIBUSB_DEVPOLL_H_ -#define LIBUSB_DEVPOLL_H_ - -#include -#include - -typedef struct { - /** Level of debugging messages from auto polling. - * 0 - nothing - * 1 - inform about errors and polling start/end - * 2 - also dump every retrieved buffer - */ - int debug; - /** Maximum number of consecutive errors before polling termination. */ - size_t max_failures; - /** Delay between poll requests in milliseconds. - * Set to negative value to use value from endpoint descriptor. - */ - int delay; - /** Whether to automatically try to clear the HALT feature after - * the endpoint stalls. - */ - bool auto_clear_halt; - /** Callback when data arrives. - * - * @param dev Device that was polled. - * @param data Data buffer (in USB endianness). - * @param data_size Size of the @p data buffer in bytes. - * @param arg Custom argument. - * @return Whether to continue in polling. - */ - bool (*on_data)(usb_device_t *dev, uint8_t *data, size_t data_size, - void *arg); - /** Callback when polling is terminated. - * - * @param dev Device where the polling was terminated. - * @param due_to_errors Whether polling stopped due to several failures. - * @param arg Custom argument. - */ - void (*on_polling_end)(usb_device_t *dev, bool due_to_errors, - void *arg); - /** Callback when error occurs. - * - * @param dev Device where error occurred. - * @param err_code Error code (as returned from usb_pipe_read). - * @param arg Custom argument. - * @return Whether to continue in polling. - */ - bool (*on_error)(usb_device_t *dev, int err_code, void *arg); -} usb_device_auto_polling_t; - -int usb_device_auto_polling(usb_device_t *, size_t, usb_device_auto_polling_t *, - size_t, void *); - -typedef bool (*usb_polling_callback_t)(usb_device_t *, - uint8_t *, size_t, void *); -typedef void (*usb_polling_terminted_callback_t)(usb_device_t *, bool, void *); - -int usb_device_auto_poll(usb_device_t *, size_t, - usb_polling_callback_t, size_t, usb_polling_terminted_callback_t, void *); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/dp.h =================================================================== --- uspace/lib/usb/include/usb/dp.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,85 +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 libusb - * @{ - */ -/** @file - * USB descriptor parser. - */ -#ifndef LIBUSB_DP_H_ -#define LIBUSB_DP_H_ - -#include -#include -#include - -/** USB descriptors nesting. - * The nesting describes the logical tree USB descriptors form - * (e.g. that endpoint descriptor belongs to interface or that - * interface belongs to configuration). - * - * See usb_descriptor_type_t for descriptor constants. - */ -typedef struct { - /** Child descriptor id. */ - int child; - /** Parent descriptor id. */ - int parent; -} usb_dp_descriptor_nesting_t; - -extern usb_dp_descriptor_nesting_t usb_dp_standard_descriptor_nesting[]; - -/** Descriptor parser structure. */ -typedef struct { - /** Used descriptor nesting. */ - usb_dp_descriptor_nesting_t *nesting; -} usb_dp_parser_t; - -/** Descriptor parser data. */ -typedef struct { - /** Data to be parsed. */ - uint8_t *data; - /** Size of input data in bytes. */ - size_t size; - /** Custom argument. */ - void *arg; -} usb_dp_parser_data_t; - -uint8_t *usb_dp_get_nested_descriptor(usb_dp_parser_t *, - usb_dp_parser_data_t *, uint8_t *); -uint8_t *usb_dp_get_sibling_descriptor(usb_dp_parser_t *, - usb_dp_parser_data_t *, uint8_t *, uint8_t *); - -void usb_dp_walk_simple(uint8_t *, size_t, usb_dp_descriptor_nesting_t *, - void (*)(uint8_t *, size_t, void *), void *); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/driver.h =================================================================== --- uspace/lib/usb/include/usb/driver.h (revision 64a36e2580645d7e590bb9e258bfb8e66c39e52c) +++ uspace/lib/usb/include/usb/driver.h (revision 64a36e2580645d7e590bb9e258bfb8e66c39e52c) @@ -0,0 +1,46 @@ +/* + * 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 + * Common definitions for USB drivers. + */ +#ifndef LIBUSB_DRIVER_H_ +#define LIBUSB_DRIVER_H_ + +#include +#include + +int usb_hc_find(devman_handle_t, devman_handle_t *); + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/host/batch.h =================================================================== --- uspace/lib/usb/include/usb/host/batch.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,101 +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 libusb - * @{ - */ -/** @file - * USB transfer transaction structures. - */ -#ifndef LIBUSB_HOST_BATCH_H -#define LIBUSB_HOST_BATCH_H - -#include - -#include -#include -#include - -typedef struct usb_transfer_batch usb_transfer_batch_t; -struct usb_transfer_batch { - endpoint_t *ep; - link_t link; - usbhc_iface_transfer_in_callback_t callback_in; - usbhc_iface_transfer_out_callback_t callback_out; - void *arg; - char *buffer; - char *data_buffer; - size_t buffer_size; - char *setup_buffer; - size_t setup_size; - size_t transfered_size; - void (*next_step)(usb_transfer_batch_t *); - int error; - ddf_fun_t *fun; - void *private_data; - void (*private_data_dtor)(void *p_data); -}; - -void usb_transfer_batch_init( - usb_transfer_batch_t *instance, - endpoint_t *ep, - char *buffer, - char *data_buffer, - size_t buffer_size, - char *setup_buffer, - size_t setup_size, - usbhc_iface_transfer_in_callback_t func_in, - usbhc_iface_transfer_out_callback_t func_out, - void *arg, - ddf_fun_t *fun, - void *private_data, - void (*private_data_dtor)(void *p_data) -); - -void usb_transfer_batch_call_in_and_dispose(usb_transfer_batch_t *instance); -void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance); -void usb_transfer_batch_finish(usb_transfer_batch_t *instance); -void usb_transfer_batch_dispose(usb_transfer_batch_t *instance); - -static inline void usb_transfer_batch_finish_error( - usb_transfer_batch_t *instance, int error) -{ - assert(instance); - instance->error = error; - usb_transfer_batch_finish(instance); -} - -static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *l) -{ - assert(l); - return list_get_instance(l, usb_transfer_batch_t, link); -} - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/host/device_keeper.h =================================================================== --- uspace/lib/usb/include/usb/host/device_keeper.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,90 +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 libusb - * @{ - */ -/** @file - * Device keeper structure and functions. - * - * Typical USB host controller needs to keep track of various settings for - * each device that is connected to it. - * State of toggle bit, device speed etc. etc. - * This structure shall simplify the management. - */ -#ifndef LIBUSB_HOST_DEVICE_KEEPER_H -#define LIBUSB_HOST_DEVICE_KEEPER_H - -#include -#include -#include -#include -#include - -/** Number of USB address for array dimensions. */ -#define USB_ADDRESS_COUNT (USB11_ADDRESS_MAX + 1) - -/** Information about attached USB device. */ -struct usb_device_info { - usb_speed_t speed; - bool occupied; - devman_handle_t handle; -}; - -/** Host controller device keeper. - * You shall not access members directly but only using functions below. - */ -typedef struct { - struct usb_device_info devices[USB_ADDRESS_COUNT]; - fibril_mutex_t guard; - usb_address_t last_address; -} usb_device_keeper_t; - -void usb_device_keeper_init(usb_device_keeper_t *instance); - -usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance, - usb_speed_t speed); - -void usb_device_keeper_bind(usb_device_keeper_t *instance, - usb_address_t address, devman_handle_t handle); - -void usb_device_keeper_release(usb_device_keeper_t *instance, - usb_address_t address); - -usb_address_t usb_device_keeper_find(usb_device_keeper_t *instance, - devman_handle_t handle); - -bool usb_device_keeper_find_by_address(usb_device_keeper_t *instance, - usb_address_t address, devman_handle_t *handle); - -usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance, - usb_address_t address); -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/host/endpoint.h =================================================================== --- uspace/lib/usb/include/usb/host/endpoint.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,86 +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 libusb - * @{ - */ -/** @file - * - */ -#ifndef LIBUSB_HOST_ENDPOINT_H -#define LIBUSB_HOST_ENDPOINT_H - -#include -#include -#include -#include - -#include - -typedef struct endpoint { - usb_address_t address; - usb_endpoint_t endpoint; - usb_direction_t direction; - usb_transfer_type_t transfer_type; - usb_speed_t speed; - size_t max_packet_size; - unsigned toggle:1; - fibril_mutex_t guard; - fibril_condvar_t avail; - volatile bool active; - struct { - void *data; - int (*toggle_get)(void *); - void (*toggle_set)(void *, int); - } hc_data; -} endpoint_t; - -int endpoint_init(endpoint_t *instance, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction, - usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size); - -void endpoint_destroy(endpoint_t *instance); - -void endpoint_set_hc_data(endpoint_t *instance, - void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int)); - -void endpoint_clear_hc_data(endpoint_t *instance); - -void endpoint_use(endpoint_t *instance); - -void endpoint_release(endpoint_t *instance); - -int endpoint_toggle_get(endpoint_t *instance); - -void endpoint_toggle_set(endpoint_t *instance, int toggle); - -void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target); -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/host/usb_endpoint_manager.h =================================================================== --- uspace/lib/usb/include/usb/host/usb_endpoint_manager.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,105 +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 libusb - * @{ - */ -/** @file - * Device keeper structure and functions. - * - * Typical USB host controller needs to keep track of various settings for - * each device that is connected to it. - * State of toggle bit, device speed etc. etc. - * This structure shall simplify the management. - */ -#ifndef LIBUSB_HOST_USB_ENDPOINT_MANAGER_H -#define LIBUSB_HOST_YSB_ENDPOINT_MANAGER_H - -#include -#include -#include -#include - -#define BANDWIDTH_TOTAL_USB11 12000000 -#define BANDWIDTH_AVAILABLE_USB11 ((BANDWIDTH_TOTAL_USB11 / 10) * 9) - -typedef struct usb_endpoint_manager { - hash_table_t ep_table; - fibril_mutex_t guard; - fibril_condvar_t change; - size_t free_bw; -} usb_endpoint_manager_t; - -size_t bandwidth_count_usb11(usb_speed_t speed, usb_transfer_type_t type, - size_t size, size_t max_packet_size); - -int usb_endpoint_manager_init(usb_endpoint_manager_t *instance, - size_t available_bandwidth); - -void usb_endpoint_manager_destroy(usb_endpoint_manager_t *instance); - -int usb_endpoint_manager_register_ep(usb_endpoint_manager_t *instance, - endpoint_t *ep, size_t data_size); - -int usb_endpoint_manager_unregister_ep(usb_endpoint_manager_t *instance, - usb_address_t address, usb_endpoint_t ep, usb_direction_t direction); - -endpoint_t * usb_endpoint_manager_get_ep(usb_endpoint_manager_t *instance, - usb_address_t address, usb_endpoint_t ep, usb_direction_t direction, - size_t *bw); - -void usb_endpoint_manager_reset_if_need( - usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data); - -static inline int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance, - usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction, - usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size, - size_t data_size) -{ - endpoint_t *ep = malloc(sizeof(endpoint_t)); - if (ep == NULL) - return ENOMEM; - - int ret = endpoint_init(ep, address, endpoint, direction, type, speed, - max_packet_size); - if (ret != EOK) { - free(ep); - return ret; - } - - ret = usb_endpoint_manager_register_ep(instance, ep, data_size); - if (ret != EOK) { - endpoint_destroy(ep); - return ret; - } - return EOK; -} -#endif -/** - * @} - */ - Index: uspace/lib/usb/include/usb/hub.h =================================================================== --- uspace/lib/usb/include/usb/hub.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,71 +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 libusb - * @{ - */ -/** @file - * Functions needed by hub drivers. - * - * For class specific requests, see usb/classes/hub.h. - */ -#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; - -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); -int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t, - devman_handle_t *); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/pipes.h =================================================================== --- uspace/lib/usb/include/usb/pipes.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,193 +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 libusb - * @{ - */ -/** @file - * USB pipes representation. - */ -#ifndef LIBUSB_PIPES_H_ -#define LIBUSB_PIPES_H_ - -#include -#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). - * - * Locking order: if you want to lock both mutexes - * (@c guard and @c hc_phone_mutex), lock @c guard first. - * It is not necessary to lock @c guard if you want to lock @c hc_phone_mutex - * only. - */ -typedef struct { - /** Guard of the whole pipe. */ - fibril_mutex_t guard; - - /** 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. - * It is an error to access this member without @c hc_phone_mutex - * being locked. - * If call over the phone is to be made, it must be preceeded by - * call to pipe_add_ref() [internal libusb function]. - */ - int hc_phone; - - /** Guard for serialization of requests over the phone. */ - fibril_mutex_t hc_phone_mutex; - - /** Number of active transfers over the pipe. */ - int refcount; - /** Number of failed attempts to open the HC phone. - * When user requests usb_pipe_start_long_transfer() and the operation - * fails, there is no way to report this to the user. - * That the soft reference counter is increased to record the attempt. - * When the user then request e.g. usb_pipe_read(), it will try to - * add reference as well. - * If that fails, it is reported to the user. If it is okay, the - * real reference counter is incremented. - * The problem might arise when ending the long transfer (since - * the number of references would be only 1, but logically it shall be - * two). - * Decrementing the soft counter first shall solve this. - */ - int refcount_soft; - - /** Whether to automatically reset halt on the endpoint. - * Valid only for control endpoint zero. - */ - bool auto_reset_halt; -} usb_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_pipe_t *pipe; - /** Endpoint description. */ - const usb_endpoint_description_t *description; - /** Interface number the endpoint must belong to (-1 for any). */ - int interface_no; - /** Alternate interface setting to choose. */ - int interface_setting; - /** Found descriptor fitting the description. */ - usb_standard_endpoint_descriptor_t *descriptor; - /** Interface descriptor 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 *); -usb_address_t usb_device_get_assigned_address(devman_handle_t); - -int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *, - usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t); -int usb_pipe_initialize_default_control(usb_pipe_t *, - usb_device_connection_t *); -int usb_pipe_probe_default_control(usb_pipe_t *); -int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *, - size_t, uint8_t *, size_t, usb_device_connection_t *); -int usb_pipe_register_with_speed(usb_pipe_t *, usb_speed_t, - unsigned int, usb_hc_connection_t *); -int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *); -int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *); - -void usb_pipe_start_long_transfer(usb_pipe_t *); -void usb_pipe_end_long_transfer(usb_pipe_t *); - -int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *); -int usb_pipe_write(usb_pipe_t *, void *, size_t); - -int usb_pipe_control_read(usb_pipe_t *, void *, size_t, - void *, size_t, size_t *); -int usb_pipe_control_write(usb_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 eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,58 +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 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_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 eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,148 +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 libusb - * @{ - */ -/** @file - * Standard USB requests. - */ -#ifndef LIBUSB_REQUEST_H_ -#define LIBUSB_REQUEST_H_ - -#include -#include -#include -#include -#include - -/** USB device status - device is self powered (opposed to bus powered). */ -#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0)) - -/** USB device status - remote wake-up signaling is enabled. */ -#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1)) - -/** USB endpoint status - endpoint is halted (stalled). */ -#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0)) - -/** USB feature selector - endpoint halt (stall). */ -#define USB_FEATURE_SELECTOR_ENDPOINT_HALT (0) - -/** USB feature selector - device remote wake-up. */ -#define USB_FEATURE_SELECTOR_REMOTE_WAKEUP (1) - -/** 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 endianness */ - 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_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_pipe_t *, - usb_request_type_t, usb_request_recipient_t, uint8_t, - uint16_t, uint16_t, void *, size_t, size_t *); - -int usb_request_get_status(usb_pipe_t *, usb_request_recipient_t, - uint16_t, uint16_t *); -int usb_request_clear_feature(usb_pipe_t *, usb_request_type_t, - usb_request_recipient_t, uint16_t, uint16_t); -int usb_request_set_feature(usb_pipe_t *, usb_request_type_t, - usb_request_recipient_t, uint16_t, uint16_t); -int usb_request_set_address(usb_pipe_t *, usb_address_t); -int usb_request_get_descriptor(usb_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_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_pipe_t *, - usb_standard_device_descriptor_t *); -int usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int, - usb_standard_configuration_descriptor_t *); -int usb_request_get_full_configuration_descriptor(usb_pipe_t *, int, - void *, size_t, size_t *); -int usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *, - int, void **, size_t *); -int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t, - usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t); -int usb_request_get_configuration(usb_pipe_t *, uint8_t *); -int usb_request_set_configuration(usb_pipe_t *, uint8_t); -int usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *); -int usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t); - -int usb_request_get_supported_languages(usb_pipe_t *, - l18_win_locales_t **, size_t *); -int usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t, - char **); - -int usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t); - -#endif -/** - * @} - */ Index: uspace/lib/usb/include/usb/usbdevice.h =================================================================== --- uspace/lib/usb/include/usb/usbdevice.h (revision eb2f7dda503f968308ff974fda1442ae818f1e68) +++ (revision ) @@ -1,67 +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 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 -/** - * @} - */