Changeset 48563a3 in mainline

Timestamp:

2011-02-26T12:30:58Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1ae51ae

Parents:

3de48b5

Message:

debug messages reworked

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (6 diffs)
• iface.c (modified) (3 diffs)
• uhci.c (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -140 +140 @@
 {
         assert(instance);
-        usb_log_debug2("Checking(%p) %d packet for completion.\n",
+        usb_log_debug2("Batch(%p) checking %d packet(s) for completion.\n",
             instance, instance->packets);
         instance->transfered_size = 0;
@@ -152 +152 @@
                         if (i > 0)
                                 instance->transfered_size -= instance->setup_size;
+                        usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
+                          instance, i, instance->tds[i].status);
                         return true;
                 }
@@ -297 +299 @@
 
         int err = instance->error;
-        usb_log_info("Callback IN(%d): %s(%d), %zu.\n", instance->transfer_type,
-            str_error(err), err, instance->transfered_size);
+        usb_log_info("Batch(%p) callback IN(type:%d): %s(%d), %zu.\n",
+            instance, instance->transfer_type, str_error(err), err,
+            instance->transfered_size);
 
         instance->callback_in(instance->fun,
@@ -311 +314 @@
 
         int err = instance->error;
-        usb_log_info("Callback OUT(%d): %d.\n", instance->transfer_type, err);
+        usb_log_info("Batch(%p) callback OUT(type:%d): %s(%d).\n",
+            instance, instance->transfer_type, str_error(err), err);
         instance->callback_out(instance->fun,
             err, instance->arg);
@@ -320 +324 @@
         assert(instance);
         batch_call_in(instance);
-        usb_log_debug("Disposing batch: %p.\n", instance);
+        usb_log_debug("Batch(%p) disposing.\n", instance);
         free32(instance->tds);
         free32(instance->qh);
@@ -332 +336 @@
         assert(instance);
         batch_call_out(instance);
-        usb_log_debug("Disposing batch: %p.\n", instance);
+        usb_log_debug("Batch(%p) disposing.\n", instance);
         free32(instance->tds);
         free32(instance->qh);

uspace/drv/uhci-hcd/iface.c

@@ -110 +110 @@
         usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
 
+        usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
+            target.address, target.endpoint, size, max_packet_size);
+
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
             max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
@@ -119 +122 @@
 /*----------------------------------------------------------------------------*/
 static int interrupt_in(ddf_fun_t *fun, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
+    size_t max_packet_size, void *data, size_t size,
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
@@ -127 +129 @@
         assert(hc);
         usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+        usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n",
+            target.address, target.endpoint, size, max_packet_size);
 
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,

uspace/drv/uhci-hcd/uhci.c

@@ -304 +304 @@
         while (1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-//              usb_log_debug2("UHCI status: %x.\n", status);
+                if (status != 0)
+                        usb_log_debug2("UHCI status: %x.\n", status);
                 status |= 1;
                 uhci_interrupt(instance, status);