Changeset a6afb4c in mainline for uspace/lib/usb/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/usb/include/usb/usb.h (modified) (6 diffs)

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

@@ -63 +63 @@
 }
 
+static inline bool usb_speed_is_valid(const usb_speed_t s)
+{
+        return (s >= USB_SPEED_LOW) && (s < USB_SPEED_MAX);
+}
+
 const char *usb_str_speed(usb_speed_t);
 
@@ -97 +102 @@
 static inline bool usb_address_is_valid(usb_address_t a)
 {
-        return (a >= USB_ADDRESS_DEFAULT) && (a <= USB11_ADDRESS_MAX);
+        return a <= USB11_ADDRESS_MAX;
 }
 
@@ -105 +110 @@
 /** Maximum endpoint number in USB */
 #define USB_ENDPOINT_MAX 16
+
+/** There might be two directions for every endpoint number (except 0) */
+#define USB_ENDPOINT_COUNT (2 * USB_ENDPOINT_MAX)
 
 /** Check USB endpoint for allowed values.
@@ -115 +123 @@
 static inline bool usb_endpoint_is_valid(usb_endpoint_t ep)
 {
-        return (ep >= USB_ENDPOINT_DEFAULT_CONTROL) &&
-            (ep < USB_ENDPOINT_MAX);
+        return ep < USB_ENDPOINT_MAX;
 }
 
-/** Check USB target for allowed values (address and endpoint).
+/**
+ * Check USB target for allowed values (address, endpoint, stream).
  *
  * @param target.
  * @return True, if values are wihtin limits, false otherwise.
  */
-static inline bool usb_target_is_valid(usb_target_t target)
+static inline bool usb_target_is_valid(usb_target_t *target)
 {
-        return usb_address_is_valid(target.address) &&
-            usb_endpoint_is_valid(target.endpoint);
+        return usb_address_is_valid(target->address) &&
+            usb_endpoint_is_valid(target->endpoint);
+
+        // A 16-bit Stream ID is always valid.
 }
 
@@ -136 +146 @@
  * @return Whether @p a and @p b points to the same pipe on the same device.
  */
-static inline int usb_target_same(usb_target_t a, usb_target_t b)
+static inline bool usb_target_same(usb_target_t a, usb_target_t b)
 {
         return (a.address == b.address)
@@ -142 +152 @@
 }
 
-/** General handle type.
- * Used by various USB functions as opaque handle.
- */
-typedef sysarg_t usb_handle_t;
+static inline bool usb_transfer_type_is_valid(usb_transfer_type_t type)
+{
+        return (type >= 0) && (type < USB_TRANSFER_COUNT);
+}
+
+static inline bool usb_direction_is_valid(usb_direction_t dir)
+{
+        return (dir >= 0) && (dir < USB_DIRECTION_COUNT);
+}
 
 /** USB packet identifier. */