Changeset a6afb4c in mainline for uspace/lib/drv/include

Timestamp:

2018-01-23T14:02:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

4db49344

Parents:

e7e1fd3

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-23 13:35:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-23 14:02:35)

Message:

usbhost: check validity of arguments, cleanup

File:

• uspace/lib/drv/include/usbhc_iface.h (modified) (4 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -60 +60 @@
  * Negative values could be used to indicate error.
  */
-typedef int16_t usb_endpoint_t;
+typedef uint16_t usb_endpoint_t;
 
 /** USB address type.
  * Negative values could be used to indicate error.
  */
-typedef int16_t usb_address_t;
+typedef uint16_t usb_address_t;
+
+/**
+ * USB Stream ID type.
+ */
+typedef uint16_t usb_stream_t;
 
 /** USB transfer type. */
@@ -72 +77 @@
         USB_TRANSFER_ISOCHRONOUS = 1,
         USB_TRANSFER_BULK = 2,
-        USB_TRANSFER_INTERRUPT = 3
+        USB_TRANSFER_INTERRUPT = 3,
 } usb_transfer_type_t;
+
+#define USB_TRANSFER_COUNT  (USB_TRANSFER_INTERRUPT + 1)
 
 /** USB data transfer direction. */
@@ -79 +86 @@
         USB_DIRECTION_IN,
         USB_DIRECTION_OUT,
-        USB_DIRECTION_BOTH
+        USB_DIRECTION_BOTH,
 } usb_direction_t;
+
+#define USB_DIRECTION_COUNT  (USB_DIRECTION_BOTH + 1)
 
 /** USB complete address type.
@@ -89 +98 @@
                 usb_address_t address;
                 usb_endpoint_t endpoint;
-                uint32_t stream;
+                usb_stream_t stream;
         } __attribute__((packed));
         uint64_t packed;