Changeset b828907 in mainline for uspace/drv/bus/usb/ohci/endpoint_list.c

Timestamp:

2012-07-20T20:29:54Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

34bc2fe

Parents:

4cdac68 (diff), 6de2d766 (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 with mainline

File:

• uspace/drv/bus/usb/ohci/endpoint_list.c (modified) (4 diffs)

uspace/drv/bus/usb/ohci/endpoint_list.c

@@ -65 +65 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Set the next list in transfer list chain.
  *
@@ -80 +80 @@
         ed_append_ed(instance->list_head, next->list_head);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Add endpoint to the list and queue.
  *
@@ -132 +132 @@
         fibril_mutex_unlock(&instance->guard);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Remove endpoint from the list and queue.
  *
@@ -162 +162 @@
                 qpos = "NOT FIRST";
         }
-        assert((prev_ed->next & ED_NEXT_PTR_MASK) == addr_to_phys(ep->ed));
+        assert(ed_next(prev_ed) == addr_to_phys(ep->ed));
         prev_ed->next = ep->ed->next;
         /* Make sure ED is updated */