Changeset d4da860 in mainline for uspace/lib/usb/include/usb/usb.h

Timestamp:

2017-10-27T00:20:51Z (6 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

0798689, 584121d

Parents:

37e8c4a

Message:

Break circular dependency between libdrv and libusb.

File:

• uspace/lib/usb/include/usb/usb.h (modified) (5 diffs)

uspace/lib/usb/include/usb/usb.h

@@ -39 +39 @@
 #include <stdint.h>
 #include <types/common.h>
+#include <usb_iface.h>
 
 /** Convert 16bit value from native (host) endianness to USB endianness. */
@@ -52 +53 @@
 #define uint32_usb2host(n) uint32_t_le2host((n))
 
-
-/** 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);
 const char * usb_str_transfer_type_short(usb_transfer_type_t t);
 
-/** USB data transfer direction. */
-typedef enum {
-        USB_DIRECTION_IN,
-        USB_DIRECTION_OUT,
-        USB_DIRECTION_BOTH
-} usb_direction_t;
-
 const char *usb_str_direction(usb_direction_t);
-
-/** USB speeds. */
-typedef enum {
-        /** USB 1.1 low speed (1.5Mbits/s). */
-        USB_SPEED_LOW,
-        /** USB 1.1 full speed (12Mbits/s). */
-        USB_SPEED_FULL,
-        /** USB 2.0 high speed (480Mbits/s). */
-        USB_SPEED_HIGH,
-        /** Psuedo-speed serving as a boundary. */
-        USB_SPEED_MAX
-} usb_speed_t;
 
 static inline bool usb_speed_is_11(const usb_speed_t s)
@@ -108 +81 @@
 } usb_request_recipient_t;
 
-/** USB address type.
- * Negative values could be used to indicate error.
- */
-typedef int16_t usb_address_t;
-
 /** Default USB address. */
 #define USB_ADDRESS_DEFAULT 0
@@ -132 +100 @@
 }
 
-/** USB endpoint number type.
- * Negative values could be used to indicate error.
- */
-typedef int16_t usb_endpoint_t;
-
 /** Default control endpoint */
 #define USB_ENDPOINT_DEFAULT_CONTROL 0
@@ -155 +118 @@
             (ep < USB11_ENDPOINT_MAX);
 }
-
-
-/** USB complete address type. 
- * Pair address + endpoint is identification of transaction recipient.
- */
-typedef union {
-        struct {
-                usb_address_t address;
-                usb_endpoint_t endpoint;
-        } __attribute__((packed));
-        uint32_t packed;
-} usb_target_t;
 
 /** Check USB target for allowed values (address and endpoint).