Changeset dced52a in mainline for uspace/drv/uhci-rhd/port.c

Timestamp:

2011-02-28T12:24:57Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

86341e2, cc44f7e

Parents:

4abc304

Message:

Debug code refactoring, redundant code removed

File:

• uspace/drv/uhci-rhd/port.c (modified) (14 diffs)

uspace/drv/uhci-rhd/port.c

@@ -71 +71 @@
         port->checker = fibril_create(uhci_port_check, port);
         if (port->checker == 0) {
-                usb_log_error(": failed to launch root hub fibril.");
+                usb_log_error("Port(%p - %d): failed to launch root hub fibril.",
+                    port->address, port->number);
                 return ENOMEM;
         }
         fibril_add_ready(port->checker);
-        usb_log_debug(
-          "Added fibril for port %d: %p.\n", number, port->checker);
+        usb_log_debug("Port(%p - %d): Added fibril. %x\n",
+            port->address, port->number, port->checker);
         return EOK;
 }
@@ -92 +93 @@
         uhci_port_t *port_instance = port;
         assert(port_instance);
-        port_status_write(port_instance->address, 0);
-
-        uint64_t count = 0;
+//      port_status_write(port_instance->address, 0);
+
+        unsigned count = 0;
 
         while (1) {
@@ -106 +107 @@
                 static fibril_mutex_t dbg_mtx = FIBRIL_MUTEX_INITIALIZER(dbg_mtx);
                 fibril_mutex_lock(&dbg_mtx);
-                usb_log_debug("Port %d status at %p: 0x%04x. === %llu\n",
-                  port_instance->number, port_instance->address, port_status, count++);
+                usb_log_debug2("Port(%p - %d): Status: %#04x. === %u\n",
+                  port_instance->address, port_instance->number, port_status, count++);
 //              print_port_status(port_status);
                 fibril_mutex_unlock(&dbg_mtx);
 
                 if ((port_status & STATUS_CONNECTED_CHANGED) != 0) {
-                        usb_log_debug("Change detected on port %d: %x.\n",
-                            port_instance->number, port_status);
+                        usb_log_debug("Port(%p - %d): Connected change detected: %x.\n",
+                            port_instance->address, port_instance->number, port_status);
 
 
@@ -119 +120 @@
                             &port_instance->hc_connection);
                         if (rc != EOK) {
-                                usb_log_error("Failed to connect to HC.");
+                                usb_log_error("Port(%p - %d): Failed to connect to HC.",
+                                    port_instance->address, port_instance->number);
                                 continue;
                         }
@@ -125 +127 @@
                         /* remove any old device */
                         if (port_instance->attached_device) {
-                                usb_log_debug("Removing device on port %d.\n",
-                                    port_instance->number);
+                                usb_log_debug("Port(%p - %d): Removing device.\n",
+                                    port_instance->address, port_instance->number);
                                 uhci_port_remove_device(port_instance);
                         }
@@ -136 +138 @@
                                 /* ack changes by writing one to WC bits */
                                 port_status_write(port_instance->address, port_status);
-                                usb_log_debug("Change status ack on port %d.\n",
-                                                port_instance->number);
+                                usb_log_debug("Port(%p - %d): Change status ACK.\n",
+                                                port_instance->address, port_instance->number);
                         }
 
@@ -143 +145 @@
                             &port_instance->hc_connection);
                         if (rc != EOK) {
-                                usb_log_error("Failed to disconnect from HC.");
+                                usb_log_error("Port(%p - %d): Failed to disconnect from HC.",
+                                    port_instance->address, port_instance->number);
                         }
                 }
@@ -160 +163 @@
         uhci_port_t *port = (uhci_port_t *) arg;
 
-        usb_log_debug("new_device_enable_port(%d)\n", port->number);
+        usb_log_debug2("Port(%p - %d): new_device_enable_port.\n",
+            port->address, port->number);
 
         /*
@@ -173 +177 @@
          */
         {
-                usb_log_debug("Reset Signal start on port %d.\n",
-                    port->number);
+                usb_log_debug("Port(%p - %d): Reset Signal start.\n",
+                    port->address, port->number);
                 port_status_t port_status =
                         port_status_read(port->address);
@@ -184 +188 @@
                 port_status &= ~STATUS_IN_RESET;
                 port_status_write(port->address, port_status);
-                usb_log_debug("Reset Signal stop on port %d.\n",
-                    port->number);
+                usb_log_debug("Port(%p - %d): Reset Signal stop.\n",
+                    port->address, port->number);
         }
 
@@ -200 +204 @@
         assert(usb_hc_connection_is_opened(&port->hc_connection));
 
-        usb_log_info("Detected new device on port %u.\n", port->number);
+        usb_log_info("Port(%p-%d): Detected new device.\n",
+            port->address, port->number);
 
         usb_address_t dev_addr;
@@ -209 +214 @@
 
         if (rc != EOK) {
-                usb_log_error("Failed adding new device on port %u: %s.\n",
-                    port->number, str_error(rc));
+                usb_log_error("Port(%p-%d): Failed(%d) adding new device: %s.\n",
+                    port->address, port->number, rc, str_error(rc));
                 uhci_port_set_enabled(port, false);
                 return rc;
         }
 
-        usb_log_info("New device on port %u has address %d (handle %zu).\n",
-            port->number, dev_addr, port->attached_device);
+        usb_log_info("Port(%p-%d): New device has address %d (handle %zu).\n",
+            port->address, port->number, dev_addr, port->attached_device);
 
         return EOK;
@@ -224 +229 @@
 static int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_error("Don't know how to remove device %#x.\n",
-                (unsigned int)port->attached_device);
+        usb_log_error("Port(%p-%d): Don't know how to remove device %#x.\n",
+                port->address, port->number, (unsigned int)port->attached_device);
 //      uhci_port_set_enabled(port, false);
         return EOK;
@@ -246 +251 @@
         port_status_write(port->address, port_status);
 
-        usb_log_info("%s port %d.\n",
-          enabled ? "Enabled" : "Disabled", port->number);
+        usb_log_info("Port(%p-%d): %sabled port.\n",
+                port->address, port->number, enabled ? "En" : "Dis");
         return EOK;
 }