Changeset 5e6e50b in mainline for uspace/drv

Timestamp:

2011-05-17T09:20:34Z (15 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

Location:

uspace/drv

Files:

• uhci-rhd/port.c (modified) (1 diff)
• usbhid/main.c (modified) (1 diff)
• vhc/conndev.c (modified) (3 diffs)
• vhc/transfer.c (modified) (6 diffs)

uspace/drv/uhci-rhd/port.c

@@ -37 +37 @@
 #include <str_error.h>
 #include <time.h>
+#include <async.h>
 
 #include <usb/usb.h>    /* usb_address_t */

uspace/drv/usbhid/main.c

@@ -202 +202 @@
         printf(NAME ": HelenOS USB HID driver.\n");
 
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
 
         return usb_driver_main(&usb_hid_driver);

uspace/drv/vhc/conndev.c

@@ -37 +37 @@
 #include <errno.h>
 #include <ddf/driver.h>
+#include <usbvirt/ipc.h>
 #include "conn.h"
 
 static fibril_local uintptr_t plugged_device_handle = 0;
+#define PLUGGED_DEVICE_NAME_MAXLEN 256
+static fibril_local char plugged_device_name[PLUGGED_DEVICE_NAME_MAXLEN + 1] = "<unknown>";
+
+/** Receive device name.
+ *
+ * @warning Errors are silently ignored.
+ *
+ * @param phone Phone to the virtual device.
+ */
+static void receive_device_name(int phone)
+{
+        aid_t opening_request = async_send_0(phone, IPC_M_USBVIRT_GET_NAME, NULL);
+        if (opening_request == 0) {
+                return;
+        }
+
+
+        ipc_call_t data_request_call;
+        aid_t data_request = async_data_read(phone,
+             plugged_device_name, PLUGGED_DEVICE_NAME_MAXLEN,
+             &data_request_call);
+
+        if (data_request == 0) {
+                async_wait_for(opening_request, NULL);
+                return;
+        }
+
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
+        async_wait_for(data_request, &data_request_rc);
+        async_wait_for(opening_request, &opening_request_rc);
+
+        if ((data_request_rc != EOK) || (opening_request_rc != EOK)) {
+                return;
+        }
+
+        size_t len = IPC_GET_ARG2(data_request_call);
+        plugged_device_name[len] = 0;
+}
 
 /** Default handler for IPC methods not handled by DDF.
@@ -65 +105 @@
                 async_answer_0(icallid, EOK);
 
-                usb_log_info("New virtual device `%s' (id = %" PRIxn ").\n",
-                    rc == EOK ? "XXX" : "<unknown>", plugged_device_handle);
+                receive_device_name(callback);
+
+                usb_log_info("New virtual device `%s' (id: %" PRIxn ").\n",
+                    plugged_device_name, plugged_device_handle);
 
                 return;
@@ -85 +127 @@
 
         if (plugged_device_handle != 0) {
-                usb_log_info("Virtual device disconnected (id = %" PRIxn ").\n",
-                    plugged_device_handle);
+                usb_log_info("Virtual device `%s' disconnected (id: %" PRIxn ").\n",
+                    plugged_device_name, plugged_device_handle);
                 vhc_virtdev_unplug(vhc, plugged_device_handle);
         }

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;
 }