Changeset 32e093e in mainline

Timestamp:

2011-08-25T10:17:06Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b02308e

Parents:

1a02517

Message:

libusbhost: Add destructor for hcdata

Location:

uspace

Files:

• drv/bus/usb/ohci/hcd_endpoint.c (modified) (1 diff)
• lib/usbhost/include/usb/host/endpoint.h (modified) (2 diffs)
• lib/usbhost/src/endpoint.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/hcd_endpoint.c

@@ -88 +88 @@
         ed_init(hcd_ep->ed, ep);
         ed_set_td(hcd_ep->ed, hcd_ep->td);
-        endpoint_set_hc_data(ep, hcd_ep, hcd_ep_toggle_get, hcd_ep_toggle_set);
+        endpoint_set_hc_data(
+            ep, hcd_ep, NULL, hcd_ep_toggle_get, hcd_ep_toggle_set);
 
         return hcd_ep;

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

@@ -56 +56 @@
         struct {
                 void *data;
+                void (*data_dtor)(void*);
                 int (*toggle_get)(void *);
                 void (*toggle_set)(void *, int);
@@ -68 +69 @@
 
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int));
+    void *data, void (*data_dtor)(void *),
+    int (*toggle_get)(void *), void (*toggle_set)(void *, int));
 
 void endpoint_clear_hc_data(endpoint_t *instance);

uspace/lib/usbhost/src/endpoint.c

@@ -53 +53 @@
                 instance->toggle = 0;
                 instance->active = false;
+                instance->hc_data.data = NULL;
+                instance->hc_data.data_dtor = 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->hc_data.data_dtor);
+                instance->hc_data.data_dtor(instance->hc_data.data);
+        }
         free(instance);
 }
 /*----------------------------------------------------------------------------*/
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int))
+    void *data, void (*data_dtor)(void *),
+    int (*toggle_get)(void *), void (*toggle_set)(void *, int))
 {
         assert(instance);
         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;