Changeset e583fd4 in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-04-14T22:05:27Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d7f08b0d, e05d6c3

Parents:

0146d41 (diff), c9dc471 (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:

OHCI fixes

Add support for toggle reset on OHCI ED
Properly handle error conditions on OHCI ED

Fixes strange virtualbox behavior. Tested USB devices no longer hang usbinfo
Logitech keyboard supports HALT feature and makes use of new clea halt mechanism. MS mouse does not use HALT feature.

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;