Changeset c7dd69d in mainline for uspace/drv/ohci/hw_struct/endpoint_descriptor.h

Timestamp:

2011-04-15T13:19:59Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

da1dd48

Parents:

e3b5129 (diff), 8fd4ba0 (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:

Development changes

File:

• uspace/drv/ohci/hw_struct/endpoint_descriptor.h (modified) (4 diffs)

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -53 +53 @@
 #define ED_STATUS_D_MASK (0x3)     /* direction */
 #define ED_STATUS_D_SHIFT (11)
-#define ED_STATUS_D_IN (0x1)
-#define ED_STATUS_D_OUT (0x2)
+#define ED_STATUS_D_OUT (0x1)
+#define ED_STATUS_D_IN (0x2)
 #define ED_STATUS_D_TRANSFER (0x3)
 
@@ -73 +73 @@
 #define ED_TDHEAD_ZERO_SHIFT (2)
 #define ED_TDHEAD_TOGGLE_CARRY (0x2)
+#define ED_TDHEAD_HALTED_FLAG (0x1)
 
         volatile uint32_t next;
@@ -81 +82 @@
 void ed_init(ed_t *instance, endpoint_t *ep);
 
-static inline void ed_add_tds(ed_t *instance, td_t *head, td_t *tail)
+static inline void ed_set_td(ed_t *instance, td_t *td)
 {
         assert(instance);
-        instance->td_head = addr_to_phys(head) & ED_TDHEAD_PTR_MASK;
-        instance->td_tail = addr_to_phys(tail) & ED_TDTAIL_PTR_MASK;
+        uintptr_t pa = addr_to_phys(td);
+        instance->td_head =
+            ((pa & ED_TDHEAD_PTR_MASK)
+            | (instance->td_head & ~ED_TDHEAD_PTR_MASK));
+        instance->td_tail = pa & ED_TDTAIL_PTR_MASK;
+}
+
+static inline void ed_set_end_td(ed_t *instance, td_t *td)
+{
+        assert(instance);
+        uintptr_t pa = addr_to_phys(td);
+        instance->td_tail = pa & ED_TDTAIL_PTR_MASK;
 }
 
@@ -97 +108 @@
 }
 
+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
 /**