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

Timestamp:

2011-03-21T16:54:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

41ef5b9, ce794342

Parents:

5287502 (diff), 625f1ba (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:

Small improvements of libusb

Below is a summary of changes

• added usb_str_speed() function for nicer outputs
• USB framework remembers configuration descriptor
• some refactoring (hub driver, messages of transfer batch API)

File:

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

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

@@ -107 +107 @@
             instance->buffer_size);
 
-        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);
+        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->callback_in(
-            instance->fun, err, instance->transfered_size, instance->arg);
+        instance->callback_in(instance->fun, instance->error,
+            instance->transfered_size, instance->arg);
 }
 /*----------------------------------------------------------------------------*/
@@ -125 +128 @@
         assert(instance->callback_out);
 
-        int err = instance->error;
-        usb_log_debug("Batch(%p) callback OUT(type:%d): %s(%d).\n",
-            instance, instance->transfer_type, str_error(err), err);
+        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);
+
         instance->callback_out(instance->fun,
-            err, instance->arg);
+            instance->error, instance->arg);
 }
 /**