Changeset 72cd53d in mainline for uspace/drv/vhc/transfer.c

Timestamp:

2011-05-17T07:18:11Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3375bd4

Parents:

50cd285 (diff), e913cc9 (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:

Small fixes and improvements

Fixed buffer overflow in lsusb.
lsusb scans all adresses, not only first ones.
Played with logging levels, now it is configurable.
VHC prints name of connected device and destroys pending transfers
when device is unplugged.

File:

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

uspace/drv/vhc/transfer.c

@@ -161 +161 @@
 }
 
+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 +206 @@
                 }
 
-                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 +244 @@
 
                 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 +252 @@
         }
 
+        /* 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;
 }