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

Timestamp:

2011-04-08T23:28:52Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f1be95c8

Parents:

b854e56

Message:

OCHI structures fixed, setup control transfer

File:

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

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -41 +41 @@
 
 #include "utils/malloc32.h"
+#include "transfer_descriptor.h"
 
 #include "completion_codes.h"
@@ -49 +50 @@
 #define ED_STATUS_FA_SHIFT (0)
 #define ED_STATUS_EN_MASK (0xf)    /* USB endpoint address */
-#define ED_STATUS_EN_SHIFT (6)
+#define ED_STATUS_EN_SHIFT (7)
 #define ED_STATUS_D_MASK (0x3)     /* direction */
-#define ED_STATUS_D_SHIFT (10)
+#define ED_STATUS_D_SHIFT (11)
 #define ED_STATUS_D_IN (0x1)
 #define ED_STATUS_D_OUT (0x2)
@@ -80 +81 @@
 void ed_init(ed_t *instance, endpoint_t *ep);
 
-static inline void ed_add_tds(ed_t *instance, uint32_t head, uint32_t tail)
+static inline void ed_add_tds(ed_t *instance, td_t *head, td_t *tail)
 {
         assert(instance);
-        instance->td_head = head & ED_TDHEAD_PTR_MASK;
-        instance->td_tail = tail & ED_TDTAIL_PTR_MASK;
+        instance->td_head = addr_to_phys(head) & ED_TDHEAD_PTR_MASK;
+        instance->td_tail = addr_to_phys(tail) & ED_TDTAIL_PTR_MASK;
 }