Changeset f1be95c8 in mainline

Timestamp:

2011-04-09T00:22:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4c28d17

Parents:

e42dd32

Message:

Add forgotten TD implementation, add error parsing

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (2 diffs)
• hw_struct/completion_codes.h (modified) (2 diffs)
• hw_struct/transfer_descriptor.c (added)
• hw_struct/transfer_descriptor.h (modified) (2 diffs)

uspace/drv/ohci/batch.c

@@ -118 +118 @@
 {
         assert(instance);
+        ohci_batch_t *data = instance->private_data;
+        assert(data);
+        free32(data->ed);
+        free32(data->tds);
+        free32(instance->setup_buffer);
         free32(instance->transport_buffer);
-        free32(instance->setup_buffer);
+        free(data);
         free(instance);
 }
@@ -125 +130 @@
 bool batch_is_complete(usb_transfer_batch_t *instance)
 {
-        // TODO: implement
-        return false;
+        assert(instance);
+        ohci_batch_t *data = instance->private_data;
+        assert(data);
+        size_t tds = data->td_count - 1;
+        usb_log_debug2("Batch(%p) checking %d td(s) for completion.\n",
+            instance, tds);
+        size_t i = 0;
+        for (; i < tds; ++i) {
+                if (!td_is_finished(&data->tds[i]))
+                        return false;
+                instance->error = td_error(&data->tds[i]);
+                /* FIXME: calculate real transfered size */
+                instance->transfered_size = instance->buffer_size;
+                if (instance->error != EOK) {
+                        usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
+                            instance, i, data->tds[i].status);
+                        return true;
+//                      endpoint_toggle_set(instance->ep,
+                }
+        }
+        return true;
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hw_struct/completion_codes.h

@@ -35 +35 @@
 #define DRV_OHCI_HW_STRUCT_COMPLETION_CODES_H
 
+#include <errno.h>
+
 #define CC_NOERROR (0x0)
 #define CC_CRC (0x1)
@@ -50 +52 @@
 #define CC_NOACCESS2 (0xf)
 
+inline static int cc_to_rc(int cc)
+{
+        switch (cc) {
+        case CC_NOERROR:
+                return EOK;
+
+        case CC_CRC:
+                return EBADCHECKSUM;
+
+        case CC_PIDUNEXPECTED:
+        case CC_PIDFAIL:
+        case CC_BITSTUFF:
+                return EIO;
+
+        case CC_TOGGLE:
+        case CC_STALL:
+                return ESTALL;
+
+        case CC_NORESPONSE:
+                return ETIMEOUT;
+
+        case CC_DATAOVERRRUN:
+        case CC_DATAUNDERRRUN:
+        case CC_BUFFEROVERRRUN:
+        case CC_BUFFERUNDERRUN:
+                return EOVERFLOW;
+
+        case CC_NOACCESS1:
+        case CC_NOACCESS2:
+        default:
+                return ENOTSUP;
+        }
+}
+
 #endif
 /**

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"
@@ -79 +80 @@
         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 && cc != CC_NOERROR) {
+                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);
+}
 #endif
 /**