Changes in uspace/drv/bus/usb/ehci/hc.c [8d2dd7f2:a5b3de6] in mainline

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (12 diffs)

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

@@ -89 +89 @@
 };
 
-static void hc_start(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
 
@@ -98 +97 @@
  * @return Error code.
  */
-int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int ehci_hc_gen_irq_code(irq_code_t *code, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
         assert(hw_res);
+
+        hc_t *instance = hcd_get_driver_data(hcd);
 
         if (hw_res->irqs.count != 1 || hw_res->mem_ranges.count != 1)
@@ -128 +129 @@
 
         memcpy(code->cmds, ehci_irq_commands, sizeof(ehci_irq_commands));
-        ehci_caps_regs_t *caps = NULL;
-
-        int ret = pio_enable_range(&regs, (void**)&caps);
-        if (ret != EOK) {
-                free(code->ranges);
-                free(code->cmds);
-                return ret;
-        }
 
         ehci_regs_t *registers =
-            (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(caps->caplength));
+                (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(instance->caps->caplength));
         code->cmds[0].addr = (void *) &registers->usbsts;
         code->cmds[3].addr = (void *) &registers->usbsts;
@@ -156 +149 @@
  * @return Error code
  */
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
+int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res)
 {
         assert(instance);
@@ -172 +165 @@
                 return ret;
         }
+
         usb_log_info("HC(%p): Device registers at %"PRIx64" (%zuB) accessible.",
             instance, hw_res->mem_ranges.ranges[0].address.absolute,
@@ -195 +189 @@
         ehci_rh_init(
             &instance->rh, instance->caps, instance->registers, "ehci rh");
-        usb_log_debug("HC(%p): Starting HW.", instance);
-        hc_start(instance);
-
+
+        ehci_bus_init(&instance->bus, instance);
         return EOK;
 }
@@ -222 +215 @@
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
         usb_log_debug("HC(%p) enqueue EP(%d:%d:%s:%s)\n", instance,
-            ep->address, ep->endpoint,
+            ep->device->address, ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -246 +239 @@
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
         usb_log_debug("HC(%p) dequeue EP(%d:%d:%s:%s)\n", instance,
-            ep->address, ep->endpoint,
+            ep->device->address, ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -298 +291 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == ehci_rh_get_address(&instance->rh)) {
+        if (batch->target.address == ehci_rh_get_address(&instance->rh)) {
                 usb_log_debug("HC(%p): Scheduling BATCH(%p) for RH(%p)",
                     instance, batch, &instance->rh);
                 return ehci_rh_schedule(&instance->rh, batch);
         }
+
         ehci_transfer_batch_t *ehci_batch = ehci_transfer_batch_get(batch);
-        if (!ehci_batch)
-                return ENOMEM;
+
+        const int err = ehci_transfer_batch_prepare(ehci_batch);
+        if (err)
+                return err;
 
         fibril_mutex_lock(&instance->guard);
@@ -350 +346 @@
                             ehci_transfer_batch_from_link(current);
 
-                        if (ehci_transfer_batch_is_complete(batch)) {
+                        if (ehci_transfer_batch_check_completed(batch)) {
                                 list_remove(current);
-                                ehci_transfer_batch_finish_dispose(batch);
+                                usb_transfer_batch_finish(&batch->base);
                         }
                 }
@@ -368 +364 @@
  * @param[in] instance EHCI hc driver structure.
  */
-void hc_start(hc_t *instance)
-{
-        assert(instance);
+int hc_start(hc_t *instance, bool interrupts)
+{
+        assert(instance);
+        usb_log_debug("HC(%p): Starting HW.", instance);
+
         /* Turn off the HC if it's running, Reseting a running device is
          * undefined */
@@ -435 +433 @@
         EHCI_WR(instance->registers->usbsts, EHCI_RD(instance->registers->usbsts));
         EHCI_WR(instance->registers->usbintr, EHCI_USED_INTERRUPTS);
+
+        return EOK;
 }