Changeset 70fb822 in mainline for uspace/lib/usbhost/src/batch.c

Timestamp:

2011-08-31T18:21:48Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f18d82f0

Parents:

ff6dd73

Message:

libusbhost: change usb_transfer_batch_T handling to get/dispose pair

libusbhost: release endpoint on batch dispose, to be consistent with acquire on get (and avoid deadlock on error path)
uhci: usb_transfer_batch_finish is no longer necessary

File:

• uspace/lib/usbhost/src/batch.c (modified) (4 diffs)

uspace/lib/usbhost/src/batch.c

@@ -40 +40 @@
 #include <usb/host/hcd.h>
 
-void usb_transfer_batch_init(
-    usb_transfer_batch_t *instance,
+usb_transfer_batch_t * usb_transfer_batch_get(
     endpoint_t *ep,
     char *buffer,
@@ -53 +52 @@
     ddf_fun_t *fun,
     void *private_data,
-    void (*private_data_dtor)(void *p_data)
+    void (*private_data_dtor)(void *)
     )
 {
-        assert(instance);
-        link_initialize(&instance->link);
-        instance->ep = ep;
-        instance->callback_in = func_in;
-        instance->callback_out = func_out;
-        instance->arg = arg;
-        instance->buffer = buffer;
-        instance->data_buffer = data_buffer;
-        instance->buffer_size = buffer_size;
-        instance->setup_buffer = setup_buffer;
-        instance->setup_size = setup_size;
-        instance->fun = fun;
-        instance->private_data = private_data;
-        instance->private_data_dtor = private_data_dtor;
-        instance->transfered_size = 0;
-        instance->next_step = NULL;
-        instance->error = EOK;
-        if (instance->ep)
-                endpoint_use(instance->ep);
+        usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
+        if (instance) {
+                link_initialize(&instance->link);
+                instance->ep = ep;
+                instance->callback_in = func_in;
+                instance->callback_out = func_out;
+                instance->arg = arg;
+                instance->buffer = buffer;
+                instance->data_buffer = data_buffer;
+                instance->buffer_size = buffer_size;
+                instance->setup_buffer = setup_buffer;
+                instance->setup_size = setup_size;
+                instance->fun = fun;
+                instance->private_data = private_data;
+                instance->private_data_dtor = private_data_dtor;
+                instance->transfered_size = 0;
+                instance->next_step = NULL;
+                instance->error = EOK;
+                if (instance->ep)
+                        endpoint_use(instance->ep);
+        }
+        return instance;
 }
 /*----------------------------------------------------------------------------*/
@@ -85 +87 @@
 {
         assert(instance);
-        if (instance->ep)
-                endpoint_release(instance->ep);
         if (instance->next_step)
                 instance->next_step(instance);
@@ -150 +150 @@
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " disposing.\n",
             instance, USB_TRANSFER_BATCH_ARGS(*instance));
+        if (instance->ep) {
+                endpoint_release(instance->ep);
+        }
         if (instance->private_data) {
                 assert(instance->private_data_dtor);