Changeset 42de21a in mainline

Timestamp:

2014-01-24T03:24:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dc44023

Parents:

4e732f1a

Message:

ehci: implement toggle bit manipulation

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_endpoint.c (modified) (3 diffs)
• hw_struct/queue_head.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_endpoint.c

@@ -35 +35 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <usb/debug.h>
 
 #include "utils/malloc32.h"
@@ -50 +51 @@
         assert(instance);
         assert(instance->qh);
-//      qh_toggle_set(instance->qh, toggle);
+        if (qh_toggle_from_td(instance->qh))
+                usb_log_warning("Setting toggle bit for transfer directed EP\n");
+        qh_toggle_set(instance->qh, toggle);
 }
 
@@ -63 +66 @@
         assert(instance);
         assert(instance->qh);
-        return 0;
-//      return qh_toggle_get(instance->qh);
+        if (qh_toggle_from_td(instance->qh))
+                usb_log_warning("Reading useless toggle bit\n");
+        return qh_toggle_get(instance->qh);
 }
 

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -154 +154 @@
 {
         assert(qh);
-        return (qh->horizontal & LINK_POINTER_ADDRESS_MASK);
+        return (EHCI_MEM32_RD(qh->horizontal) & LINK_POINTER_ADDRESS_MASK);
 }
+
+static inline bool qh_toggle_from_td(const qh_t *qh)
+{
+        assert(qh);
+        return (EHCI_MEM32_RD(qh->ep_cap) & QH_EP_CHAR_DTC_FLAG);
+}
+
+static inline void qh_toggle_set(qh_t *qh, int toggle)
+{
+        assert(qh);
+        if (toggle)
+                EHCI_MEM32_SET(qh->status, QH_STATUS_TOGGLE_FLAG);
+        else
+                EHCI_MEM32_CLR(qh->status, QH_STATUS_TOGGLE_FLAG);
+}
+
+static inline int qh_toggle_get(const qh_t *qh)
+{
+        assert(qh);
+        return (EHCI_MEM32_RD(qh->status) & QH_STATUS_TOGGLE_FLAG) ? 1 : 0;
+}
+
 
 void qh_init(qh_t *instance, const endpoint_t *ep);