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

Timestamp:

2011-04-10T22:44:17Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6991188

Parents:

c7bdfa7 (diff), 26d46d2 (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:

OHCI prototype

Control transfers work, interrupt transfers freeze VirtualBox, bulk were not tested

File:

• uspace/drv/ohci/hw_struct/endpoint_descriptor.h (modified) (3 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)
 
@@ -84 +84 @@
 {
         assert(instance);
-        instance->td_head = addr_to_phys(head) & ED_TDHEAD_PTR_MASK;
+        instance->td_head =
+            ((addr_to_phys(head) & ED_TDHEAD_PTR_MASK)
+            | (instance->td_head & ~ED_TDHEAD_PTR_MASK));
         instance->td_tail = addr_to_phys(tail) & ED_TDTAIL_PTR_MASK;
 }
@@ -96 +98 @@
         instance->next = pa;
 }
-
 #endif
 /**