Index: uspace/lib/usb/Makefile =================================================================== --- uspace/lib/usb/Makefile (revision 2b887bf7e6a32b7e21b0e7c26b945e7c3904594a) +++ uspace/lib/usb/Makefile (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) @@ -31,5 +31,6 @@ SOURCES = \ - hcd.c + hcd.c \ + usb.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/usb/hcd.h =================================================================== --- uspace/lib/usb/hcd.h (revision 2b887bf7e6a32b7e21b0e7c26b945e7c3904594a) +++ uspace/lib/usb/hcd.h (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) @@ -36,4 +36,6 @@ #define LIBUSB_HCD_H_ +#include "usb.h" + #include #include @@ -41,44 +43,4 @@ /** Maximum size of transaction payload. */ #define USB_MAX_PAYLOAD_SIZE 1020 - -/** USB transfer type. */ -typedef enum { - USB_TRANSFER_CONTROL = 0, - USB_TRANSFER_ISOCHRONOUS = 1, - USB_TRANSFER_BULK = 2, - USB_TRANSFER_INTERRUPT = 3 -} usb_transfer_type_t; - -const char * usb_str_transfer_type(usb_transfer_type_t t); - -/** USB data transfer direction. */ -typedef enum { - USB_DIRECTION_IN, - USB_DIRECTION_OUT -} usb_direction_t; - -/** USB address type. - * Negative values could be used to indicate error. - */ -typedef int usb_address_t; - -/** USB endpoint number type. - * Negative values could be used to indicate error. - */ -typedef int usb_endpoint_t; - -/** USB complete address type. - * Pair address + endpoint is identification of transaction recipient. - */ -typedef struct { - usb_address_t address; - usb_endpoint_t endpoint; -} usb_target_t; - -static inline int usb_target_same(usb_target_t a, usb_target_t b) -{ - return (a.address == b.address) - && (a.endpoint == b.endpoint); -} /** Opaque handle of active USB transaction. Index: uspace/lib/usb/hid.h =================================================================== --- uspace/lib/usb/hid.h (revision 2b887bf7e6a32b7e21b0e7c26b945e7c3904594a) +++ uspace/lib/usb/hid.h (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) @@ -47,4 +47,10 @@ } usb_hid_request_t; +/** USB/HID interface protocols. */ +typedef enum { + USB_HID_PROTOCOL_NONE = 0, + USB_HID_PROTOCOL_KEYBOARD = 1, + USB_HID_PROTOCOL_MOUSE = 2 +} usb_hid_protocol_t; #endif Index: uspace/lib/usb/usb.c =================================================================== --- uspace/lib/usb/usb.c (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) +++ uspace/lib/usb/usb.c (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libusb usb + * @{ + */ +/** @file + * @brief Base USB types. + */ +#include "usb.h" +#include + + +/** String representation for USB transfer type. */ +const char * usb_str_transfer_type(usb_transfer_type_t t) +{ + switch (t) { + case USB_TRANSFER_ISOCHRONOUS: + return "isochronous"; + case USB_TRANSFER_INTERRUPT: + return "interrupt"; + case USB_TRANSFER_CONTROL: + return "control"; + case USB_TRANSFER_BULK: + return "bulk"; + default: + return "unknown"; + } +} + + +/** + * @} + */ Index: uspace/lib/usb/usb.h =================================================================== --- uspace/lib/usb/usb.h (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) +++ uspace/lib/usb/usb.h (revision fd17ab54f5dcc26877b5231b7d2a83ee9e5dd5f9) @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libusb usb + * @{ + */ +/** @file + * @brief Base USB types. + */ +#ifndef LIBUSB_USB_H_ +#define LIBUSB_USB_H_ + +#include + +/** USB transfer type. */ +typedef enum { + USB_TRANSFER_CONTROL = 0, + USB_TRANSFER_ISOCHRONOUS = 1, + USB_TRANSFER_BULK = 2, + USB_TRANSFER_INTERRUPT = 3 +} usb_transfer_type_t; + +const char * usb_str_transfer_type(usb_transfer_type_t t); + +/** USB data transfer direction. */ +typedef enum { + USB_DIRECTION_IN, + USB_DIRECTION_OUT +} usb_direction_t; + +/** USB address type. + * Negative values could be used to indicate error. + */ +typedef int usb_address_t; + +/** USB endpoint number type. + * Negative values could be used to indicate error. + */ +typedef int usb_endpoint_t; + +/** USB complete address type. + * Pair address + endpoint is identification of transaction recipient. + */ +typedef struct { + usb_address_t address; + usb_endpoint_t endpoint; +} usb_target_t; + +static inline int usb_target_same(usb_target_t a, usb_target_t b) +{ + return (a.address == b.address) + && (a.endpoint == b.endpoint); +} + +#endif +/** + * @} + */