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

Timestamp:

2011-02-01T22:02:23Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial

Children:

afcd86e

Parents:

993a1e1

Message:

Root ub driver uses unified debug logging and some other polishing.

File:

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

uspace/drv/uhci-rhd/port.c

@@ -1 +1 @@
 
 #include <errno.h>
+
 #include <usb/usb.h>    /* usb_address_t */
 #include <usb/usbdrv.h> /* usb_drv_*     */
+#include <usb/debug.h>
 
-#include "debug.h"
 #include "port.h"
 #include "port_status.h"
@@ -27 +28 @@
         port->checker = fibril_create(uhci_port_check, port);
         if (port->checker == 0) {
-                uhci_print_error(": failed to launch root hub fibril.");
+                usb_log_error(": failed to launch root hub fibril.");
                 return ENOMEM;
         }
         fibril_add_ready(port->checker);
-        uhci_print_verbose(
+        usb_log_debug(
           "Added fibril for port %d: %p.\n", number, port->checker);
         return EOK;
@@ -49 +50 @@
 
         while (1) {
-                uhci_print_verbose("Port(%d) status address %p:\n",
+                usb_log_debug("Port(%d) status address %p:\n",
                   port_instance->number, port_instance->address);
 
@@ -57 +58 @@
 
                 /* debug print */
-                uhci_print_info("Port(%d) status %#.4x\n",
+                usb_log_info("Port(%d) status %#.4x\n",
                   port_instance->number, port_status);
                 print_port_status(port_status);
@@ -79 +80 @@
         assert(port->hc_phone);
 
-        uhci_print_info("Adding new device on port %d.\n", port->number);
+        usb_log_info("Adding new device on port %d.\n", port->number);
 
 
@@ -85 +86 @@
         int ret = usb_drv_reserve_default_address(port->hc_phone);
         if (ret != EOK) {
-                uhci_print_error("Failed to reserve default address.\n");
+                usb_log_error("Failed to reserve default address.\n");
                 return ret;
         }
@@ -92 +93 @@
 
         if (usb_address <= 0) {
-                uhci_print_error("Recieved invalid address(%d).\n", usb_address);
+                usb_log_error("Recieved invalid address(%d).\n", usb_address);
                 return usb_address;
         }
@@ -122 +123 @@
 
         if (ret != EOK) { /* address assigning went wrong */
-                uhci_print_error("Failed(%d) to assign address to the device.\n", ret);
+                usb_log_error("Failed(%d) to assign address to the device.\n", ret);
                 uhci_port_set_enabled(port, false);
                 int release = usb_drv_release_default_address(port->hc_phone);
                 if (release != EOK) {
-                        uhci_print_fatal("Failed to release default address.\n");
+                        usb_log_error("Failed to release default address.\n");
                         return release;
                 }
@@ -135 +136 @@
         ret = usb_drv_release_default_address(port->hc_phone);
         if (ret != EOK) {
-                uhci_print_fatal("Failed to release default address.\n");
+                usb_log_error("Failed to release default address.\n");
                 return ret;
         }
@@ -146 +147 @@
 
         if (ret != EOK) { /* something went wrong */
-                uhci_print_error("Failed(%d) in usb_drv_register_child.\n", ret);
+                usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret);
                 uhci_port_set_enabled(port, false);
                 return ENOMEM;
         }
-        uhci_print_info("Sucessfully added device on port(%d) address(%d).\n",
+        usb_log_info("Sucessfully added device on port(%d) address(%d).\n",
                 port->number, usb_address);
 
@@ -160 +161 @@
 static int uhci_port_remove_device(uhci_port_t *port)
 {
-        uhci_print_error("Don't know how to remove device %#x.\n",
+        usb_log_error("Don't know how to remove device %#x.\n",
                 (unsigned int)port->attached_device);
         uhci_port_set_enabled(port, false);
@@ -182 +183 @@
         port_status_write(port->address, port_status);
 
-        uhci_print_info("%s port %d.\n",
+        usb_log_info("%s port %d.\n",
           enabled ? "Enabled" : "Disabled", port->number);
         return EOK;