Changeset e583fd4 in mainline

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.

Location:

uspace

Files:

• drv/ohci/batch.c (modified) (2 diffs)
• drv/ohci/hcd_endpoint.c (modified) (2 diffs)
• drv/ohci/hw_struct/endpoint_descriptor.h (modified) (2 diffs)
• lib/usb/src/host/endpoint.c (modified) (1 diff)

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;

uspace/drv/ohci/hcd_endpoint.c

@@ -35 +35 @@
 #include "hcd_endpoint.h"
 
+static void hcd_ep_toggle_set(void *hcd_ep, int toggle)
+{
+        hcd_endpoint_t *instance = hcd_ep;
+        assert(instance);
+        assert(instance->ed);
+        ed_toggle_set(instance->ed, toggle);
+}
+static int hcd_ep_toggle_get(void *hcd_ep)
+{
+        hcd_endpoint_t *instance = hcd_ep;
+        assert(instance);
+        assert(instance->ed);
+        return ed_toggle_get(instance->ed);
+}
+
+
 hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep)
 {
@@ -57 +73 @@
         ed_init(hcd_ep->ed, ep);
         ed_set_td(hcd_ep->ed, hcd_ep->td);
-        endpoint_set_hc_data(ep, hcd_ep, NULL, NULL);
+        endpoint_set_hc_data(ep, hcd_ep, hcd_ep_toggle_get, hcd_ep_toggle_set);
 
         return hcd_ep;

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -73 +73 @@
 #define ED_TDHEAD_ZERO_SHIFT (2)
 #define ED_TDHEAD_TOGGLE_CARRY (0x2)
+#define ED_TDHEAD_HALTED_FLAG (0x1)
 
         volatile uint32_t next;
@@ -106 +107 @@
         instance->next = pa;
 }
+
+static inline int ed_toggle_get(ed_t *instance)
+{
+        assert(instance);
+        return (instance->td_head & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+}
+
+static inline void ed_toggle_set(ed_t *instance, int toggle)
+{
+        assert(instance);
+        assert(toggle == 0 || toggle == 1);
+        if (toggle == 1) {
+                instance->td_head |= ED_TDHEAD_TOGGLE_CARRY;
+        } else {
+                /* clear halted flag when reseting toggle */
+                instance->td_head &= ~ED_TDHEAD_TOGGLE_CARRY;
+                instance->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+        }
+}
 #endif
 /**

uspace/lib/usb/src/host/endpoint.c

@@ -123 +123 @@
         if (instance->address == target.address &&
             (instance->endpoint == target.endpoint || target.endpoint == 0))
-                instance->toggle = 0;
+                endpoint_toggle_set(instance, 0);
 }
 /**