Changeset 44b1674 in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-04-18T21:48:55Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (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 form usb/development

File:

• uspace/drv/ohci/batch.c (modified) (5 diffs)

uspace/drv/ohci/batch.c

@@ -141 +141 @@
         assert(data);
         size_t tds = data->td_count;
-        usb_log_debug("Batch(%p) checking %d td(s) for completion.\n",
+        usb_log_debug("Batch(%p) checking %zu td(s) for completion.\n",
             instance, tds);
         usb_log_debug("ED: %x:%x:%x:%x.\n",
@@ -147 +147 @@
             data->ed->next);
         size_t i = 0;
+        instance->transfered_size = instance->buffer_size;
         for (; i < tds; ++i) {
                 assert(data->tds[i] != NULL);
-                usb_log_debug("TD %d: %x:%x:%x:%x.\n", i,
+                usb_log_debug("TD %zu: %x:%x:%x:%x.\n", i,
                     data->tds[i]->status, data->tds[i]->cbp, data->tds[i]->next,
                     data->tds[i]->be);
@@ -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",
+                        usb_log_debug("Batch(%p) found error TD(%zu):%x.\n",
                             instance, i, data->tds[i]->status);
                         /* Make sure TD queue is empty (one TD),
@@ -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);
 }
 /*----------------------------------------------------------------------------*/