Changes in uspace/drv/uhci-hcd/batch.c [a9f91cd:a7e2f0d] in mainline

File:

• uspace/drv/uhci-hcd/batch.c (modified) (8 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -40 +40 @@
 #include "batch.h"
 #include "transfer_list.h"
-#include "uhci_hc.h"
+#include "uhci.h"
 #include "utils/malloc32.h"
 
@@ -100 +100 @@
         bzero(instance, sizeof(batch_t));
 
-        instance->qh = malloc32(sizeof(qh_t));
+        instance->qh = malloc32(sizeof(queue_head_t));
         CHECK_NULL_DISPOSE_RETURN(instance->qh,
             "Failed to allocate batch queue head.\n");
-        qh_init(instance->qh);
+        queue_head_init(instance->qh);
 
         instance->packets = (size + max_packet_size - 1) / max_packet_size;
@@ -114 +114 @@
             instance->tds, "Failed to allocate transfer descriptors.\n");
         bzero(instance->tds, sizeof(td_t) * instance->packets);
+
+//      const size_t transport_size = max_packet_size * instance->packets;
 
         if (size > 0) {
@@ -141 +143 @@
         instance->speed = speed;
         instance->manager = manager;
-        instance->callback_out = func_out;
-        instance->callback_in = func_in;
-
-        qh_set_element_td(instance->qh, addr_to_phys(instance->tds));
+
+        if (func_out)
+                instance->callback_out = func_out;
+        if (func_in)
+                instance->callback_in = func_in;
+
+        queue_head_set_element_td(instance->qh, addr_to_phys(instance->tds));
 
         usb_log_debug("Batch(%p) %d:%d memory structures ready.\n",
@@ -172 +177 @@
                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
                             instance, i, instance->tds[i].status);
-                        td_print_status(&instance->tds[i]);
 
                         device_keeper_set_toggle(instance->manager,
@@ -314 +318 @@
                 ++packet;
         }
-        td_set_ioc(&instance->tds[packet - 1]);
         device_keeper_set_toggle(instance->manager, instance->target, toggle);
 }
@@ -366 +369 @@
             0, 1, false, low_speed, instance->target, status_stage, NULL, NULL);
 
-        td_set_ioc(&instance->tds[packet]);
+
+        instance->tds[packet].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
         usb_log_debug2("Control last TD status: %x.\n",
             instance->tds[packet].status);
@@ -450 +454 @@
 {
         assert(instance);
-        uhci_hc_t *hc = fun_to_uhci_hc(instance->fun);
+        uhci_t *hc = fun_to_uhci(instance->fun);
         assert(hc);
-        return uhci_hc_schedule(hc, instance);
+        return uhci_schedule(hc, instance);
 }
 /**