Changes in uspace/lib/usb/src/host/batch.c [d7186cd:c15070c] in mainline

File:

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

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

@@ -30 +30 @@
  */
 /** @file
- * USB transfer transaction structures (implementation).
+ * @brief OHCI driver USB transaction structure
  */
 #include <errno.h>
@@ -39 +39 @@
 #include <usb/host/batch.h>
 
-void usb_transfer_batch_init(
-    usb_transfer_batch_t *instance,
+void batch_init(
+    batch_t *instance,
     usb_target_t target,
     usb_transfer_type_t transfer_type,
@@ -85 +85 @@
  *
  */
-void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error)
+void batch_finish(batch_t *instance, int error)
 {
         assert(instance);
@@ -98 +98 @@
  * parameters.
  */
-void usb_transfer_batch_call_in(usb_transfer_batch_t *instance)
+void batch_call_in(batch_t *instance)
 {
         assert(instance);
@@ -107 +107 @@
             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);
+        int err = instance->error;
+        usb_log_debug("Batch(%p) callback IN(type:%d): %s(%d), %zu.\n",
+            instance, instance->transfer_type, str_error(err), err,
+            instance->transfered_size);
 
-        instance->callback_in(instance->fun, instance->error,
-            instance->transfered_size, instance->arg);
+        instance->callback_in(
+            instance->fun, err, instance->transfered_size, instance->arg);
 }
 /*----------------------------------------------------------------------------*/
@@ -123 +120 @@
  * @param[in] instance Batch structure to use.
  */
-void usb_transfer_batch_call_out(usb_transfer_batch_t *instance)
+void batch_call_out(batch_t *instance)
 {
         assert(instance);
         assert(instance->callback_out);
 
-        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),
-            str_error(instance->error), instance->error);
-
+        int err = instance->error;
+        usb_log_debug("Batch(%p) callback OUT(type:%d): %s(%d).\n",
+            instance, instance->transfer_type, str_error(err), err);
         instance->callback_out(instance->fun,
-            instance->error, instance->arg);
+            err, instance->arg);
 }
 /**