Changeset 11cb0565 in mainline

Timestamp:

2011-12-06T14:03:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

890a3454

Parents:

5ca08d4

Message:

ohci: Drop leave_td field. Make is_compete() and commit() parameters const.

Location:

uspace/drv/bus/usb/ohci

Files:

• ohci_batch.c (modified) (7 diffs)
• ohci_batch.h (modified) (2 diffs)

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

@@ -54 +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]);
                 }
@@ -119 +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) {
@@ -166 +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);
@@ -188 +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 */
@@ -226 +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 */
@@ -248 +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 */
@@ -262 +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);

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

@@ -53 +53 @@
         /** Number of TDs used by the transfer */
         size_t td_count;
-        /** Dummy TD to be left at the ED and used by the next transfer */
-        size_t leave_td;
         /** Data buffer, must be accessible by the OHCI hw. */
         char *device_buffer;
@@ -62 +60 @@
 
 ohci_transfer_batch_t * ohci_transfer_batch_get(usb_transfer_batch_t *batch);
-bool ohci_transfer_batch_is_complete(ohci_transfer_batch_t *batch);
-void ohci_transfer_batch_commit(ohci_transfer_batch_t *batch);
+bool ohci_transfer_batch_is_complete(const ohci_transfer_batch_t *batch);
+void ohci_transfer_batch_commit(const ohci_transfer_batch_t *batch);
 void ohci_transfer_batch_finish_dispose(ohci_transfer_batch_t *batch);
 /*----------------------------------------------------------------------------*/