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

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (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:

new report structure fixes

File:

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

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -35 +35 @@
 #define DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
 
+#include <bool.h>
 #include <stdint.h>
+#include "utils/malloc32.h"
 
 #include "completion_codes.h"
+
+/* OHCI TDs can handle up to 8KB buffers */
+#define OHCI_TD_MAX_TRANSFER (8 * 1024)
 
 typedef struct td {
@@ -45 +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)
@@ -52 +57 @@
 #define TD_STATUS_T_MASK (0x3)  /* data toggle 1x = use ED toggle carry */
 #define TD_STATUS_T_SHIFT (24)
+#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)
@@ -64 +72 @@
         volatile uint32_t be; /* buffer end, address of the last byte */
 } __attribute__((packed)) td_t;
+
+void td_init(
+    td_t *instance, usb_direction_t dir, void *buffer, size_t size, int toggle);
+
+inline static void td_set_next(td_t *instance, td_t *next)
+{
+        assert(instance);
+        instance->next = addr_to_phys(next) & TD_NEXT_PTR_MASK;
+}
+
+inline static bool td_is_finished(td_t *instance)
+{
+        assert(instance);
+        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) {
+                return true;
+        }
+        /* everything done */
+        if (cc == CC_NOERROR && instance->cbp == 0) {
+                return true;
+        }
+        return false;
+}
+
+static inline int td_error(td_t *instance)
+{
+        assert(instance);
+        int cc = (instance->status >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
+        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
 /**