Changes in uspace/drv/bus/usb/uhci/hc.c [8d2dd7f2:17873ac7] in mainline

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (9 diffs)

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

@@ -50 +50 @@
 #include <usb/usb.h>
 #include <usb/host/utils/malloc32.h>
+#include <usb/host/bandwidth.h>
 
 #include "uhci_batch.h"
@@ -106 +107 @@
  * @return Error code.
  */
-int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int uhci_hc_gen_irq_code(irq_code_t *code, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -176 +177 @@
                         uhci_transfer_batch_t *batch =
                             uhci_transfer_batch_from_link(current);
-                        uhci_transfer_batch_finish_dispose(batch);
+                        usb_transfer_batch_finish(&batch->base);
                 }
         }
@@ -214 +215 @@
  * interrupt fibrils.
  */
-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);
@@ -222 +223 @@
             return EINVAL;
 
-        instance->hw_interrupts = interrupts;
         instance->hw_failures = 0;
 
@@ -246 +246 @@
         }
 
+        return EOK;
+}
+
+void hc_start(hc_t *instance)
+{
         hc_init_hw(instance);
         (void)hc_debug_checker;
 
         uhci_rh_init(&instance->rh, instance->registers->ports, "uhci");
-
-        return EOK;
 }
 
@@ -306 +309 @@
 }
 
+static usb_transfer_batch_t *create_transfer_batch(bus_t *bus, endpoint_t *ep)
+{
+        uhci_transfer_batch_t *batch = uhci_transfer_batch_create(ep);
+        return &batch->base;
+}
+
+static void destroy_transfer_batch(usb_transfer_batch_t *batch)
+{
+        uhci_transfer_batch_destroy(uhci_transfer_batch_get(batch));
+}
+
 /** Initialize UHCI hc memory structures.
  *
@@ -318 +332 @@
 int hc_init_mem_structures(hc_t *instance)
 {
-        assert(instance);
+        int err;
+        assert(instance);
+
+        if ((err = usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11)))
+                return err;
+
+        instance->bus.base.ops.create_batch = create_transfer_batch;
+        instance->bus.base.ops.destroy_batch = destroy_transfer_batch;
 
         /* Init USB frame list page */
@@ -440 +461 @@
         assert(batch);
 
-        if (batch->ep->address == uhci_rh_get_address(&instance->rh))
+        if (batch->target.address == uhci_rh_get_address(&instance->rh))
                 return uhci_rh_schedule(&instance->rh, batch);
 
-        uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
+        uhci_transfer_batch_t *uhci_batch = (uhci_transfer_batch_t *) batch;
         if (!uhci_batch) {
                 usb_log_error("Failed to create UHCI transfer structures.\n");
                 return ENOMEM;
         }
+
+        const int err = uhci_transfer_batch_prepare(uhci_batch);
+        if (err)
+                return err;
 
         transfer_list_t *list =