Changeset 6ef69e9 in mainline for uspace/drv/bus/usb/ehci/ehci_batch.c

Timestamp:

2015-06-30T04:51:38Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c4ba645d

Parents:

26d6f73

Message:

ehci,batch: consolidate debug messages

File:

• uspace/drv/bus/usb/ehci/ehci_batch.c (modified) (7 diffs)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -38 +38 @@
 #include <mem.h>
 #include <stdbool.h>
+#include <str_error.h>
 
 #include <usb/usb.h>
@@ -159 +160 @@
         batch_setup[usb_batch->ep->transfer_type](ehci_batch, dir);
 
+        usb_log_debug("Batch %p %s " USB_TRANSFER_BATCH_FMT " initialized.\n",
+            usb_batch, usb_str_direction(dir),
+            USB_TRANSFER_BATCH_ARGS(*usb_batch));
+
         return ehci_batch;
 dispose:
@@ -222 +227 @@
                             -= td_remain_size(ehci_batch->tds[i]);
                 } else {
-                        usb_log_debug("Batch %p found error TD(%zu):%08x.\n",
+                        usb_log_debug("Batch %p found error TD(%zu):%08x (%d).\n",
                             ehci_batch->usb_batch, i,
-                            ehci_batch->tds[i]->status);
+                            ehci_batch->tds[i]->status,
+                            ehci_batch->usb_batch->error);
                         /* Clear possible ED HALT */
                         qh_clear_halt(ehci_batch->qh);
@@ -236 +242 @@
         ehci_batch->qh->next = LINK_POINTER_TERM;
         ehci_batch->qh->current = LINK_POINTER_TERM;
-        usb_log_debug("Batch %p complete.\n", ehci_batch->usb_batch);
+        usb_log_debug("Batch %p complete: %s", ehci_batch->usb_batch,
+            str_error(ehci_batch->usb_batch->error));
 
         return true;
@@ -321 +328 @@
             ehci_batch->tds[td_current]->next,
             ehci_batch->tds[td_current]->alternate);
-
-        usb_log_debug(
-            "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-            ehci_batch->usb_batch,
-            usb_str_transfer_type(ehci_batch->usb_batch->ep->transfer_type),
-            usb_str_direction(dir),
-            USB_TRANSFER_BATCH_ARGS(*ehci_batch->usb_batch));
 }
 
@@ -344 +344 @@
         assert(dir == USB_DIRECTION_IN || dir == USB_DIRECTION_OUT);
 
-        usb_log_debug("Control QH(%"PRIxn"): %08x:%08x:%08x:%08x:%08x:%08x",
+        usb_log_debug2("Control QH(%"PRIxn"): %08x:%08x:%08x:%08x:%08x:%08x",
             addr_to_phys(ehci_batch->qh),
             ehci_batch->qh->ep_char, ehci_batch->qh->ep_cap,
@@ -374 +374 @@
                 ++td_current;
         }
-
-        usb_log_debug(
-            "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized",
-            ehci_batch->usb_batch,
-            usb_str_transfer_type(ehci_batch->usb_batch->ep->transfer_type),
-            usb_str_direction(dir),
-            USB_TRANSFER_BATCH_ARGS(*ehci_batch->usb_batch));
 }