Changeset 1d1bb0f in mainline for uspace/lib/usbhost

Timestamp:

2011-06-19T13:38:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b72efe8

Parents:

adfdbd5 (diff), 9724d7f (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:

Merge from ​https://code.launchpad.net/~vojtech-horky/helenos/usb

Location:

uspace/lib/usbhost

Files:

• include/usb/host/batch.h (modified) (1 diff)
• src/batch.c (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/batch.h

@@ -61 +61 @@
 };
 
+/** Printf formatting string for dumping usb_transfer_batch_t. */
+#define USB_TRANSFER_BATCH_FMT "[%d:%d %s %s-%s %zuB/%zu]"
+
+/** Printf arguments for dumping usb_transfer_batch_t.
+ * @param batch USB transfer batch to be dumped.
+ */
+#define USB_TRANSFER_BATCH_ARGS(batch) \
+        (batch).ep->address, (batch).ep->endpoint, \
+        usb_str_speed((batch).ep->speed), \
+        usb_str_transfer_type_short((batch).ep->transfer_type), \
+        usb_str_direction((batch).ep->direction), \
+        (batch).buffer_size, (batch).ep->max_packet_size
+
+
 void usb_transfer_batch_init(
     usb_transfer_batch_t *instance,

uspace/lib/usbhost/src/batch.c

@@ -128 +128 @@
         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->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);
+        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n",
+            instance, USB_TRANSFER_BATCH_ARGS(*instance),
+            instance->transfered_size, str_error(instance->error));
 
         instance->callback_in(instance->fun, instance->error,
@@ -148 +145 @@
         assert(instance->callback_out);
 
-        usb_log_debug("Batch(%p) done (T%d.%d, %s %s out): %s (%d).\n",
-            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);
+        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n",
+            instance, USB_TRANSFER_BATCH_ARGS(*instance),
+            str_error(instance->error));
 
         instance->callback_out(instance->fun,
@@ -165 +160 @@
 {
         assert(instance);
-        usb_log_debug("Batch(%p) disposing.\n", instance);
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " disposing.\n",
+            instance, USB_TRANSFER_BATCH_ARGS(*instance));
         if (instance->private_data) {
                 assert(instance->private_data_dtor);