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

File:

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

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

@@ -47 +47 @@
 #include <usb/usb.h>
 
-#include "ohci_endpoint.h"
+#include "ohci_bus.h"
 #include "ohci_batch.h"
 
@@ -89 +89 @@
 };
 
-static void hc_gain_control(hc_t *instance);
-static void hc_start(hc_t *instance);
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
@@ -103 +101 @@
  * @return Error code.
  */
-int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int ohci_hc_gen_irq_code(irq_code_t *code, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -151 +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 +170 @@
         list_initialize(&instance->pending_batches);
         fibril_mutex_initialize(&instance->guard);
-        instance->hw_interrupts = interrupts;
 
         ret = hc_init_memory(instance);
@@ -181 +178 @@
                 return ret;
         }
-
-        hc_gain_control(instance);
-
-        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
-        hc_start(instance);
 
         return EOK;
@@ -295 +287 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == ohci_rh_get_address(&instance->rh)) {
+        if (batch->target.address == ohci_rh_get_address(&instance->rh)) {
                 usb_log_debug("OHCI root hub request.\n");
                 return ohci_rh_schedule(&instance->rh, batch);
@@ -302 +294 @@
         if (!ohci_batch)
                 return ENOMEM;
+
+        const int err = ohci_transfer_batch_prepare(ohci_batch);
+        if (err)
+                return err;
 
         fibril_mutex_lock(&instance->guard);
@@ -354 +350 @@
                             ohci_transfer_batch_from_link(current);
 
-                        if (ohci_transfer_batch_is_complete(batch)) {
+                        if (ohci_transfer_batch_check_completed(batch)) {
                                 list_remove(current);
-                                ohci_transfer_batch_finish_dispose(batch);
+                                usb_transfer_batch_finish(&batch->base);
                         }
 
@@ -443 +439 @@
 void hc_start(hc_t *instance)
 {
+        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
+
         /* OHCI guide page 42 */
         assert(instance);