Changes in uspace/drv/bus/usb/ohci/ohci.c [e991937:7de1988c] in mainline

File:

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

uspace/drv/bus/usb/ohci/ohci.c

@@ -34 +34 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <errno.h>
 #include <str_error.h>
 #include <ddf/interrupt.h>
+#include <usb_iface.h>
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
 #include <usb/debug.h>
-
-#include <usb/host/ddf_helpers.h>
 
 #include "ohci.h"
@@ -46 +49 @@
 #include "hc.h"
 
-
-
+typedef struct ohci {
+        ddf_fun_t *hc_fun;
+        ddf_fun_t *rh_fun;
+
+        hc_t hc;
+} ohci_t;
+
+static inline ohci_t *dev_to_ohci(ddf_dev_t *dev)
+{
+        return ddf_dev_data_get(dev);
+}
 /** IRQ handling callback, identifies device
  *
@@ -57 +69 @@
 {
         assert(dev);
-        hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->private_data) {
+
+        ohci_t *ohci = dev_to_ohci(dev);
+        if (!ohci) {
                 usb_log_warning("Interrupt on device that is not ready.\n");
                 return;
         }
-
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hcd->private_data, status);
-}
+        hc_interrupt(&ohci->hc, status);
+}
+
+/** Get USB address assigned to root hub.
+ *
+ * @param[in] fun Root hub function.
+ * @param[out] address Store the address here.
+ * @return Error code.
+ */
+static int rh_get_my_address(ddf_fun_t *fun, usb_address_t *address)
+{
+        assert(fun);
+
+        if (address != NULL) {
+                *address = dev_to_ohci(ddf_fun_get_dev(fun))->hc.rh.address;
+        }
+
+        return EOK;
+}
+
+/** Gets handle of the respective hc (this device, hc function).
+ *
+ * @param[in] root_hub_fun Root hub function seeking hc handle.
+ * @param[out] handle Place to write the handle.
+ * @return Error code.
+ */
+static int rh_get_hc_handle(
+    ddf_fun_t *fun, devman_handle_t *handle)
+{
+        assert(fun);
+        ddf_fun_t *hc_fun = dev_to_ohci(ddf_fun_get_dev(fun))->hc_fun;
+        assert(hc_fun);
+
+        if (handle != NULL)
+                *handle = ddf_fun_get_handle(hc_fun);
+        return EOK;
+}
+
+/** Root hub USB interface */
+static usb_iface_t usb_iface = {
+        .get_hc_handle = rh_get_hc_handle,
+        .get_my_address = rh_get_my_address,
+};
+
+/** Standard USB HC options (HC interface) */
+static ddf_dev_ops_t hc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
+};
+
+/** Standard USB RH options (RH interface) */
+static ddf_dev_ops_t rh_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface,
+};
 
 /** Initialize hc and rh ddf structures and their respective drivers.
@@ -80 +143 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-}
-
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        bool ih_registered = false;
+        bool hc_inited = false;
+        int rc;
+
+        if (device == NULL)
+                return EBADMEM;
+
+        ohci_t *instance = ddf_dev_data_alloc(device,sizeof(ohci_t));
+        if (instance == NULL) {
+                usb_log_error("Failed to allocate OHCI driver.\n");
+                return ENOMEM;
+        }
+
+        instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci_hc");
+        if (instance->hc_fun == NULL) {
+                usb_log_error("Failed to create OHCI HC function: %s.\n",
+                    str_error(ENOMEM));
+                rc = ENOMEM;
+                goto error;
+        }
+
+        ddf_fun_set_ops(instance->hc_fun, &hc_ops);
+        ddf_fun_data_implant(instance->hc_fun, &instance->hc);
+
+        instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci_rh");
+        if (instance->rh_fun == NULL) {
+                usb_log_error("Failed to create OHCI RH function: %s.\n",
+                    str_error(ENOMEM));
+                rc = ENOMEM;
+                goto error;
+        }
+
+        ddf_fun_set_ops(instance->rh_fun, &rh_ops);
+
+        addr_range_t regs;
         int irq = 0;
 
-        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
-        CHECK_RET_RETURN(ret, "Failed to get register memory addresses for %"
-            PRIun ": %s.\n", ddf_dev_get_handle(device), str_error(ret));
+        rc = get_my_registers(device, &regs, &irq);
+        if (rc != EOK) {
+                usb_log_error("Failed to get register memory addresses "
+                    "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
+                    str_error(rc));
+                goto error;
+        }
 
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            (void *) reg_base, reg_size, irq);
-
-        const size_t ranges_count = hc_irq_pio_range_count();
-        const size_t cmds_count = hc_irq_cmd_count();
-        irq_pio_range_t irq_ranges[ranges_count];
-        irq_cmd_t irq_cmds[cmds_count];
-        irq_code_t irq_code = {
-                .rangecount = ranges_count,
-                .ranges = irq_ranges,
-                .cmdcount = cmds_count,
-                .cmds = irq_cmds
-        };
-
-        ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
-        CHECK_RET_RETURN(ret, "Failed to gen IRQ code: %s.\n", str_error(ret));
-
-        /* Register handler to avoid interrupt lockup */
-        ret = register_interrupt_handler(device, irq, irq_handler, &irq_code);
-        CHECK_RET_RETURN(ret,
-            "Failed to register irq handler: %s.\n", str_error(ret));
+            RNGABSPTR(regs), RNGSZ(regs), irq);
+
+        rc = hc_register_irq_handler(device, &regs, irq, irq_handler);
+        if (rc != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        ih_registered = true;
 
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = enable_interrupts(device);
-        if (ret != EOK) {
+        rc = enable_interrupts(device);
+        if (rc != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling\n", str_error(ret));
+                    " Falling back to polling\n", str_error(rc));
                 /* We don't need that handler */
                 unregister_interrupt_handler(device, irq);
+                ih_registered = false;
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
@@ -130 +214 @@
         }
 
-        /* Initialize generic HCD driver */
-        ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        if (ret != EOK) {
+        rc = hc_init(&instance->hc, &regs, interrupts);
+        if (rc != EOK) {
+                usb_log_error("Failed to init ohci_hcd: %s.\n", str_error(rc));
+                goto error;
+        }
+
+        hc_inited = true;
+
+        rc = ddf_fun_bind(instance->hc_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind OHCI device function: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);
+        if (rc != EOK) {
+                usb_log_error("Failed to add OHCI to HC category: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = hc_register_hub(&instance->hc, instance->rh_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to register OHCI root hub: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        return EOK;
+
+error:
+        if (hc_inited)
+                hc_fini(&instance->hc);
+        if (ih_registered)
                 unregister_interrupt_handler(device, irq);
-                return ret;
-        }
-
-// TODO: Undo hcd_setup_device
-#define CHECK_RET_CLEAN_RETURN(ret, message...) \
-if (ret != EOK) { \
-        unregister_interrupt_handler(device, irq); \
-        CHECK_RET_RETURN(ret, message); \
-} else (void)0
-
-        hc_t *hc_impl = malloc(sizeof(hc_t));
-        ret = hc_impl ? EOK : ENOMEM;
-        CHECK_RET_CLEAN_RETURN(ret, "Failed to allocate driver structure.\n");
-
-        /* Initialize OHCI HC */
-        ret = hc_init(hc_impl, reg_base, reg_size, interrupts);
-        CHECK_RET_CLEAN_RETURN(ret, "Failed to init hc: %s.\n", str_error(ret));
-
-        /* Connect OHCI to generic HCD */
-        hcd_set_implementation(dev_to_hcd(device), hc_impl,
-            hc_schedule, ohci_endpoint_init, ohci_endpoint_fini);
-
-        /* HC should be running OK. We can add root hub */
-        ret = hcd_ddf_setup_root_hub(device);
-        CHECK_RET_CLEAN_RETURN(ret,
-            "Failed to register OHCI root hub: %s.\n", str_error(ret));
-
-        return ret;
+        if (instance->hc_fun != NULL)
+                ddf_fun_destroy(instance->hc_fun);
+        if (instance->rh_fun != NULL)
+                ddf_fun_destroy(instance->rh_fun);
+        return rc;
 }
 /**