Changeset afcd86e in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-02-01T22:19:15Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56dbe0

Parents:

7ce0fe3

Message:

Driver uhci-hcd uses unified debug log

File:

• uspace/drv/uhci-hcd/main.c (modified) (7 diffs)

uspace/drv/uhci-hcd/main.c

@@ -28 +28 @@
 #include <driver.h>
 #include <errno.h>
-#include <str_error.h>
 #include <usb_iface.h>
 
-#include "debug.h"
+#include <usb/debug.h>
+
 #include "iface.h"
-#include "name.h"
 #include "pci.h"
 #include "root_hub.h"
 #include "uhci.h"
+
+#define NAME "uhci-hcd"
 
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
@@ -58 +59 @@
 static int uhci_add_device(device_t *device)
 {
-        uhci_print_info( "uhci_add_device() called\n" );
+        assert(device);
+
+        usb_log_info("uhci_add_device() called\n");
         device->ops = &uhci_ops;
 
@@ -69 +72 @@
 
         if (rc != EOK) {
-                uhci_print_fatal("failed to get I/O registers addresses: %s.\n",
-                    str_error(rc));
+                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
+                    rc, device->handle);
                 return rc;
         }
 
-        uhci_print_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
+        usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
 
@@ -80 +83 @@
 
         if (ret != EOK) {
-                uhci_print_error("Failed to init uhci-hcd.\n");
+                usb_log_error("Failed to init uhci-hcd.\n");
                 return ret;
         }
@@ -87 +90 @@
 
         if (ret != EOK) {
-                uhci_print_error("Failed to setup uhci root hub.\n");
+                usb_log_error("Failed to setup uhci root hub.\n");
                 /* TODO: destroy uhci here */
                 return ret;
@@ -94 +97 @@
         ret = child_device_register(rh, device);
         if (ret != EOK) {
-                uhci_print_error("Failed to register root hub.\n");
+                usb_log_error("Failed to register root hub.\n");
                 /* TODO: destroy uhci here */
                 return ret;
@@ -117 +120 @@
          */
         sleep(5);
-        usb_dprintf_enable(NAME, DEBUG_LEVEL_INFO);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);