Changes in uspace/lib/usb/include/usb/usb.h [fa9d3af:3e6a98c5] in mainline

File:

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

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

@@ -84 +84 @@
 } usb_speed_t;
 
-static inline bool usb_speed_is_11(const usb_speed_t s)
-{
-        return (s == USB_SPEED_FULL) || (s == USB_SPEED_LOW);
-}
-
 const char *usb_str_speed(usb_speed_t);
 
@@ -115 +110 @@
 #define USB_ADDRESS_DEFAULT 0
 /** Maximum address number in USB 1.1. */
-#define USB11_ADDRESS_MAX 127
-#define USB_ADDRESS_COUNT (USB11_ADDRESS_MAX + 1)
-
-/** Check USB address for allowed values.
- *
- * @param ep USB address.
- * @return True, if value is wihtin limits, false otherwise.
- */
-static inline bool usb_address_is_valid(usb_address_t a)
-{
-        return (a >= USB_ADDRESS_DEFAULT) && (a <= USB11_ADDRESS_MAX);
-}
+#define USB11_ADDRESS_MAX 128
 
 /** USB endpoint number type.
@@ -133 +117 @@
 typedef int16_t usb_endpoint_t;
 
-/** Default control endpoint */
-#define USB_ENDPOINT_DEFAULT_CONTROL 0
-/** Maximum endpoint number in USB 1.1. */
+/** Maximum endpoint number in USB 1.1.
+ */
 #define USB11_ENDPOINT_MAX 16
-
-/** Check USB endpoint for allowed values.
- *
- * @param ep USB endpoint number.
- * @return True, if value is wihtin limits, false otherwise.
- */
-static inline bool usb_endpoint_is_valid(usb_endpoint_t ep)
-{
-        return (ep >= USB_ENDPOINT_DEFAULT_CONTROL) &&
-            (ep < USB11_ENDPOINT_MAX);
-}
 
 
@@ -161 +133 @@
 } usb_target_t;
 
-
 /** Check USB target for allowed values (address and endpoint).
  *
@@ -169 +140 @@
 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 !(target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB11_ADDRESS_MAX || target.address < 0);
 }