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

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

new report structure fixes

File:

• uspace/lib/usb/src/host/batch.c (modified) (6 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,
-    usb_target_t target,
-    usb_transfer_type_t transfer_type,
-    usb_speed_t speed,
-    size_t max_packet_size,
+    endpoint_t *ep,
     char *buffer,
-    char *transport_buffer,
+    char *data_buffer,
     size_t buffer_size,
     char *setup_buffer,
@@ -54 +54 @@
     void *arg,
     ddf_fun_t *fun,
-                endpoint_t *ep,
-    void *private_data
+    void *private_data,
+    void (*private_data_dtor)(void *p_data)
     )
 {
         assert(instance);
         link_initialize(&instance->link);
-        instance->target = target;
-        instance->transfer_type = transfer_type;
-        instance->speed = speed;
-        instance->direction = USB_DIRECTION_BOTH;
+        instance->ep = ep;
         instance->callback_in = func_in;
         instance->callback_out = func_out;
         instance->arg = arg;
         instance->buffer = buffer;
-        instance->transport_buffer = transport_buffer;
+        instance->data_buffer = data_buffer;
         instance->buffer_size = buffer_size;
         instance->setup_buffer = setup_buffer;
         instance->setup_size = setup_size;
-        instance->max_packet_size = max_packet_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;
-        instance->ep = ep;
+        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);
 }
 /*----------------------------------------------------------------------------*/
@@ -86 +105 @@
  *
  */
-void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error)
+void usb_transfer_batch_finish(usb_transfer_batch_t *instance)
 {
         assert(instance);
-        instance->error = error;
+        assert(instance->ep);
+        endpoint_release(instance->ep);
         instance->next_step(instance);
 }
@@ -103 +123 @@
         assert(instance);
         assert(instance->callback_in);
+        assert(instance->ep);
 
         /* We are data in, we need data */
-        memcpy(instance->buffer, instance->transport_buffer,
-            instance->buffer_size);
+        memcpy(instance->buffer, instance->data_buffer, instance->buffer_size);
 
         usb_log_debug("Batch %p done (T%d.%d, %s %s in, %zuB): %s (%d).\n",
-            instance,
-            instance->target.address, instance->target.endpoint,
-            usb_str_speed(instance->speed),
-            usb_str_transfer_type_short(instance->transfer_type),
-            instance->transfered_size,
-            str_error(instance->error), instance->error);
+            instance, instance->ep->address, instance->ep->endpoint,
+            usb_str_speed(instance->ep->speed),
+            usb_str_transfer_type_short(instance->ep->transfer_type),
+            instance->transfered_size, str_error(instance->error), instance->error);
 
         instance->callback_in(instance->fun, instance->error,
@@ -130 +148 @@
 
         usb_log_debug("Batch %p done (T%d.%d, %s %s out): %s (%d).\n",
-            instance,
-            instance->target.address, instance->target.endpoint,
-            usb_str_speed(instance->speed),
-            usb_str_transfer_type_short(instance->transfer_type),
+            instance, instance->ep->address, instance->ep->endpoint,
+            usb_str_speed(instance->ep->speed),
+            usb_str_transfer_type_short(instance->ep->transfer_type),
             str_error(instance->error), instance->error);
 
@@ -139 +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);
+}
 /**
  * @}