Changeset 2b0929e in mainline

Timestamp:

2012-12-21T14:33:23Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

94c40ce2

Parents:

0a12879

Message:

libusbhost: Drop hcd parameter from hcd_ddf_setup_hub.

Fix OHCI references in ddf_helpers.c

Location:

uspace

Files:

• drv/bus/usb/ohci/ohci.c (modified) (1 diff)
• lib/usbhost/include/usb/host/ddf_helpers.h (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (7 diffs)

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

@@ -159 +159 @@
 
         /* HC should be running OK. We can add root hub */
-        ret = hcd_ddf_setup_hub(dev_to_hcd(device), &hc_impl->rh.address, device);
+        ret = hcd_ddf_setup_hub(device, &hc_impl->rh.address);
         CHECK_RET_CLEAN_RETURN(ret,
             "Failed to register OHCI root hub: %s.\n", str_error(ret));

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

@@ -45 +45 @@
 int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun,
     usb_speed_t max_speed, size_t bw, bw_count_func_t bw_count);
-int hcd_ddf_setup_hub(hcd_t *instance, usb_address_t *address, ddf_dev_t *dev);
+int hcd_ddf_setup_hub(ddf_dev_t *dev, usb_address_t *address);
 
 hcd_t *dev_to_hcd(ddf_dev_t *dev);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -57 +57 @@
         hc_dev_t *hc_dev = dev_to_hc_dev(dev);
         if (!hc_dev || !hc_dev->hc_fun) {
-                usb_log_error("Invalid OHCI device.\n");
+                usb_log_error("Invalid HCD device.\n");
                 return NULL;
         }
@@ -173 +173 @@
 /** Announce root hub to the DDF
  *
- * @param[in] instance OHCI driver instance
- * @param[in] hub_fun DDF function representing OHCI root hub
+ * @param[in] device Host controller ddf device
+ * @param[in/out] address USB address of the root hub
  * @return Error code
  */
-int hcd_ddf_setup_hub(hcd_t *instance, usb_address_t *address, ddf_dev_t *device)
-{
-        assert(instance);
+int hcd_ddf_setup_hub(ddf_dev_t *device, usb_address_t *address)
+{
         assert(address);
         assert(device);
 
-        const usb_speed_t speed = instance->dev_manager.max_speed;
-
-        int ret = usb_device_manager_request_address(&instance->dev_manager,
+        hcd_t *hcd = dev_to_hcd(device);
+
+        const usb_speed_t speed = hcd->dev_manager.max_speed;
+
+        int ret = usb_device_manager_request_address(&hcd->dev_manager,
             address, false, speed);
         if (ret != EOK) {
@@ -197 +198 @@
         usb_log_error(message); \
         usb_endpoint_manager_remove_ep( \
-            &instance->ep_manager, *address, 0, \
+            &hcd->ep_manager, *address, 0, \
             USB_DIRECTION_BOTH, NULL, NULL); \
         usb_device_manager_release_address( \
-            &instance->dev_manager, *address); \
+            &hcd->dev_manager, *address); \
         return ret; \
 } else (void)0
 
         ret = usb_endpoint_manager_add_ep(
-            &instance->ep_manager, *address, 0,
+            &hcd->ep_manager, *address, 0,
             USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, speed, 64,
             0, NULL, NULL);
@@ -229 +230 @@
  * @param[in] device DDF instance of the device to use.
  *
- * This function does all the preparatory work for hc driver implementation.
- *  - gets device hw resources
- *  - disables OHCI legacy support
- *  - asks for interrupt
- *  - registers interrupt handler
+ * This function does all the ddf work for hc driver.
  */
 int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun,
@@ -243 +240 @@
         hc_dev_t *instance = ddf_dev_data_alloc(device, sizeof(hc_dev_t));
         if (instance == NULL) {
-                usb_log_error("Failed to allocate OHCI driver.\n");
+                usb_log_error("Failed to allocate HCD ddf structure.\n");
                 return ENOMEM;
         }
@@ -260 +257 @@
         int ret = instance->hc_fun ? EOK : ENOMEM;
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to create OHCI HC function: %s.\n", str_error(ret));
+            "Failed to create HCD HC function: %s.\n", str_error(ret));
         ddf_fun_set_ops(instance->hc_fun, &hc_ops);
         hcd_t *hcd = ddf_fun_data_alloc(instance->hc_fun, sizeof(hcd_t));
@@ -271 +268 @@
         ret = ddf_fun_bind(instance->hc_fun);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to bind OHCI device function: %s.\n", str_error(ret));
+            "Failed to bind HCD device function: %s.\n", str_error(ret));
 
 #define CHECK_RET_UNBIND_FREE_RETURN(ret, message...) \
 if (ret != EOK) { \
         ddf_fun_unbind(instance->hc_fun); \
-        CHECK_RET_DEST_FREE_RETURN(ret, \
-            "Failed to add OHCI to HC class: %s.\n", str_error(ret)); \
+        CHECK_RET_DEST_FREE_RETURN(ret, message); \
 } else (void)0
         ret = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);