Changeset 65eac7b in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2012-02-24T03:08:24Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

668a2e8

Parents:

4e30369

Message:

ohci: Use endain aware access to manipulate memory structures.

Enable work queues

File:

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

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

@@ -231 +231 @@
 
                         /* Check TD assumption */
-                        const uint32_t pa =
-                            addr_to_phys(ohci_batch->tds[leave_td]);
-                        assert((ohci_batch->ed->td_head & ED_TDHEAD_PTR_MASK)
-                            == pa);
-
+                        assert(ed_head_td(ohci_batch->ed) ==
+                            addr_to_phys(ohci_batch->tds[leave_td]));
+
+                        /* Set tail to the same TD */
                         ed_set_tail_td(ohci_batch->ed,
                             ohci_batch->tds[leave_td]);
 
                         /* Clear possible ED HALT */
-                        ohci_batch->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+                        ed_clear_halt(ohci_batch->ed);
                         break;
                 }
@@ -253 +252 @@
 
         /* Make sure that we are leaving the right TD behind */
-        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));
+        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;