Changeset 32fb6bce in mainline for uspace/drv/bus/usb/vhc/main.c

Timestamp:

2017-12-18T22:50:21Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7f70d1c

Parents:

1ea0bbf

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:04:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:50:21)

Message:

usbhost: refactoring

This commit moves interrupt, status and schedule to bus
operations. Then the purpose of hcd_t is better defined, and split into
hc_driver_t and hc_device_t. hc_driver_t is used to wrap driver
implementation by the library (similar to how usb_driver_t is used to
wrap usb device drivers). hc_device_t is used as a parent for hc_t
inside drivers, and is allocated inside the DDF device node.

To support these changes, some local identifiers were renamed, some
functions were moved and/or renamed and their arguments changed. The
most notable one being hcd_send_batch → bus_device_send_batch.

File:

• uspace/drv/bus/usb/vhc/main.c (modified) (2 diffs)

uspace/drv/bus/usb/vhc/main.c

@@ -69 +69 @@
                 return ret;
         }
-        vhc_init(vhc, dev_to_hcd(dev));
         return EOK;
 }
 
-hcd_ops_t vhc_hc_ops = {
-        .schedule = vhc_schedule,
-};
-
 static int vhc_dev_add(ddf_dev_t *dev)
 {
+        /* Initialize generic structures */
+        int ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
+        if (ret != EOK) {
+                usb_log_error("Failed to init HCD structures: %s.\n",
+                   str_error(ret));
+                return ret;
+        }
+        vhc_data_t *vhc = ddf_dev_data_get(dev);
+        vhc_init(vhc);
+
+        hc_device_setup(&vhc->base, (bus_t *) &vhc->bus);
+
         /* Initialize virtual structure */
         ddf_fun_t *ctl_fun = NULL;
-        int ret = vhc_control_node(dev, &ctl_fun);
+        ret = vhc_control_node(dev, &ctl_fun);
         if (ret != EOK) {
                 usb_log_error("Failed to setup control node.\n");
                 return ret;
         }
-        vhc_data_t *data = ddf_fun_data_get(ctl_fun);
-
-        /* Initialize generic structures */
-        ret = hcd_ddf_setup_hc(dev);
-        if (ret != EOK) {
-                usb_log_error("Failed to init HCD structures: %s.\n",
-                   str_error(ret));
-                ddf_fun_destroy(ctl_fun);
-                return ret;
-        }
-
-        hcd_set_implementation(dev_to_hcd(dev), data, &vhc_hc_ops, &data->bus.base);
 
         /* Add virtual hub device */
-        ret = vhc_virtdev_plug_hub(data, &data->hub, NULL, 0);
+        ret = vhc_virtdev_plug_hub(vhc, &vhc->hub, NULL, 0);
         if (ret != EOK) {
                 usb_log_error("Failed to plug root hub: %s.\n", str_error(ret));
@@ -111 +106 @@
          * needs to be ready at this time.
          */
-        ret = hcd_setup_virtual_root_hub(dev_to_hcd(dev), dev);
+        ret = hcd_setup_virtual_root_hub(&vhc->base);
         if (ret != EOK) {
                 usb_log_error("Failed to init VHC root hub: %s\n",