Changes in uspace/drv/bus/usb/ohci/hc.c [f83666c:6340a6ff] in mainline

File:

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

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

@@ -35 +35 @@
 
 #include <errno.h>
-#include <stdbool.h>
 #include <str_error.h>
 #include <adt/list.h>
@@ -42 +41 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
-#include <usb/ddfiface.h>
 
 #include "hc.h"
@@ -84 +82 @@
 };
 
-enum {
-        /** Number of PIO ranges used in IRQ code */
-        hc_irq_pio_range_count = 
-            sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t),
-
-        /** Number of commands used in IRQ code */
-        hc_irq_cmd_count =
-            sizeof(ohci_irq_commands) / sizeof(irq_cmd_t)
-};
-
 static void hc_gain_control(hc_t *instance);
 static void hc_start(hc_t *instance);
@@ -99 +87 @@
 static int hc_init_memory(hc_t *instance);
 static int interrupt_emulator(hc_t *instance);
-static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+
+/** Get number of PIO ranges used in IRQ code.
+ * @return Number of ranges.
+ */
+size_t hc_irq_pio_range_count(void)
+{
+        return sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t);
+}
+
+/** Get number of commands used in IRQ code.
+ * @return Number of commands.
+ */
+size_t hc_irq_cmd_count(void)
+{
+        return sizeof(ohci_irq_commands) / sizeof(irq_cmd_t);
+}
 
 /** Generate IRQ code.
@@ -132 +135 @@
 }
 
-/** Register interrupt handler.
- *
- * @param[in] device Host controller DDF device
- * @param[in] reg_base Register range base
- * @param[in] reg_size Register range size
- * @param[in] irq Interrupt number
- * @paran[in] handler Interrupt handler
- *
- * @return EOK on success or negative error code
- */
-int hc_register_irq_handler(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size,
-    int irq, interrupt_handler_t handler)
-{
-        int rc;
-
-        irq_pio_range_t irq_ranges[hc_irq_pio_range_count];
-        irq_cmd_t irq_cmds[hc_irq_cmd_count];
-
-        irq_code_t irq_code = {
-                .rangecount = hc_irq_pio_range_count,
-                .ranges = irq_ranges,
-                .cmdcount = hc_irq_cmd_count,
-                .cmds = irq_cmds
-        };
-
-        rc = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
-        if (rc != EOK) {
-                usb_log_error("Failed to generate IRQ code: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        /* Register handler to avoid interrupt lockup */
-        rc = register_interrupt_handler(device, irq, handler, &irq_code);
-        if (rc != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        return EOK;
-}
-
-/** Announce OHCI root hub to the DDF
- *
- * @param[in] instance OHCI driver intance
- * @param[in] hub_fun DDF fuction representing OHCI root hub
- * @return Error code
- */
-int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
-{
-        bool addr_reqd = false;
-        bool ep_added = false;
-        bool fun_bound = false;
-        int rc;
-
-        assert(instance);
-        assert(hub_fun);
-
-        /* Try to get address 1 for root hub. */
-        instance->rh.address = 1;
-        rc = usb_device_manager_request_address(
-            &instance->generic.dev_manager, &instance->rh.address, false,
-            USB_SPEED_FULL);
-        if (rc != EOK) {
-                usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        addr_reqd = true;
-
-        rc = usb_endpoint_manager_add_ep(
-            &instance->generic.ep_manager, instance->rh.address, 0,
-            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
-            0, NULL, NULL);
-        if (rc != EOK) {
-                usb_log_error("Failed to register root hub control endpoint: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        ep_added = true;
-
-        rc = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
-        if (rc != EOK) {
-                usb_log_error("Failed to add root hub match-id: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        rc = ddf_fun_bind(hub_fun);
-        if (rc != EOK) {
-                usb_log_error("Failed to bind root hub function: %s.\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        fun_bound = true;
-
-        rc = usb_device_manager_bind_address(&instance->generic.dev_manager,
-            instance->rh.address, ddf_fun_get_handle(hub_fun));
-        if (rc != EOK) {
-                usb_log_warning("Failed to bind root hub address: %s.\n",
-                    str_error(rc));
-        }
-
-        return EOK;
-error:
-        if (fun_bound)
-                ddf_fun_unbind(hub_fun);
-        if (ep_added) {
-                usb_endpoint_manager_remove_ep(
-                    &instance->generic.ep_manager, instance->rh.address, 0,
-                    USB_DIRECTION_BOTH, NULL, NULL);
-        }
-        if (addr_reqd) {
-                usb_device_manager_release_address(
-                    &instance->generic.dev_manager, instance->rh.address);
-        }
-        return rc;
-}
-
 /** Initialize OHCI hc driver structure
  *
@@ -268 +147 @@
         assert(instance);
 
-        int rc =
+        int ret =
             pio_enable((void*)regs, reg_size, (void**)&instance->registers);
-        if (rc != EOK) {
-                usb_log_error("Failed to gain access to device registers: %s.\n",
-                    str_error(rc));
-                return rc;
+        if (ret != EOK) {
+                usb_log_error("Failed to enable access to device regss: %s.\n",
+                    str_error(ret));
+                return ret;
         }
 
         list_initialize(&instance->pending_batches);
-
-        hcd_init(&instance->generic, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        instance->generic.private_data = instance;
-        instance->generic.schedule = hc_schedule;
-        instance->generic.ep_add_hook = ohci_endpoint_init;
-        instance->generic.ep_remove_hook = ohci_endpoint_fini;
-
-        rc = hc_init_memory(instance);
-        if (rc != EOK) {
+        fibril_mutex_initialize(&instance->guard);
+
+        ret = hc_init_memory(instance);
+        if (ret != EOK) {
                 usb_log_error("Failed to create OHCI memory structures: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        fibril_mutex_initialize(&instance->guard);
+                    str_error(ret));
+                return ret;
+        }
 
         hc_gain_control(instance);
@@ -302 +173 @@
         }
 
-        rh_init(&instance->rh, instance->registers);
+        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
         hc_start(instance);
 
@@ -389 +260 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == instance->rh.address) {
+        if (batch->ep->address == ohci_rh_get_address(&instance->rh)) {
                 usb_log_debug("OHCI root hub request.\n");
-                rh_request(&instance->rh, batch);
-                return EOK;
+                return ohci_rh_schedule(&instance->rh, batch);
         }
         ohci_transfer_batch_t *ohci_batch = ohci_transfer_batch_get(batch);
@@ -431 +301 @@
         usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
         if (status & I_RHSC)
-                rh_interrupt(&instance->rh);
+                ohci_rh_interrupt(&instance->rh);
 
         if (status & I_WDH) {
@@ -629 +499 @@
 do { \
         const char *name = usb_str_transfer_type(type); \
-        int ret = endpoint_list_init(&instance->lists[type], name); \
+        const int ret = endpoint_list_init(&instance->lists[type], name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s endpoint list: %s.\n", \