Changeset 5e6e50b in mainline for uspace/drv/vhc/transfer.c

Timestamp:

2011-05-17T09:20:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2aaf804

Parents:

a29529b (diff), 3375bd4 (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:

Development branch changes

File:

• uspace/drv/vhc/transfer.c (modified) (6 diffs)

uspace/drv/vhc/transfer.c

@@ -4 +4 @@
 #include <usbvirt/ipc.h>
 #include "vhcd.h"
-
-#define list_foreach(pos, head) \
-        for (pos = (head)->next; pos != (head); \
-                pos = pos->next)
 
 vhc_transfer_t *vhc_transfer_create(usb_address_t address, usb_endpoint_t ep,
@@ -67 +63 @@
         fibril_mutex_lock(&vhc->guard);
 
-        link_t *pos;
         bool target_found = false;
-        list_foreach(pos, &vhc->devices) {
+        list_foreach(vhc->devices, pos) {
                 vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link);
                 fibril_mutex_lock(&dev->guard);
@@ -161 +156 @@
 }
 
+static vhc_transfer_t *dequeue_first_transfer(vhc_virtdev_t *dev)
+{
+        assert(fibril_mutex_is_locked(&dev->guard));
+        assert(!list_empty(&dev->transfer_queue));
+
+        vhc_transfer_t *transfer = list_get_instance(dev->transfer_queue.next,
+            vhc_transfer_t, link);
+        list_remove(&transfer->link);
+
+        return transfer;
+}
+
+
+static void execute_transfer_callback_and_free(vhc_transfer_t *transfer,
+    size_t data_transfer_size, int outcome)
+{
+        assert(outcome != ENAK);
+
+        usb_log_debug2("Transfer %p ended: %s.\n",
+            transfer, str_error(outcome));
+
+        if (transfer->direction == USB_DIRECTION_IN) {
+                transfer->callback_in(transfer->ddf_fun, outcome,
+                    data_transfer_size, transfer->callback_arg);
+        } else {
+                assert(transfer->direction == USB_DIRECTION_OUT);
+                transfer->callback_out(transfer->ddf_fun, outcome,
+                    transfer->callback_arg);
+        }
+
+        free(transfer);
+}
 
 int vhc_transfer_queue_processor(void *arg)
@@ -174 +201 @@
                 }
 
-                vhc_transfer_t *transfer = list_get_instance(dev->transfer_queue.next,
-                    vhc_transfer_t, link);
-                list_remove(&transfer->link);
+                vhc_transfer_t *transfer = dequeue_first_transfer(dev);
                 fibril_mutex_unlock(&dev->guard);
 
@@ -214 +239 @@
 
                 if (rc != ENAK) {
-                        usb_log_debug2("Transfer %p ended: %s.\n",
-                            transfer, str_error(rc));
-                        if (transfer->direction == USB_DIRECTION_IN) {
-                                transfer->callback_in(transfer->ddf_fun, rc,
-                                    data_transfer_size, transfer->callback_arg);
-                        } else {
-                                assert(transfer->direction == USB_DIRECTION_OUT);
-                                transfer->callback_out(transfer->ddf_fun, rc,
-                                    transfer->callback_arg);
-                        }
-                        free(transfer);
+                        execute_transfer_callback_and_free(transfer,
+                            data_transfer_size, rc);
                 }
 
@@ -231 +247 @@
         }
 
+        /* Immediately fail all remaining transfers. */
+        while (!list_empty(&dev->transfer_queue)) {
+                vhc_transfer_t *transfer = dequeue_first_transfer(dev);
+                execute_transfer_callback_and_free(transfer, 0, EBADCHECKSUM);
+        }
+
         fibril_mutex_unlock(&dev->guard);
 
-        // TODO - destroy pending transfers
-
         return EOK;
 }