Changeset 6326155b in mainline

Timestamp:

2012-12-22T22:39:05Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

52f9c57

Parents:

971fbfde

Message:

libusb: Add toggle guessing function.

Location:

uspace/lib

Files:

• usb/include/usb/request.h (modified) (3 diffs)
• usb/src/usb.c (modified) (2 diffs)
• usbdev/include/usb/dev/request.h (modified) (1 diff)

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

@@ -37 +37 @@
 
 #include <sys/types.h>
-#include <usb/usb.h>
 
 /** Standard device request. */
@@ -54 +53 @@
         USB_DEVREQ_LAST_STD
 } usb_stddevreq_t;
+
+/** USB device status - device is self powered (opposed to bus powered). */
+#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
+
+/** USB device status - remote wake-up signaling is enabled. */
+#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
+
+/** USB endpoint status - endpoint is halted (stalled). */
+#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
+
+/** USB feature selector - endpoint halt (stall). */
+#define USB_FEATURE_SELECTOR_ENDPOINT_HALT (0)
+
+/** USB feature selector - device remote wake-up. */
+#define USB_FEATURE_SELECTOR_REMOTE_WAKEUP (1)
 
 /** Device request setup packet.
@@ -93 +107 @@
 int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
 
+int usb_request_needs_toggle_reset(
+    const usb_device_request_setup_packet_t *request);
 
 #endif

uspace/lib/usb/src/usb.c

@@ -34 +34 @@
  */
 #include <usb/usb.h>
+#include <usb/request.h>
+
 #include <errno.h>
+#include <assert.h>
 
 #define ARR_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
@@ -116 +119 @@
 }
 
+/** 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_SELECTOR_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;
+}
+
 /**
  * @}

uspace/lib/usbdev/include/usb/dev/request.h

@@ -42 +42 @@
 #include <usb/descriptor.h>
 #include <usb/request.h>
-
-/** USB device status - device is self powered (opposed to bus powered). */
-#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
-
-/** USB device status - remote wake-up signaling is enabled. */
-#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
-
-/** USB endpoint status - endpoint is halted (stalled). */
-#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
-
-/** USB feature selector - endpoint halt (stall). */
-#define USB_FEATURE_SELECTOR_ENDPOINT_HALT (0)
-
-/** USB feature selector - device remote wake-up. */
-#define USB_FEATURE_SELECTOR_REMOTE_WAKEUP (1)
-
 
 int usb_control_request_set(usb_pipe_t *,