Changeset 620c710 in mainline for uspace/lib/usbhost

Timestamp:

2011-08-25T14:21:57Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

961c29e8

Parents:

e20eaed

Message:

libushost: promote endpoint data dtor to destruction hook

ohci: use new usb c driver architecture

Location:

uspace/lib/usbhost

Files:

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

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

@@ -54 +54 @@
         fibril_condvar_t avail;
         volatile bool active;
+        void (*destroy_hook)(struct endpoint *);
         struct {
                 void *data;
-                void (*data_dtor)(void*);
                 int (*toggle_get)(void *);
                 void (*toggle_set)(void *, int);
@@ -69 +69 @@
 
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, void (*data_dtor)(void *),
+    void *data, void (*destroy_hook)(endpoint_t *),
     int (*toggle_get)(void *), void (*toggle_set)(void *, int));
 

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.data_dtor = NULL;
                 instance->hc_data.toggle_get = NULL;
                 instance->hc_data.toggle_set = NULL;
@@ -69 +69 @@
         assert(!instance->active);
         if (instance->hc_data.data) {
-                assert(instance->hc_data.data_dtor);
-                instance->hc_data.data_dtor(instance->hc_data.data);
+                assert(instance->destroy_hook);
+                instance->destroy_hook(instance);
         }
         free(instance);
@@ -76 +76 @@
 /*----------------------------------------------------------------------------*/
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, void (*data_dtor)(void *),
+    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.data_dtor = data_dtor;
         instance->hc_data.toggle_get = toggle_get;
         instance->hc_data.toggle_set = toggle_set;