Changes in uspace/drv/bus/usb/uhci/main.c [366e9b6:53a309e] in mainline

File:

• uspace/drv/bus/usb/uhci/main.c (modified) (6 diffs)

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

@@ -36 +36 @@
 #include <assert.h>
 #include <ddf/driver.h>
-#include <devman.h>
 #include <errno.h>
 #include <io/log.h>
@@ -50 +49 @@
 #define NAME "uhci"
 
-static int uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *);
-static int uhci_driver_start(hcd_t *, bool);
+static int uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void uhci_driver_fini(hcd_t *);
-static int disable_legacy(hcd_t *, ddf_dev_t *);
+static int disable_legacy(ddf_dev_t *);
 
 static const ddf_hc_driver_t uhci_hc_driver = {
         .claim = disable_legacy,
+        .hc_speed = USB_SPEED_FULL,
         .irq_code_gen = uhci_hc_gen_irq_code,
         .init = uhci_driver_init,
-        .start = uhci_driver_start,
-        .setup_root_hub = hcd_setup_virtual_root_hub,
         .fini = uhci_driver_fini,
         .name = "UHCI",
@@ -70 +67 @@
 };
 
-static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
+static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
 {
-        int err;
-
         assert(hcd);
         assert(hcd_get_driver_data(hcd) == NULL);
@@ -81 +76 @@
                 return ENOMEM;
 
-        if ((err = hc_init(instance, res)) != EOK)
-                goto err;
-
-        hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops, &instance->bus.base);
-
-        return EOK;
-
-err:
-        free(instance);
-        return err;
-}
-
-static int uhci_driver_start(hcd_t *hcd, bool interrupts)
-{
-        assert(hcd);
-        hc_t *hc = hcd_get_driver_data(hcd);
-
-        hc->hw_interrupts = interrupts;
-        hc_start(hc);
-        return EOK;
+        const int ret = hc_init(instance, res, irq);
+        if (ret == EOK) {
+                hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
+        return ret;
 }
 
@@ -110 +92 @@
                 hc_fini(hc);
 
-        hcd_set_implementation(hcd, NULL, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL);
         free(hc);
 }
@@ -119 +101 @@
  * @return Error code.
  */
-static int disable_legacy(hcd_t *hcd, ddf_dev_t *device)
+static int disable_legacy(ddf_dev_t *device)
 {
         assert(device);
 
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;
 
         /* See UHCI design guide page 45 for these values.
          * Write all WC bits in USB legacy register */
-        const int rc = pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
-
-        async_hangup(parent_sess);
-        return rc;
+        return pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 }