Changeset 3d932af6 in mainline

Timestamp:

2011-04-12T21:07:27Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6bb0f43

Parents:

2cc6e97

Message:

Add support for custom data in endpoint structure.

Location:

uspace/lib/usb

Files:

• include/usb/host/endpoint.h (modified) (2 diffs)
• src/host/endpoint.c (modified) (3 diffs)

uspace/lib/usb/include/usb/host/endpoint.h

@@ -54 +54 @@
         fibril_condvar_t avail;
         volatile bool active;
+        struct {
+                void *data;
+                int (*toggle_get)(void *);
+                void (*toggle_set)(void *, int);
+        } hc_data;
 } endpoint_t;
 
@@ -61 +66 @@
 
 void endpoint_destroy(endpoint_t *instance);
+
+void endpoint_set_hc_data(endpoint_t *instance,
+    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int));
+
+void endpoint_clear_hc_data(endpoint_t *instance);
 
 void endpoint_use(endpoint_t *instance);

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

@@ -63 +63 @@
 }
 /*----------------------------------------------------------------------------*/
+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;
+}
+/*----------------------------------------------------------------------------*/
 void endpoint_use(endpoint_t *instance)
 {
@@ -85 +102 @@
 {
         assert(instance);
+        if (instance->hc_data.toggle_get)
+                instance->toggle =
+                    instance->hc_data.toggle_get(instance->hc_data.data);
         return (int)instance->toggle;
 }
@@ -92 +112 @@
         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;
 }