Changeset c9dc471 in mainline

Timestamp:

2011-04-14T21:52:57Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

27eb1fe, e583fd4

Parents:

545764b

Message:

Handle error states on ED properly.

File:

• uspace/drv/ohci/batch.c (modified) (2 diffs)

uspace/drv/ohci/batch.c

@@ -161 +161 @@
                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
                             instance, i, data->tds[i]->status);
+                        /* Make sure TD queue is empty (one TD),
+                         * ED should be marked as halted */
+                        data->ed->td_tail =
+                            (data->ed->td_head & ED_TDTAIL_PTR_MASK);
+                        ++i;
                         break;
                 }
@@ -169 +174 @@
         assert(hcd_ep);
         hcd_ep->td = data->tds[i];
+        /* Clear possible ED HALT */
+        data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+        uint32_t pa = addr_to_phys(hcd_ep->td);
+        assert(pa == (data->ed->td_head & ED_TDHEAD_PTR_MASK));
+        assert(pa == (data->ed->td_tail & ED_TDTAIL_PTR_MASK));
 
         return true;