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

Timestamp:

2011-04-14T07:54:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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:

merge from development

File:

• uspace/drv/ohci/hw_struct/endpoint_descriptor.h (modified) (1 diff)

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -81 +81 @@
 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);
+        uintptr_t pa = addr_to_phys(td);
         instance->td_head =
-            ((addr_to_phys(head) & ED_TDHEAD_PTR_MASK)
+            ((pa & ED_TDHEAD_PTR_MASK)
             | (instance->td_head & ~ED_TDHEAD_PTR_MASK));
-        instance->td_tail = addr_to_phys(tail) & ED_TDTAIL_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;
 }