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

Timestamp:

2011-10-28T21:52:15Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57e06ef

Parents:

7265558

Message:

libusbhost: Make interfaces more symmetric.

Make usb_endpoint_manager interface easier to use and understand.
Move ep removal hook pointer from endpoint_t to hcd_t.

File:

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

uspace/lib/usbhost/src/endpoint.c

@@ -54 +54 @@
                 instance->toggle = 0;
                 instance->active = false;
-                instance->destroy_hook = NULL;
                 instance->hc_data.data = NULL;
                 instance->hc_data.toggle_get = NULL;
@@ -70 +69 @@
         assert(instance);
         assert(!instance->active);
-        if (instance->hc_data.data) {
-                assert(instance->destroy_hook);
-                instance->destroy_hook(instance);
-        }
+        assert(instance->hc_data.data == NULL);
         free(instance);
 }
 /*----------------------------------------------------------------------------*/
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, void (*destroy_hook)(endpoint_t *),
-    int (*toggle_get)(void *), void (*toggle_set)(void *, int))
+    void *data, 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;
@@ -91 +85 @@
 {
         assert(instance);
-        instance->destroy_hook = NULL;
         instance->hc_data.data = NULL;
         instance->hc_data.toggle_get = NULL;