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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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) (3 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 " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n",
+        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));
@@ -145 +146 @@
         assert(instance->callback_out);
 
-        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n",
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n",
             instance, USB_TRANSFER_BATCH_ARGS(*instance),
             str_error(instance->error));