Changes in uspace/drv/bus/usb/ehci/main.c [d930980:58563585] in mainline

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (4 diffs)

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

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbehci
  * @{
@@ -38 +39 @@
 #include <device/hw_res.h>
 #include <errno.h>
-#include <stdbool.h>
 #include <str_error.h>
+#include <io/logctl.h>
 
 #include <usb_iface.h>
-#include <usb/ddfiface.h>
 #include <usb/debug.h>
-#include <usb/host/hcd.h>
+#include <usb/host/ddf_helpers.h>
 
 #include "res.h"
+#include "hc.h"
+#include "ehci_endpoint.h"
 
 #define NAME "ehci"
 
-static int ehci_dev_add(ddf_dev_t *device);
+static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static void ehci_driver_fini(hcd_t *);
 
-static driver_ops_t ehci_driver_ops = {
-        .dev_add = ehci_dev_add,
+static const ddf_hc_driver_t ehci_hc_driver = {
+        .claim = disable_legacy,
+        .hc_speed = USB_SPEED_HIGH,
+        .irq_code_gen = ehci_hc_gen_irq_code,
+        .init = ehci_driver_init,
+        .fini = ehci_driver_fini,
+        .name = "EHCI-PCI",
+        .ops = {
+                .schedule       = ehci_hc_schedule,
+                .ep_add_hook    = ehci_endpoint_init,
+                .ep_remove_hook = ehci_endpoint_fini,
+                .irq_hook       = ehci_hc_interrupt,
+                .status_hook    = ehci_hc_status,
+        }
 };
 
-static driver_t ehci_driver = {
-        .name = NAME,
-        .driver_ops = &ehci_driver_ops
-};
-static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
-};
 
+static int ehci_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 int ret = hc_init(instance, res, irq);
+        if (ret == EOK) {
+                hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
+        return ret;
+}
+
+static void ehci_driver_fini(hcd_t *hcd)
+{
+        assert(hcd);
+        hc_t *hc = hcd_get_driver_data(hcd);
+        if (hc)
+                hc_fini(hc);
+
+        free(hc);
+        hcd_set_implementation(hcd, NULL, NULL);
+}
 
 /** Initializes a new ddf driver instance of EHCI hcd.
@@ -72 +109 @@
 static int ehci_dev_add(ddf_dev_t *device)
 {
-        ddf_fun_t *hc_fun = NULL;
-        bool fun_bound = false;
-
+        usb_log_debug("ehci_dev_add() called\n");
         assert(device);
 
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
-        int irq = 0;
+        return hcd_ddf_add_hc(device, &ehci_hc_driver);
 
-        int rc = get_my_registers(device, &reg_base, &reg_size, &irq);
-        if (rc != EOK) {
-                usb_log_error("Failed to get memory addresses for %" PRIun
-                    ": %s.\n", ddf_dev_get_handle(device), str_error(rc));
-                goto error;
-        }
+}
 
-        usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
-            reg_base, reg_size, irq);
 
-        rc = disable_legacy(device, reg_base, reg_size);
-        if (rc != EOK) {
-                usb_log_error("Failed to disable legacy USB: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
+static const driver_ops_t ehci_driver_ops = {
+        .dev_add = ehci_dev_add,
+};
 
-        hc_fun = ddf_fun_create(device, fun_exposed, "ehci_hc");
-        if (hc_fun == NULL) {
-                usb_log_error("Failed to create EHCI function.\n");
-                rc = ENOMEM;
-                goto error;
-        }
+static const driver_t ehci_driver = {
+        .name = NAME,
+        .driver_ops = &ehci_driver_ops
+};
 
-        hcd_t *ehci_hc = ddf_fun_data_alloc(hc_fun, sizeof(hcd_t));
-        if (ehci_hc == NULL) {
-                usb_log_error("Failed to alloc generic HC driver.\n");
-                rc = ENOMEM;
-                goto error;
-        }
-
-        /* High Speed, no bandwidth */
-        hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL);
-        ddf_fun_set_ops(hc_fun,  &hc_ops);
-
-        rc = ddf_fun_bind(hc_fun);
-        if (rc != EOK) {
-                usb_log_error("Failed to bind EHCI function: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        fun_bound = true;
-
-        rc = ddf_fun_add_to_category(hc_fun, USB_HC_CATEGORY);
-        if (rc != EOK) {
-                usb_log_error("Failed to add EHCI to HC class: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",
-            ddf_dev_get_name(device), ddf_dev_get_handle(device));
-
-        return EOK;
-error:
-        if (fun_bound)
-                ddf_fun_unbind(hc_fun);
-        if (hc_fun != NULL)
-                ddf_fun_destroy(hc_fun);
-        return rc;
-}
 
 /** Initializes global driver structures (NONE).
@@ -155 +138 @@
 {
         log_init(NAME);
+        logctl_set_log_level(NAME, LVL_NOTE);
         return ddf_driver_main(&ehci_driver);
 }
+
 /**
  * @}