Changeset 8ff0bd2 in mainline for uspace/lib/usbhost/src/batch.c

Timestamp:

2011-09-04T11:30:58Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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 mainline changes

File:

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

uspace/lib/usbhost/src/batch.c

@@ -109 +109 @@
         assert(instance);
         assert(instance->ep);
+        assert(instance->next_step);
         endpoint_release(instance->ep);
         instance->next_step(instance);
@@ -128 +129 @@
         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_debug2("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 +146 @@
         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_debug2("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 +161 @@
 {
         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);