Changes in uspace/drv/bus/usb/ehci/main.c [7de1988c:6297465] in mainline

File:

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

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

@@ -33 +33 @@
  * Main routines of EHCI driver.
  */
-
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
 #include <device/hw_res.h>
 #include <errno.h>
-#include <stdbool.h>
 #include <str_error.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 "ehci.h"
 
 #define NAME "ehci"
@@ -60 +58 @@
         .driver_ops = &ehci_driver_ops
 };
-static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
-};
 
 
@@ -72 +67 @@
 static int ehci_dev_add(ddf_dev_t *device)
 {
-        ddf_fun_t *hc_fun = NULL;
-        bool fun_bound = false;
-
         assert(device);
-
-        addr_range_t reg_range;
-        int irq = 0;
-
-        int rc = get_my_registers(device, &reg_range, &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;
+        hw_res_list_parsed_t hw_res;
+        int ret = hcd_ddf_get_registers(device, &hw_res);
+        if (ret != EOK ||
+            hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
+                usb_log_error("Failed to get register memory addresses "
+                    "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
+                    str_error(ret));
+                return ret;
         }
+        addr_range_t regs = hw_res.mem_ranges.ranges[0];
+        const int irq = hw_res.irqs.irqs[0];
+        hw_res_list_parsed_clean(&hw_res);
 
         usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            RNGABSPTR(reg_range), RNGSZ(reg_range), irq);
+            RNGABSPTR(regs), RNGSZ(regs), irq);
 
-        rc = disable_legacy(device, &reg_range);
-        if (rc != EOK) {
+        ret = disable_legacy(device, &regs);
+        if (ret != EOK) {
                 usb_log_error("Failed to disable legacy USB: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        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;
-        }
-
-        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;
+                    str_error(ret));
+                return ret;
         }
 
         /* 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;
+        ret = device_setup_ehci(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to init ehci driver: %s\n",
+                    str_error(ret));
+                return ret;
         }
 
@@ -135 +103 @@
 
         return EOK;
-error:
-        if (fun_bound)
-                ddf_fun_unbind(hc_fun);
-        if (hc_fun != NULL)
-                ddf_fun_destroy(hc_fun);
-        return rc;
 }