Changeset 7943c43 in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 
 #include <usb/usb.h>
@@ -53 +54 @@
                 return;
         if (ohci_batch->tds) {
+                const ohci_endpoint_t *ohci_ep =
+                    ohci_endpoint_get(ohci_batch->usb_batch->ep);
+                assert(ohci_ep);
                 for (unsigned i = 0; i < ohci_batch->td_count; ++i) {
-                        if (i != ohci_batch->leave_td)
+                        if (ohci_batch->tds[i] != ohci_ep->td)
                                 free32(ohci_batch->tds[i]);
                 }
@@ -64 +68 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Finishes usb_transfer_batch and destroys the structure.
+ *
+ * @param[in] uhci_batch Instance to finish and destroy.
+ */
 void ohci_transfer_batch_finish_dispose(ohci_transfer_batch_t *ohci_batch)
 {
@@ -69 +77 @@
         assert(ohci_batch->usb_batch);
         usb_transfer_batch_finish(ohci_batch->usb_batch,
-            ohci_batch->device_buffer + ohci_batch->usb_batch->setup_size,
-            ohci_batch->usb_batch->buffer_size);
+            ohci_batch->device_buffer + ohci_batch->usb_batch->setup_size);
         ohci_transfer_batch_dispose(ohci_batch);
 }
 /*----------------------------------------------------------------------------*/
+/** Allocate memory and initialize internal data structure.
+ *
+ * @param[in] usb_batch Pointer to generic USB batch structure.
+ * @return Valid pointer if all structures were successfully created,
+ * NULL otherwise.
+ *
+ * Determines the number of needed transfer descriptors (TDs).
+ * Prepares a transport buffer (that is accessible by the hardware).
+ * Initializes parameters needed for the transfer and callback.
+ */
 ohci_transfer_batch_t * ohci_transfer_batch_get(usb_transfer_batch_t *usb_batch)
 {
@@ -105 +122 @@
         ohci_batch->ed = ohci_endpoint_get(usb_batch->ep)->ed;
         ohci_batch->tds[0] = ohci_endpoint_get(usb_batch->ep)->td;
-        ohci_batch->leave_td = 0;
 
         for (unsigned i = 1; i <= ohci_batch->td_count; ++i) {
@@ -152 +168 @@
  * completes with the last TD.
  */
-bool ohci_transfer_batch_is_complete(ohci_transfer_batch_t *ohci_batch)
+bool ohci_transfer_batch_is_complete(const ohci_transfer_batch_t *ohci_batch)
 {
         assert(ohci_batch);
@@ -174 +190 @@
 
         /* Assume we will leave the last(unused) TD behind */
-        ohci_batch->leave_td = ohci_batch->td_count;
+        unsigned leave_td = ohci_batch->td_count;
 
         /* Check all TDs */
@@ -212 +228 @@
                          * It will be the one TD we leave behind.
                          */
-                        ohci_batch->leave_td = i + 1;
+                        leave_td = i + 1;
 
                         /* Check TD assumption */
-                        const uint32_t pa = addr_to_phys(
-                            ohci_batch->tds[ohci_batch->leave_td]);
-                        assert((ohci_batch->ed->td_head & ED_TDTAIL_PTR_MASK)
+                        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[ohci_batch->leave_td]);
+                            ohci_batch->tds[leave_td]);
 
                         /* Clear possible ED HALT */
@@ -234 +250 @@
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ohci_batch->usb_batch->ep);
         assert(ohci_ep);
-        ohci_ep->td = ohci_batch->tds[ohci_batch->leave_td];
+        ohci_ep->td = ohci_batch->tds[leave_td];
 
         /* Make sure that we are leaving the right TD behind */
@@ -248 +264 @@
  * @param[in] ohci_batch Batch structure to use
  */
-void ohci_transfer_batch_commit(ohci_transfer_batch_t *ohci_batch)
+void ohci_transfer_batch_commit(const ohci_transfer_batch_t *ohci_batch)
 {
         assert(ohci_batch);
@@ -295 +311 @@
         while (remain_size > 0) {
                 const size_t transfer_size =
-                    remain_size > OHCI_TD_MAX_TRANSFER ?
-                    OHCI_TD_MAX_TRANSFER : remain_size;
+                    min(remain_size, OHCI_TD_MAX_TRANSFER);
                 toggle = 1 - toggle;
 
@@ -378 +393 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Transfer setup table. */
 static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t) =
 {