Changeset 4daee7a in mainline

Timestamp:

2012-12-16T16:26:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8de2cca

Parents:

f29931c

Message:

ohci, libusbhost: Move root hub registration to libusbhost.

Root hub controlled by generic usb hub driver is the way mentioned in the specs.

Location:

uspace

Files:

• drv/bus/usb/ohci/hc.c (modified) (1 diff)
• drv/bus/usb/ohci/ohci.c (modified) (1 diff)
• lib/usbhost/Makefile (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (4 diffs)
• lib/usbhost/src/hcd.c (added)

uspace/drv/bus/usb/ohci/hc.c

@@ -135 +135 @@
 
         return EOK;
-}
-
-/** Announce OHCI root hub to the DDF
- *
- * @param[in] instance OHCI driver intance
- * @param[in] hub_fun DDF fuction representing OHCI root hub
- * @return Error code
- */
-int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
-{
-        assert(instance);
-        assert(hub_fun);
-
-        /* Try to get address 1 for root hub. */
-        instance->rh.address = 1;
-        int ret = usb_device_manager_request_address(
-            &instance->generic.dev_manager, &instance->rh.address, false,
-            USB_SPEED_FULL);
-        if (ret != EOK) {
-                usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(ret));
-                return ret;
-        }
-
-#define CHECK_RET_UNREG_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        usb_endpoint_manager_remove_ep( \
-            &instance->generic.ep_manager, instance->rh.address, 0, \
-            USB_DIRECTION_BOTH, NULL, NULL); \
-        usb_device_manager_release_address( \
-            &instance->generic.dev_manager, instance->rh.address); \
-        return ret; \
-} else (void)0
-
-        ret = usb_endpoint_manager_add_ep(
-            &instance->generic.ep_manager, instance->rh.address, 0,
-            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
-            0, NULL, NULL);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to register root hub control endpoint: %s.\n",
-            str_error(ret));
-
-        ret = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to add root hub match-id: %s.\n", str_error(ret));
-
-        ret = ddf_fun_bind(hub_fun);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to bind root hub function: %s.\n", str_error(ret));
-
-        ret = usb_device_manager_bind_address(&instance->generic.dev_manager,
-            instance->rh.address, ddf_fun_get_handle(hub_fun));
-        if (ret != EOK)
-                usb_log_warning("Failed to bind root hub address: %s.\n",
-                    str_error(ret));
-
-        return EOK;
-#undef CHECK_RET_RELEASE
 }
 

uspace/drv/bus/usb/ohci/ohci.c

@@ -248 +248 @@
             "Failed to add OHCI to HC class: %s.\n", str_error(ret));
 
-        ret = hc_register_hub(hc, instance->rh_fun);
+        ret = hcd_register_hub(&hc->generic, &hc->rh.address, instance->rh_fun);
         CHECK_RET_FINI_RETURN(ret,
             "Failed to register OHCI root hub: %s.\n", str_error(ret));

uspace/lib/usbhost/Makefile

@@ -36 +36 @@
 SOURCES = \
         src/endpoint.c \
+        src/hcd.c \
         src/iface.c \
         src/usb_device_manager.c \

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -74 +74 @@
  */
 static inline void hcd_init(hcd_t *hcd, usb_speed_t max_speed, size_t bandwidth,
-    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t))
+    bw_count_func_t bw_count)
 {
         assert(hcd);
@@ -83 +83 @@
         hcd->ep_add_hook = NULL;
         hcd->ep_remove_hook = NULL;
+}
+
+static inline void hcd_set_implementation(hcd_t *hcd, void *data,
+    schedule_hook_t schedule, ep_add_hook_t add_hook, ep_remove_hook_t rem_hook)
+{
+        assert(hcd);
+        hcd->private_data = data;
+        hcd->schedule = schedule;
+        hcd->ep_add_hook = add_hook;
+        hcd->ep_remove_hook = rem_hook;
+
 }
 
@@ -98 +109 @@
 }
 
+int hcd_register_hub(hcd_t *instance, usb_address_t *address, ddf_fun_t *hub_fun);
+
+
 /** Data retrieve wrapper.
  * @param fun ddf function, non-null.
@@ -107 +121 @@
 }
 
+
 extern usbhc_iface_t hcd_iface;