Changeset e1dbcbc in mainline for uspace/drv/ohci/hw_struct/transfer_descriptor.h

Timestamp:

2011-04-29T13:43:01Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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 development/ changes

File:

• uspace/drv/ohci/hw_struct/transfer_descriptor.h (modified) (4 diffs)

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)
@@ -59 +59 @@
 #define TD_STATUS_T_0 (0x2)
 #define TD_STATUS_T_1 (0x3)
+#define TD_STATUS_T_ED (0)
 #define TD_STATUS_EC_MASK (0x3) /* error count */
 #define TD_STATUS_EC_SHIFT (26)
@@ -86 +87 @@
         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;
         }
@@ -102 +103 @@
         return cc_to_rc(cc);
 }
+
+static inline size_t td_remain_size(td_t *instance)
+{
+        assert(instance);
+        if (instance->cbp == 0)
+                return 0;
+        return instance->be - instance->cbp + 1;
+}
 #endif
 /**