Changeset fd07e526 in mainline for uspace/lib/usbhost/src/endpoint.c

Timestamp:

2011-09-16T14:50:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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 USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

File:

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

uspace/lib/usbhost/src/endpoint.c

@@ -53 +53 @@
                 instance->toggle = 0;
                 instance->active = false;
+                instance->destroy_hook = NULL;
+                instance->hc_data.data = NULL;
+                instance->hc_data.toggle_get = NULL;
+                instance->hc_data.toggle_set = NULL;
                 fibril_mutex_initialize(&instance->guard);
                 fibril_condvar_initialize(&instance->avail);
@@ -64 +68 @@
         assert(instance);
         assert(!instance->active);
+        if (instance->hc_data.data) {
+                assert(instance->destroy_hook);
+                instance->destroy_hook(instance);
+        }
         free(instance);
 }
 /*----------------------------------------------------------------------------*/
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int))
+    void *data, void (*destroy_hook)(endpoint_t *),
+    int (*toggle_get)(void *), void (*toggle_set)(void *, int))
 {
         assert(instance);
+        instance->destroy_hook = destroy_hook;
         instance->hc_data.data = data;
         instance->hc_data.toggle_get = toggle_get;
@@ -79 +89 @@
 {
         assert(instance);
+        instance->destroy_hook = NULL;
         instance->hc_data.data = NULL;
         instance->hc_data.toggle_get = NULL;