Changes in uspace/drv/bus/usb/uhci/main.c [5a6cc679:b7fd2a0] in mainline

File:

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

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

@@ -43 +43 @@
 #include <str_error.h>
 #include <usb/debug.h>
-#include <usb/host/utility.h>
+#include <usb/host/ddf_helpers.h>
 
 #include "hc.h"
@@ -49 +49 @@
 #define NAME "uhci"
 
-static errno_t disable_legacy(hc_device_t *);
+static errno_t uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static void uhci_driver_fini(hcd_t *);
+static errno_t disable_legacy(ddf_dev_t *);
 
-static const hc_driver_t uhci_driver = {
-        .name = NAME,
-        .hc_device_size = sizeof(hc_t),
-        .claim = disable_legacy,
-        .irq_code_gen = hc_gen_irq_code,
-        .hc_add = hc_add,
-        .start = hc_start,
-        .setup_root_hub = hc_setup_roothub,
-        .hc_gone = hc_gone,
+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,
+        .fini = uhci_driver_fini,
+        .name = "UHCI",
+        .ops = {
+                .schedule    = uhci_hc_schedule,
+                .irq_hook    = uhci_hc_interrupt,
+                .status_hook = uhci_hc_status,
+        },
 };
+
+static errno_t uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+{
+        assert(hcd);
+        assert(hcd_get_driver_data(hcd) == NULL);
+
+        hc_t *instance = malloc(sizeof(hc_t));
+        if (!instance)
+                return ENOMEM;
+
+        const errno_t ret = hc_init(instance, res, irq);
+        if (ret == EOK) {
+                hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
+        return ret;
+}
+
+static void uhci_driver_fini(hcd_t *hcd)
+{
+        assert(hcd);
+        hc_t *hc = hcd_get_driver_data(hcd);
+        if (hc)
+                hc_fini(hc);
+
+        hcd_set_implementation(hcd, NULL, NULL);
+        free(hc);
+}
 
 /** Call the PCI driver with a request to clear legacy support register
@@ -67 +101 @@
  * @return Error code.
  */
-static errno_t disable_legacy(hc_device_t *hcd)
+static errno_t disable_legacy(ddf_dev_t *device)
 {
-        assert(hcd);
+        assert(device);
 
-        async_sess_t *parent_sess = ddf_dev_parent_sess_get(hcd->ddf_dev);
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
         if (parent_sess == NULL)
                 return ENOMEM;
@@ -79 +113 @@
         return pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 }
+
+/** Initialize a new ddf driver instance for uhci hc and hub.
+ *
+ * @param[in] device DDF instance of the device to initialize.
+ * @return Error code.
+ */
+static errno_t uhci_dev_add(ddf_dev_t *device)
+{
+        usb_log_debug2("uhci_dev_add() called\n");
+        assert(device);
+        return hcd_ddf_add_hc(device, &uhci_hc_driver);
+}
+
+static const driver_ops_t uhci_driver_ops = {
+        .dev_add = uhci_dev_add,
+};
+
+static const driver_t uhci_driver = {
+        .name = NAME,
+        .driver_ops = &uhci_driver_ops
+};
+
 
 /** Initialize global driver structures (NONE).
@@ -93 +149 @@
         log_init(NAME);
         logctl_set_log_level(NAME, LVL_NOTE);
-        return hc_driver_main(&uhci_driver);
+        return ddf_driver_main(&uhci_driver);
 }
 /**