Changeset 954d590 in mainline

Timestamp:

2015-07-03T22:59:37Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

495547d

Parents:

6de4b4a1

Message:

ehci/eplist: Consolidate debug messages

File:

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

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

@@ -56 +56 @@
         instance->list_head = malloc32(sizeof(qh_t));
         if (!instance->list_head) {
-                usb_log_error("Failed to allocate list head.\n");
+                usb_log_error("EPL(%p-%s): Failed to allocate list head.",
+                    instance, name);
                 return ENOMEM;
         }
@@ -62 +63 @@
 
         list_initialize(&instance->endpoint_list);
-        usb_log_debug2("Transfer list %s setup with ED: %p(%"PRIxn").\n",
-            name, instance->list_head, addr_to_phys(instance->list_head));
+        fibril_mutex_initialize(&instance->guard);
 
-        fibril_mutex_initialize(&instance->guard);
+        usb_log_debug2("EPL(%p-%s): Transfer list setup with ED: %p(%"PRIxn").",
+            instance, name, instance->list_head,
+            addr_to_phys(instance->list_head));
+
         return EOK;
 }
@@ -75 +78 @@
         assert(instance->list_head);
         assert(next->list_head);
+
+        usb_log_debug2("EPL(%p-%s): Chained with EPL(%p-%s).",
+            instance, instance->name, next, next->name);
 
         qh_append_qh(instance->list_head, next->list_head);
@@ -91 +97 @@
         assert(ep);
         assert(ep->qh);
-        usb_log_debug2("Queue %s: Append endpoint(%p).\n", instance->name, ep);
+        usb_log_debug2("EPL(%p-%s): Append endpoint(%p).\n",
+            instance, instance->name, ep);
 
         fibril_mutex_lock(&instance->guard);
@@ -121 +128 @@
         ehci_endpoint_t *first = ehci_endpoint_list_instance(
             list_first(&instance->endpoint_list));
-        usb_log_debug("HCD EP(%p) added to list %s, first is %p(%p).\n",
-                ep, instance->name, first, first->qh);
+        usb_log_debug("EPL(%p-%s): EP(%p) added to list, first is %p(%p).\n",
+            instance, instance->name, ep, first, first->qh);
         if (last_qh == instance->list_head) {
-                usb_log_debug2("%s head ED(%p-%"PRIxn"): %x:%x.\n",
-                    instance->name, last_qh, addr_to_phys(instance->list_head),
+                usb_log_debug2("EPL(%p-%s): head EP(%p-%"PRIxn"): %x:%x.\n",
+                    instance, instance->name, last_qh,
+                    addr_to_phys(instance->list_head),
                     last_qh->status, last_qh->horizontal);
         }
@@ -145 +153 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_log_debug2("Queue %s: removing endpoint(%p).\n", instance->name, ep);
+        usb_log_debug2("EPL(%p-%s): removing EP(%p).\n",
+            instance, instance->name, ep);
 
         const char *qpos = NULL;
@@ -163 +172 @@
         write_barrier();
 
-        usb_log_debug("HCD EP(%p) removed (%s) from %s, horizontal %x.\n",
-            ep, qpos, instance->name, ep->qh->horizontal);
+        usb_log_debug("EPL(%p-%s): EP(%p) removed (%s), horizontal %x.\n",
+            instance, instance->name,  ep, qpos, ep->qh->horizontal);
 
         /* Remove from the endpoint list */