Changeset 545764b in mainline

Timestamp:

2011-04-14T21:08:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c9dc471

Parents:

2471aaf

Message:

Add support for OHCI toggle set and get

Location:

uspace

Files:

• 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/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);
 }
 /**