Changeset 62f4212 in mainline for uspace/drv/uhci-rhd/main.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from development

File:

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

uspace/drv/uhci-rhd/main.c

@@ -36 +36 @@
 #include <device/hw_res.h>
 #include <errno.h>
+#include <str_error.h>
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
@@ -86 +87 @@
         int ret = hc_get_my_registers(device, &io_regs, &io_size);
         if (ret != EOK) {
-                usb_log_error("Failed(%d) to get registers from parent hc.",
-                    ret);
-        }
-        usb_log_info("I/O regs at %#X (size %zu).\n", io_regs, io_size);
+                usb_log_error("Failed to get registers from parent HC: %s.\n",
+                    str_error(ret));
+        }
+        usb_log_debug("I/O regs at %#X (size %zu).\n", io_regs, io_size);
 
         uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
@@ -99 +100 @@
         ret = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
         if (ret != EOK) {
-                usb_log_error("Failed(%d) to initialize driver instance.\n", ret);
+                usb_log_error("Failed to initialize driver instance: %s.\n",
+                    str_error(ret));
                 free(rh);
                 return ret;
@@ -105 +107 @@
 
         device->driver_data = rh;
-        usb_log_info("Sucessfully initialized driver instance for device:%d.\n",
-            device->handle);
+        usb_log_info("Controlling root hub `%s' (%llu).\n",
+            device->name, device->handle);
         return EOK;
 }
@@ -129 +131 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        printf(NAME ": HelenOS UHCI root hub driver.\n");
+
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+
         return ddf_driver_main(&uhci_rh_driver);
 }