Changeset 3f3afb9 in mainline for uspace/drv/ohci/hw_struct

Timestamp:

2011-04-11T20:38:37Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1324ff3, a39cfb8

Parents:

58226b4 (diff), d91645ab (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:

forgotten hub port powering

Location:

uspace/drv/ohci/hw_struct

Files:

• endpoint_descriptor.c (modified) (3 diffs)
• endpoint_descriptor.h (modified) (3 diffs)
• hcca.h (modified) (1 diff)
• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (2 diffs)

uspace/drv/ohci/hw_struct/endpoint_descriptor.c

@@ -42 +42 @@
         bzero(instance, sizeof(ed_t));
         if (ep == NULL) {
-                instance->status |= ED_STATUS_K_FLAG;
+                instance->status = ED_STATUS_K_FLAG;
                 return;
         }
@@ -53 +53 @@
                 << ED_STATUS_MPS_SHIFT);
 
+
         if (ep->speed == USB_SPEED_LOW)
                 instance->status |= ED_STATUS_S_FLAG;
@@ -58 +59 @@
                 instance->status |= ED_STATUS_F_FLAG;
 
+        if (ep->toggle)
+                instance->td_head |= ED_TDHEAD_TOGGLE_CARRY;
 }
-
 /**
  * @}

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
 /**

uspace/drv/ohci/hw_struct/hcca.h

@@ -43 +43 @@
         uint32_t done_head;
         uint32_t reserved[29];
-} __attribute__((packed)) hcca_t;
+} __attribute__((packed, aligned)) hcca_t;
 
 #endif

uspace/drv/ohci/hw_struct/transfer_descriptor.c

@@ -53 +53 @@
         }
         if (buffer != NULL) {
+                assert(size != 0);
                 instance->cbp = addr_to_phys(buffer);
                 instance->be = addr_to_phys(buffer + size - 1);

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -50 +50 @@
 #define TD_STATUS_DP_SHIFT (19)
 #define TD_STATUS_DP_SETUP (0x0)
-#define TD_STATUS_DP_IN (0x1)
-#define TD_STATUS_DP_OUT (0x2)
+#define TD_STATUS_DP_OUT (0x1)
+#define TD_STATUS_DP_IN (0x2)
 #define TD_STATUS_DI_MASK (0x7) /* delay interrupt, wait DI frames before int */
 #define TD_STATUS_DI_SHIFT (21)
@@ -86 +86 @@
         int cc = (instance->status >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
         /* something went wrong, error code is set */
-        if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2 && cc != CC_NOERROR) {
+        if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2) {
                 return true;
         }