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

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

afcd86e

Parents:

993a1e1

Message:

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

File:

• uspace/drv/uhci-rhd/main.c (modified) (3 diffs)

uspace/drv/uhci-rhd/main.c

@@ -28 +28 @@
 #include <driver.h>
 #include <errno.h>
-#include <str_error.h>
+
 #include <usb_iface.h>
+#include <usb/debug.h>
 
-#include "debug.h"
-//#include "iface.h"
 #include "root_hub.h"
+
+#define NAME "uhci-rhd"
 
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
 {
-        /* This shall be called only for the UHCI itself. */
         assert(dev);
         assert(dev->driver_data);
+        assert(handle);
+
         *handle = ((uhci_root_hub_t*)dev->driver_data)->hc_handle;
+        usb_log_debug("Answering HC handle: %d.\n", *handle);
 
         return EOK;
@@ -58 +61 @@
                 return ENOTSUP;
 
-        uhci_print_info("%s called device %d\n", __FUNCTION__, device->handle);
+        usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
         device->ops = &uhci_rh_ops;
 
         uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
         if (!rh) {
+                usb_log_error("Failed to allocate memory for driver instance.\n");
                 return ENOMEM;
         }
+
+        /* TODO: get register values from hc */
         int ret = uhci_root_hub_init(rh, (void*)0xc030, 4, device);
         if (ret != EOK) {
+                usb_log_error("Failed(%d) to initialize driver instance.\n", ret);
                 free(rh);
                 return ret;
         }
+
         device->driver_data = rh;
+        usb_log_info("Sucessfully initialized driver isntance for device:%d.\n",
+            device->handle);
         return EOK;
 }
@@ -85 +95 @@
 int main(int argc, char *argv[])
 {
-        /*
-         * Do some global initializations.
-         */
-        usb_dprintf_enable(NAME, DEBUG_LEVEL_INFO);
-
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
         return driver_main(&uhci_rh_driver);
 }