Changeset ba038f4 in mainline for uspace/lib/usb/src/host/usb_endpoint_manager.c

Timestamp:

2011-04-09T22:03:23Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a19a2d7

Parents:

501e5df

Message:

Don't keep endpoints in two separate structures

Fixes crash "[HelenOS-USB-devel] uhci root hub" email
Move toggle resert testing ugliness to endpoint manager

File:

• uspace/lib/usb/src/host/usb_endpoint_manager.c (modified) (3 diffs)

uspace/lib/usb/src/host/usb_endpoint_manager.c

@@ -31 +31 @@
 #include <errno.h>
 
+#include <usb/debug.h>
 #include <usb/host/usb_endpoint_manager.h>
 
@@ -80 +81 @@
         endpoint_destroy(node->ep);
         free(node);
+}
+/*----------------------------------------------------------------------------*/
+static void node_toggle_reset_filtered(link_t *item, void *arg)
+{
+        assert(item);
+        node_t *node = hash_table_get_instance(item, node_t, link);
+        usb_target_t *target = arg;
+        endpoint_toggle_reset_filtered(node->ep, *target);
 }
 /*----------------------------------------------------------------------------*/
@@ -230 +239 @@
         return node->ep;
 }
+/*----------------------------------------------------------------------------*/
+/** Check setup packet data for signs of toggle reset.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] target Device to receive setup packet.
+ * @param[in] data Setup packet data.
+ *
+ * Really ugly one.
+ */
+void usb_endpoint_manager_reset_if_need(
+    usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data)
+{
+        assert(instance);
+        if (target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB11_ADDRESS_MAX || target.address < 0) {
+                usb_log_error("Invalid data when checking for toggle reset.\n");
+                return;
+        }
+
+        switch (data[1])
+        {
+        case 0x01: /*clear feature*/
+                /* recipient is endpoint, value is zero (ENDPOINT_STALL) */
+                if (((data[0] & 0xf) == 1) && ((data[2] | data[3]) == 0)) {
+                        /* endpoint number is < 16, thus first byte is enough */
+                        usb_target_t reset_target =
+                            { .address = target.address, data[4] };
+                        fibril_mutex_lock(&instance->guard);
+                        hash_table_apply(&instance->ep_table,
+                            node_toggle_reset_filtered, &reset_target);
+                        fibril_mutex_unlock(&instance->guard);
+                }
+        break;
+
+        case 0x9: /* set configuration */
+        case 0x11: /* set interface */
+                /* target must be device */
+                if ((data[0] & 0xf) == 0) {
+                        usb_target_t reset_target =
+                            { .address = target.address, 0 };
+                        fibril_mutex_lock(&instance->guard);
+                        hash_table_apply(&instance->ep_table,
+                            node_toggle_reset_filtered, &reset_target);
+                        fibril_mutex_unlock(&instance->guard);
+                }
+        break;
+        }
+}