Index: uspace/lib/usb/include/usb/classes/hid/iface.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid/iface.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) +++ uspace/lib/usb/include/usb/classes/hid/iface.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -0,0 +1,47 @@ +/* + * 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/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/classes/hidparser.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -317,4 +317,5 @@ usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path); +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); /* Index: uspace/lib/usb/include/usb/classes/hub.h =================================================================== --- uspace/lib/usb/include/usb/classes/hub.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/classes/hub.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -43,4 +43,6 @@ */ typedef enum { + USB_HUB_FEATURE_HUB_LOCAL_POWER = 0, + USB_HUB_FEATURE_HUB_OVER_CURRENT = 1, USB_HUB_FEATURE_C_HUB_LOCAL_POWER = 0, USB_HUB_FEATURE_C_HUB_OVER_CURRENT = 1, @@ -59,4 +61,5 @@ /* USB_HUB_FEATURE_ = , */ } usb_hub_class_feature_t; + /** Header of standard hub descriptor without the "variadic" part. */ @@ -149,5 +152,5 @@ maximum of 255 ports). */ - uint8_t * devices_removable; + uint8_t devices_removable[32]; /** Index: uspace/lib/usb/include/usb/classes/massstor.h =================================================================== --- uspace/lib/usb/include/usb/classes/massstor.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) +++ uspace/lib/usb/include/usb/classes/massstor.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -0,0 +1,68 @@ +/* + * 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 mass storage related functions and constants. + */ +#ifndef LIBUSB_CLASS_MASSSTOR_H_ +#define LIBUSB_CLASS_MASSSTOR_H_ + +#include + +/** USB mass storage subclasses. */ +typedef enum { + USB_MASSSTOR_SUBCLASS_RBC = 0x01, + /** Also known as MMC-5. */ + USB_MASSSTOR_SUBCLASS_ATAPI = 0x02, + USB_MASSSTOR_SUBCLASS_UFI = 0x04, + USB_MASSSTOR_SUBCLASS_SCSI = 0x06, + USB_MASSSTOR_SUBCLASS_LSDFS = 0x07, + USB_MASSSTOR_SUBCLASS_IEEE1667 = 0x08, + USB_MASSSTOR_SUBCLASS_VENDOR = 0xFF +} usb_massstor_subclass_t; + +/** USB mass storage interface protocols. */ +typedef enum { + /** CBI transport with command completion interrupt. */ + USB_MASSSTOR_PROTOCOL_CBI_CC = 0x00, + /** CBI transport with no command completion interrupt. */ + USB_MASSSTOR_PROTOCOL_CBI = 0x01, + /** Bulk only transport. */ + USB_MASSSTOR_PROTOCOL_BBB = 0x50, + /** USB attached SCSI. */ + USB_MASSSTOR_PROTOCOL_UAS = 0x62, + USB_MASSSTOR_PROTOCOL_VENDOR = 0xFF +} usb_massstor_protocol_t; + +#endif +/** + * @} + */ Index: uspace/lib/usb/include/usb/devdrv.h =================================================================== --- uspace/lib/usb/include/usb/devdrv.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/devdrv.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -162,10 +162,14 @@ usb_endpoint_description_t **); -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_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 **); -int usb_device_auto_poll(usb_device_t *, size_t, - usb_polling_callback_t, size_t, usb_polling_terminted_callback_t, void *); +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 e50cd7f06f4f69de26916ce998bb262dbcd8bec0) +++ uspace/lib/usb/include/usb/devpoll.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -0,0 +1,99 @@ +/* + * 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/host/batch.h =================================================================== --- uspace/lib/usb/include/usb/host/batch.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/host/batch.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -43,34 +43,27 @@ typedef struct usb_transfer_batch usb_transfer_batch_t; struct usb_transfer_batch { + endpoint_t *ep; link_t link; - usb_target_t target; - usb_transfer_type_t transfer_type; - usb_speed_t speed; - usb_direction_t direction; usbhc_iface_transfer_in_callback_t callback_in; usbhc_iface_transfer_out_callback_t callback_out; + void *arg; char *buffer; - char *transport_buffer; + char *data_buffer; size_t buffer_size; char *setup_buffer; size_t setup_size; - size_t max_packet_size; size_t transfered_size; void (*next_step)(usb_transfer_batch_t *); int error; ddf_fun_t *fun; - void *arg; - endpoint_t *ep; void *private_data; + void (*private_data_dtor)(void *p_data); }; void usb_transfer_batch_init( usb_transfer_batch_t *instance, - usb_target_t target, - usb_transfer_type_t transfer_type, - usb_speed_t speed, - size_t max_packet_size, + endpoint_t *ep, char *buffer, - char *transport_buffer, + char *data_buffer, size_t buffer_size, char *setup_buffer, @@ -80,7 +73,20 @@ void *arg, ddf_fun_t *fun, - endpoint_t *ep, - void *private_data + 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) @@ -90,8 +96,4 @@ } -void usb_transfer_batch_call_in(usb_transfer_batch_t *instance); -void usb_transfer_batch_call_out(usb_transfer_batch_t *instance); -void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error); - #endif /** Index: uspace/lib/usb/include/usb/host/device_keeper.h =================================================================== --- uspace/lib/usb/include/usb/host/device_keeper.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/host/device_keeper.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -54,6 +54,4 @@ usb_speed_t speed; bool occupied; - link_t endpoints; - uint16_t control_used; devman_handle_t handle; }; @@ -65,20 +63,8 @@ struct usb_device_info devices[USB_ADDRESS_COUNT]; fibril_mutex_t guard; - fibril_condvar_t change; usb_address_t last_address; } usb_device_keeper_t; void usb_device_keeper_init(usb_device_keeper_t *instance); - -void usb_device_keeper_add_ep( - usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep); - -void usb_device_keeper_reserve_default_address( - usb_device_keeper_t *instance, usb_speed_t speed); - -void usb_device_keeper_release_default_address(usb_device_keeper_t *instance); - -void usb_device_keeper_reset_if_need(usb_device_keeper_t *instance, - usb_target_t target, const uint8_t *setup_data); usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance, @@ -96,11 +82,4 @@ usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance, usb_address_t address); - -void usb_device_keeper_use_control(usb_device_keeper_t *instance, - usb_target_t target); - -void usb_device_keeper_release_control(usb_device_keeper_t *instance, - usb_target_t target); - #endif /** Index: uspace/lib/usb/include/usb/host/endpoint.h =================================================================== --- uspace/lib/usb/include/usb/host/endpoint.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/host/endpoint.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -39,4 +39,6 @@ #include #include +#include + #include @@ -48,7 +50,13 @@ usb_speed_t speed; size_t max_packet_size; - bool active; unsigned toggle:1; - link_t same_device_eps; + 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; @@ -59,12 +67,18 @@ 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(link_t *ep); - -void endpoint_toggle_reset_filtered(link_t *ep, usb_endpoint_t epn); - +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 dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/host/usb_endpoint_manager.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -66,9 +66,4 @@ endpoint_t *ep, size_t data_size); -int usb_endpoint_manager_register_ep_wait(usb_endpoint_manager_t *instance, - usb_address_t address, usb_endpoint_t ep, usb_direction_t direction, - void *data, void (*data_remove_callback)(void* data, void* arg), void *arg, - size_t bw); - int usb_endpoint_manager_unregister_ep(usb_endpoint_manager_t *instance, usb_address_t address, usb_endpoint_t ep, usb_direction_t direction); @@ -78,4 +73,30 @@ 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 dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/hub.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -59,7 +59,4 @@ } usb_hc_attached_device_t; -int usb_hc_reserve_default_address(usb_hc_connection_t *, usb_speed_t); -int usb_hc_release_default_address(usb_hc_connection_t *); - usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t); int usb_hc_register_device(usb_hc_connection_t *, Index: uspace/lib/usb/include/usb/pipes.h =================================================================== --- uspace/lib/usb/include/usb/pipes.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/pipes.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -42,4 +42,5 @@ #include #include +#include /** Abstraction of a physical connection to the device. @@ -59,6 +60,14 @@ * 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; @@ -78,6 +87,21 @@ /** 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; + + /** Whether to automatically reset halt on the endpoint. + * Valid only for control endpoint zero. + */ + bool auto_reset_halt; } usb_pipe_t; @@ -134,4 +158,6 @@ 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 *); @@ -140,4 +166,7 @@ int usb_pipe_end_session(usb_pipe_t *); bool usb_pipe_is_session_started(usb_pipe_t *); + +int 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 *); Index: uspace/lib/usb/include/usb/request.h =================================================================== --- uspace/lib/usb/include/usb/request.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/request.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -50,4 +50,10 @@ /** 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. */ @@ -135,4 +141,6 @@ char **); +int usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t); + #endif /** Index: uspace/lib/usb/include/usb/usb.h =================================================================== --- uspace/lib/usb/include/usb/usb.h (revision dc9f12251f15ff67ad9db59107ca087932736d09) +++ uspace/lib/usb/include/usb/usb.h (revision e50cd7f06f4f69de26916ce998bb262dbcd8bec0) @@ -77,5 +77,7 @@ USB_SPEED_FULL, /** USB 2.0 high speed (480Mbits/s). */ - USB_SPEED_HIGH + USB_SPEED_HIGH, + /** Psuedo-speed serving as a boundary. */ + USB_SPEED_MAX } usb_speed_t;