Changeset b4b534ac in mainline for uspace/lib/usb/src/usb.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

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

uspace/lib/usb/src/usb.c

@@ -34 +34 @@
  */
 #include <usb/usb.h>
-#include <errno.h>
+#include <usb/request.h>
 
-#define ARR_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
+#include <assert.h>
+#include <byteorder.h>
+#include <macros.h>
 
 static const char *str_speed[] = {
@@ -71 +73 @@
 const char *usb_str_transfer_type(usb_transfer_type_t t)
 {
-        if (t >= ARR_SIZE(str_transfer_type)) {
+        if (t >= ARRAY_SIZE(str_transfer_type)) {
                 return "invalid";
         }
@@ -84 +86 @@
 const char *usb_str_transfer_type_short(usb_transfer_type_t t)
 {
-        if (t >= ARR_SIZE(str_transfer_type_short)) {
+        if (t >= ARRAY_SIZE(str_transfer_type_short)) {
                 return "invl";
         }
@@ -97 +99 @@
 const char *usb_str_direction(usb_direction_t d)
 {
-        if (d >= ARR_SIZE(str_direction)) {
+        if (d >= ARRAY_SIZE(str_direction)) {
                 return "invalid";
         }
@@ -110 +112 @@
 const char *usb_str_speed(usb_speed_t s)
 {
-        if (s >= ARR_SIZE(str_speed)) {
+        if (s >= ARRAY_SIZE(str_speed)) {
                 return "invalid";
         }
@@ -116 +118 @@
 }
 
+/** 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;
+}
+
 /**
  * @}