Changeset fd17ab5 in mainline for uspace/lib/usb/hcd.h

Timestamp:

2010-10-13T06:42:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2c381250

Parents:

2b887bf7

Message:

libusb: base types in separate file

Base USB types (address, protocol type etc.) are now in separate file usb.h.

Also added HID protocol type enum to hid.h.

File:

• uspace/lib/usb/hcd.h (modified) (2 diffs)

uspace/lib/usb/hcd.h

@@ -36 +36 @@
 #define LIBUSB_HCD_H_
 
+#include "usb.h"
+
 #include <ipc/ipc.h>
 #include <async.h>
@@ -41 +43 @@
 /** 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.