Changeset 98169ab in mainline

Timestamp:

2011-04-01T14:25:51Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b9c0e2

Parents:

27bdfa5 (diff), 9b640c42 (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:

Root hub match id fix

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (1 diff)
• ohci.c (modified) (4 diffs)

uspace/drv/ohci/hc.c

@@ -58 +58 @@
 
         char *match_str = NULL;
-        int ret = asprintf(&match_str, "usb&mid");
+        int ret = asprintf(&match_str, "usb&class=hub");
         ret = (match_str == NULL) ? ret : EOK;
         if (ret < 0) {

uspace/drv/ohci/ohci.c

@@ -31 +31 @@
  */
 /** @file
- * @brief UHCI driver
+ * @brief OHCI driver
  */
 #include <errno.h>
@@ -117 +117 @@
 /** Initialize hc and rh ddf structures and their respective drivers.
  *
- * @param[in] instance UHCI structure to use.
+ * @param[in] instance OHCI structure to use.
  * @param[in] device DDF instance of the device to use.
  *
  * This function does all the preparatory work for hc and rh drivers:
  *  - gets device hw resources
- *  - disables UHCI legacy support
+ *  - disables OHCI legacy support
  *  - asks for interrupt
  *  - registers interrupt handler
@@ -185 +185 @@
         ret = ddf_fun_bind(instance->hc_fun);
         CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to bind UHCI device function: %s.\n",
+            "Failed(%d) to bind OHCI device function: %s.\n",
             ret, str_error(ret));
 #undef CHECK_RET_HC_RETURN
@@ -216 +216 @@
         ret = ddf_fun_bind(instance->rh_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register UHCI root hub.\n", ret);
+            "Failed(%d) to register OHCI root hub.\n", ret);
 
         return EOK;