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

Timestamp:

2011-04-14T08:24:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (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:

Merge development/ changes

File:

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

uspace/drv/uhci-hcd/main.c

@@ -39 +39 @@
 #include <usb/debug.h>
 
-#include "iface.h"
 #include "uhci.h"
 
@@ -62 +61 @@
 int uhci_add_device(ddf_dev_t *device)
 {
-        usb_log_debug("uhci_add_device() called\n");
+        usb_log_debug2("uhci_add_device() called\n");
         assert(device);
+
         uhci_t *uhci = malloc(sizeof(uhci_t));
         if (uhci == NULL) {
@@ -72 +72 @@
         int ret = uhci_init(uhci, device);
         if (ret != EOK) {
-                usb_log_error("Failed to initialize UHCI driver: %s.\n",
-                    str_error(ret));
+                usb_log_error("Failed(%d) to initialize UHCI driver: %s.\n",
+                    ret, str_error(ret));
                 return ret;
         }
@@ -85 +85 @@
 /** Initialize global driver structures (NONE).
  *
- * @param[in] argc Nmber of arguments in argv vector (ignored).
+ * @param[in] argc Number of arguments in argv vector (ignored).
  * @param[in] argv Cmdline argument vector (ignored).
  * @return Error code.
@@ -94 +94 @@
 {
         printf(NAME ": HelenOS UHCI driver.\n");
-
-        sleep(3); /* TODO: remove in final version */
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);