Changeset 2c49b81b in mainline

Timestamp:

2011-05-07T10:34:48Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8594505

Parents:

28216a0

Message:

All USB host controllers added to usbhc DDF class

Location:

uspace

Files:

• drv/ehci-hcd/main.c (modified) (1 diff)
• drv/ohci/ohci.c (modified) (1 diff)
• drv/uhci-hcd/uhci.c (modified) (1 diff)
• drv/vhc/main.c (modified) (1 diff)
• lib/usb/include/usb/usb.h (modified) (1 diff)

uspace/drv/ehci-hcd/main.c

@@ -97 +97 @@
         }
         hc_fun->ops = &hc_ops;
+
         ret = ddf_fun_bind(hc_fun);
-
         CHECK_RET_RETURN(ret,
             "Failed to bind EHCI function: %s.\n",
+            str_error(ret));
+        ret = ddf_fun_add_to_class(hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_RETURN(ret,
+            "Failed to add EHCI to HC class: %s.\n",
             str_error(ret));
 

uspace/drv/ohci/ohci.c

@@ -188 +188 @@
             "Failed(%d) to bind OHCI device function: %s.\n",
             ret, str_error(ret));
+        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed to add OHCI to HC class: %s.\n", str_error(ret));
+
 #undef CHECK_RET_HC_RETURN
 

uspace/drv/uhci-hcd/uhci.c

@@ -210 +210 @@
             "Failed(%d) to bind UHCI device function: %s.\n",
             ret, str_error(ret));
+        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed to add UHCI to HC class: %s.\n", str_error(ret));
+
 #undef CHECK_RET_HC_RETURN
 

uspace/drv/vhc/main.c

@@ -104 +104 @@
         }
 
-        rc = ddf_fun_add_to_class(hc, "usbhc");
+        rc = ddf_fun_add_to_class(hc, USB_HC_DDF_CLASS_NAME);
         if (rc != EOK) {
                 usb_log_fatal("Failed to add function to HC class: %s.\n",

uspace/lib/usb/include/usb/usb.h

@@ -172 +172 @@
 } usb_packet_id;
 
+/** Class name for USB host controllers. */
+#define USB_HC_DDF_CLASS_NAME "usbhc"
+
 #endif
 /**