Changes in uspace/lib/usbhost/src/endpoint.c [3e4f2e0:563d9d0a] in mainline

File:

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

uspace/lib/usbhost/src/endpoint.c

@@ -35 +35 @@
 
 #include <assert.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <usb/host/endpoint.h>
 
-int endpoint_init(endpoint_t *instance, usb_address_t address,
-    usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size)
+endpoint_t * endpoint_get(usb_address_t address, usb_endpoint_t endpoint,
+    usb_direction_t direction, usb_transfer_type_t type, usb_speed_t speed,
+    size_t max_packet_size)
 {
-        assert(instance);
-        instance->address = address;
-        instance->endpoint = endpoint;
-        instance->direction = direction;
-        instance->transfer_type = type;
-        instance->speed = speed;
-        instance->max_packet_size = max_packet_size;
-        instance->toggle = 0;
-        instance->active = false;
-        fibril_mutex_initialize(&instance->guard);
-        fibril_condvar_initialize(&instance->avail);
-        endpoint_clear_hc_data(instance);
-        return EOK;
+        endpoint_t *instance = malloc(sizeof(endpoint_t));
+        if (instance) {
+                instance->address = address;
+                instance->endpoint = endpoint;
+                instance->direction = direction;
+                instance->transfer_type = type;
+                instance->speed = speed;
+                instance->max_packet_size = max_packet_size;
+                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);
+                endpoint_clear_hc_data(instance);
+        }
+        return instance;
 }
 /*----------------------------------------------------------------------------*/
@@ -61 +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;
@@ -76 +89 @@
 {
         assert(instance);
+        instance->destroy_hook = NULL;
         instance->hc_data.data = NULL;
         instance->hc_data.toggle_get = NULL;