Changeset 242f0e2 in mainline

Timestamp:

2011-04-15T16:13:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8595577b

Parents:

11d2e96a (diff), 3690c75 (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:

OHCI bulk out fixes, support for OHCI short packets

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (4 diffs)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• hw_struct/transfer_descriptor.h (modified) (2 diffs)

uspace/drv/ohci/batch.c

@@ -147 +147 @@
             data->ed->next);
         size_t i = 0;
+        instance->transfered_size = instance->buffer_size;
         for (; i < tds; ++i) {
                 assert(data->tds[i] != NULL);
@@ -156 +157 @@
                 }
                 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",
@@ -174 +173 @@
         assert(hcd_ep);
         hcd_ep->td = data->tds[i];
+        if (i > 0)
+                instance->transfered_size -= td_remain_size(data->tds[i - 1]);
+
         /* Clear possible ED HALT */
         data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
@@ -238 +240 @@
 {
         assert(instance);
-        instance->next_step = usb_transfer_batch_call_in_and_dispose;
+        /* We are data out, we are supposed to provide data */
+        memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
+        instance->next_step = usb_transfer_batch_call_out_and_dispose;
         batch_data(instance);
-        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
+        usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hw_struct/transfer_descriptor.c

@@ -52 +52 @@
                 instance->status |= togg[toggle] << TD_STATUS_T_SHIFT;
         }
+        if (dir == USB_DIRECTION_IN) {
+                instance->status |= TD_STATUS_ROUND_FLAG;
+        }
         if (buffer != NULL) {
                 assert(size != 0);

uspace/drv/ohci/hw_struct/transfer_descriptor.h

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