Changeset 62f4212 in mainline for uspace/drv/uhci-hcd/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-hcd/main.c (modified) (3 diffs)

uspace/drv/uhci-hcd/main.c

@@ -62 +62 @@
 int uhci_add_device(ddf_dev_t *device)
 {
-        usb_log_info("uhci_add_device() called\n");
+        usb_log_debug("uhci_add_device() called\n");
         assert(device);
         uhci_t *uhci = malloc(sizeof(uhci_t));
@@ -72 +72 @@
         int ret = uhci_init(uhci, device);
         if (ret != EOK) {
-                usb_log_error("Failed to initialzie UHCI driver.\n");
+                usb_log_error("Failed to initialize UHCI driver: %s.\n",
+                    str_error(ret));
                 return ret;
         }
         device->driver_data = uhci;
+
+        usb_log_info("Controlling new UHCI device `%s'.\n", device->name);
+
         return EOK;
 }
@@ -89 +93 @@
 int main(int argc, char *argv[])
 {
+        printf(NAME ": HelenOS UHCI driver.\n");
+
         sleep(3); /* TODO: remove in final version */
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
 
         return ddf_driver_main(&uhci_driver);