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

Timestamp:

2011-04-14T08:24:29Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (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) (5 diffs)

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

@@ -53 +53 @@
         fibril_mutex_initialize(&instance->guard);
         fibril_condvar_initialize(&instance->avail);
+        endpoint_clear_hc_data(instance);
         return EOK;
 }
@@ -61 +62 @@
         assert(!instance->active);
         free(instance);
+}
+/*----------------------------------------------------------------------------*/
+void endpoint_set_hc_data(endpoint_t *instance,
+    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int))
+{
+        assert(instance);
+        instance->hc_data.data = data;
+        instance->hc_data.toggle_get = toggle_get;
+        instance->hc_data.toggle_set = toggle_set;
+}
+/*----------------------------------------------------------------------------*/
+void endpoint_clear_hc_data(endpoint_t *instance)
+{
+        assert(instance);
+        instance->hc_data.data = NULL;
+        instance->hc_data.toggle_get = NULL;
+        instance->hc_data.toggle_set = NULL;
 }
 /*----------------------------------------------------------------------------*/
@@ -85 +103 @@
 {
         assert(instance);
+        if (instance->hc_data.toggle_get)
+                instance->toggle =
+                    instance->hc_data.toggle_get(instance->hc_data.data);
         return (int)instance->toggle;
 }
@@ -92 +113 @@
         assert(instance);
         assert(toggle == 0 || toggle == 1);
+        if (instance->hc_data.toggle_set)
+                instance->hc_data.toggle_set(instance->hc_data.data, toggle);
         instance->toggle = toggle;
 }
@@ -99 +122 @@
         assert(instance);
         if (instance->address == target.address &&
-            instance->endpoint == target.endpoint)
+            (instance->endpoint == target.endpoint || target.endpoint == 0))
                 instance->toggle = 0;
 }