Changes in uspace/drv/bus/usb/ohci/ohci_batch.c [0d4b110:9d58539] in mainline

File:

• uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (11 diffs)

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

@@ -32 +32 @@
  * @brief OHCI driver USB transaction structure
  */
-
-#include <assert.h>
 #include <errno.h>
+#include <str_error.h>
 #include <macros.h>
-#include <mem.h>
-#include <stdbool.h>
 
 #include <usb/usb.h>
@@ -47 +44 @@
 
 static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t);
-
+/*----------------------------------------------------------------------------*/
 /** Safely destructs ohci_transfer_batch_t structure
  *
@@ -70 +67 @@
         free(ohci_batch);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Finishes usb_transfer_batch and destroys the structure.
  *
@@ -83 +80 @@
         ohci_transfer_batch_dispose(ohci_batch);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Allocate memory and initialize internal data structure.
  *
@@ -161 +158 @@
 #undef CHECK_NULL_DISPOSE_RET
 }
-
+/*----------------------------------------------------------------------------*/
 /** Check batch TDs' status.
  *
@@ -202 +199 @@
                     ohci_batch->tds[i]->next, ohci_batch->tds[i]->be);
 
+                /* If the TD got all its data through, it will report 0 bytes
+                 * remain, the sole exception is INPUT with data rounding flag
+                 * (short), i.e. every INPUT. Nice thing is that short packets
+                 * will correctly report remaining data, thus making
+                 * this computation correct (short packets need to be produced
+                 * by the last TD)
+                 * NOTE: This also works for CONTROL transfer as
+                 * the first TD will return 0 remain.
+                 * NOTE: Short packets don't break the assumption that
+                 * we leave the very last(unused) TD behind.
+                 */
+                ohci_batch->usb_batch->transfered_size
+                    -= td_remain_size(ohci_batch->tds[i]);
+
                 ohci_batch->usb_batch->error = td_error(ohci_batch->tds[i]);
-                if (ohci_batch->usb_batch->error == EOK) {
-                        /* If the TD got all its data through, it will report
-                         * 0 bytes remain, the sole exception is INPUT with
-                         * data rounding flag (short), i.e. every INPUT.
-                         * Nice thing is that short packets will correctly
-                         * report remaining data, thus making this computation
-                         * correct (short packets need to be produced by the
-                         * last TD)
-                         * NOTE: This also works for CONTROL transfer as
-                         * the first TD will return 0 remain.
-                         * NOTE: Short packets don't break the assumption that
-                         * we leave the very last(unused) TD behind.
-                         */
-                        ohci_batch->usb_batch->transfered_size
-                            -= td_remain_size(ohci_batch->tds[i]);
-                } else {
+                if (ohci_batch->usb_batch->error != EOK) {
                         usb_log_debug("Batch %p found error TD(%zu):%08x.\n",
                             ohci_batch->usb_batch, i,
@@ -235 +231 @@
 
                         /* Check TD assumption */
-                        assert(ed_head_td(ohci_batch->ed) ==
-                            addr_to_phys(ohci_batch->tds[leave_td]));
-
-                        /* Set tail to the same TD */
+                        const uint32_t pa =
+                            addr_to_phys(ohci_batch->tds[leave_td]);
+                        assert((ohci_batch->ed->td_head & ED_TDHEAD_PTR_MASK)
+                            == pa);
+
                         ed_set_tail_td(ohci_batch->ed,
                             ohci_batch->tds[leave_td]);
 
                         /* Clear possible ED HALT */
-                        ed_clear_halt(ohci_batch->ed);
+                        ohci_batch->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
                         break;
                 }
@@ -256 +253 @@
 
         /* Make sure that we are leaving the right TD behind */
-        assert(addr_to_phys(ohci_ep->td) == ed_head_td(ohci_batch->ed));
-        assert(addr_to_phys(ohci_ep->td) == ed_tail_td(ohci_batch->ed));
+        const uint32_t pa = addr_to_phys(ohci_ep->td);
+        assert(pa == (ohci_batch->ed->td_head & ED_TDHEAD_PTR_MASK));
+        assert(pa == (ohci_batch->ed->td_tail & ED_TDTAIL_PTR_MASK));
 
         return true;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Starts execution of the TD list
  *
@@ -271 +269 @@
         ed_set_tail_td(ohci_batch->ed, ohci_batch->tds[ohci_batch->td_count]);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Prepare generic control transfer
  *
@@ -347 +345 @@
             USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
 }
-
+/*----------------------------------------------------------------------------*/
 /** Prepare generic data transfer
  *
@@ -394 +392 @@
             USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
 }
-
+/*----------------------------------------------------------------------------*/
 /** Transfer setup table. */
 static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t) =