Changeset 0748854 in mainline for uspace/lib/usb/src/host/endpoint.c

Timestamp:

2011-04-09T23:30:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

46e078a

Parents:

77223f8 (diff), f11c288 (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 development/ changes

File:

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

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

@@ -53 +53 @@
         fibril_mutex_initialize(&instance->guard);
         fibril_condvar_initialize(&instance->avail);
-        link_initialize(&instance->same_device_eps);
         return EOK;
 }
@@ -61 +60 @@
         assert(instance);
         assert(!instance->active);
-        list_remove(&instance->same_device_eps);
         free(instance);
 }
@@ -97 +95 @@
 }
 /*----------------------------------------------------------------------------*/
-void endpoint_toggle_reset(link_t *ep)
+void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target)
 {
-        endpoint_t *instance =
-            list_get_instance(ep, endpoint_t, same_device_eps);
         assert(instance);
-        instance->toggle = 0;
-}
-/*----------------------------------------------------------------------------*/
-void endpoint_toggle_reset_filtered(link_t *ep, usb_endpoint_t epn)
-{
-        endpoint_t *instance =
-            list_get_instance(ep, endpoint_t, same_device_eps);
-        assert(instance);
-        if (instance->endpoint == epn)
+        if (instance->address == target.address &&
+            instance->endpoint == target.endpoint)
                 instance->toggle = 0;
 }