Changes in uspace/lib/usb/src/usb.c [4ee5272:9d58539] in mainline

File:

• uspace/lib/usb/src/usb.c (modified) (6 diffs)

uspace/lib/usb/src/usb.c

@@ -34 +34 @@
  */
 #include <usb/usb.h>
-#include <usb/request.h>
+#include <errno.h>
 
-#include <assert.h>
-#include <byteorder.h>
-#include <macros.h>
+#define ARR_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
 static const char *str_speed[] = {
@@ -73 +71 @@
 const char *usb_str_transfer_type(usb_transfer_type_t t)
 {
-        if (t >= ARRAY_SIZE(str_transfer_type)) {
+        if (t >= ARR_SIZE(str_transfer_type)) {
                 return "invalid";
         }
@@ -86 +84 @@
 const char *usb_str_transfer_type_short(usb_transfer_type_t t)
 {
-        if (t >= ARRAY_SIZE(str_transfer_type_short)) {
+        if (t >= ARR_SIZE(str_transfer_type_short)) {
                 return "invl";
         }
@@ -99 +97 @@
 const char *usb_str_direction(usb_direction_t d)
 {
-        if (d >= ARRAY_SIZE(str_direction)) {
+        if (d >= ARR_SIZE(str_direction)) {
                 return "invalid";
         }
@@ -112 +110 @@
 const char *usb_str_speed(usb_speed_t s)
 {
-        if (s >= ARRAY_SIZE(str_speed)) {
+        if (s >= ARR_SIZE(str_speed)) {
                 return "invalid";
         }
@@ -118 +116 @@
 }
 
-/** Check setup packet data for signs of toggle reset.
- *
- * @param[in] requst Setup requst data.
- * @retval -1 No endpoints need reset.
- * @retval 0 All endpoints need reset.
- * @retval >0 Specified endpoint needs reset.
- */
-int usb_request_needs_toggle_reset(
-    const usb_device_request_setup_packet_t *request)
-{
-        assert(request);
-        switch (request->request)
-        {
-        /* Clear Feature ENPOINT_STALL */
-        case USB_DEVREQ_CLEAR_FEATURE: /*resets only cleared ep */
-                /* 0x2 ( HOST to device | STANDART | TO ENPOINT) */
-                if ((request->request_type == 0x2) &&
-                    (request->value == USB_FEATURE_ENDPOINT_HALT))
-                        return uint16_usb2host(request->index);
-                break;
-        case USB_DEVREQ_SET_CONFIGURATION:
-        case USB_DEVREQ_SET_INTERFACE:
-                /* Recipient must be device, this resets all endpoints,
-                 * In fact there should be no endpoints but EP 0 registered
-                 * as different interfaces use different endpoints,
-                 * unless you're changing configuration or alternative
-                 * interface of an already setup device. */
-                if (!(request->request_type & SETUP_REQUEST_TYPE_DEVICE_TO_HOST))
-                        return 0;
-                break;
-        default:
-                break;
-        }
-        return -1;
-}
-
 /**
  * @}