Changeset 2cc6e97 in mainline for uspace/lib/usb/src/host/batch.c

Timestamp:

2011-04-12T14:07:02Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3d932af6

Parents:

910ca3f

Message:

Move more functionality to libUSB usb_transfer_batch_t

UHCI uses one device accessible buffer for both structures and data

File:

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

uspace/lib/usb/src/host/batch.c

@@ -39 +39 @@
 #include <usb/host/batch.h>
 
+void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
+void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
+
 void usb_transfer_batch_init(
     usb_transfer_batch_t *instance,
-                endpoint_t *ep,
+    endpoint_t *ep,
     char *buffer,
     char *data_buffer,
@@ -51 +54 @@
     void *arg,
     ddf_fun_t *fun,
-    void *private_data
+    void *private_data,
+    void (*private_data_dtor)(void *p_data)
     )
 {
@@ -67 +71 @@
         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;
         endpoint_use(instance->ep);
+}
+/*----------------------------------------------------------------------------*/
+/** Helper function, calls callback and correctly destroys batch structure.
+ *
+ * @param[in] instance Batch structure to use.
+ */
+void usb_transfer_batch_call_in_and_dispose(usb_transfer_batch_t *instance)
+{
+        assert(instance);
+        usb_transfer_batch_call_in(instance);
+        usb_transfer_batch_dispose(instance);
+}
+/*----------------------------------------------------------------------------*/
+/** Helper function calls callback and correctly destroys batch structure.
+ *
+ * @param[in] instance Batch structure to use.
+ */
+void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance)
+{
+        assert(instance);
+        usb_transfer_batch_call_out(instance);
+        usb_transfer_batch_dispose(instance);
 }
 /*----------------------------------------------------------------------------*/
@@ -129 +156 @@
             instance->error, instance->arg);
 }
+/*----------------------------------------------------------------------------*/
+/** Correctly dispose all used data structures.
+ *
+ * @param[in] instance Batch structure to use.
+ */
+void usb_transfer_batch_dispose(usb_transfer_batch_t *instance)
+{
+        assert(instance);
+        usb_log_debug("Batch(%p) disposing.\n", instance);
+        if (instance->private_data) {
+                assert(instance->private_data_dtor);
+                instance->private_data_dtor(instance->private_data);
+        }
+        free(instance);
+}
 /**
  * @}