Changes in uspace/drv/vhc/devices.c [774afaae:daec5e04] in mainline

File:

• uspace/drv/vhc/devices.c (modified) (11 diffs)

uspace/drv/vhc/devices.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>
@@ -58 +57 @@
 /** Create virtual device.
  *
- * @param address USB address.
  * @param phone Callback phone.
+ * @param id Device id.
  * @return New device.
- * @retval NULL Out of memory or address already occupied.
- */
-virtdev_connection_t *virtdev_add_device(int phone)
+ * @retval NULL Out of memory.
+ */
+virtdev_connection_t *virtdev_add_device(int phone, sysarg_t id)
 {
         virtdev_connection_t *dev = (virtdev_connection_t *)
             malloc(sizeof(virtdev_connection_t));
+        if (dev == NULL) {
+                return NULL;
+        }
+
         dev->phone = phone;
+        dev->id = id;
         list_append(&dev->link, &devices);
         
@@ -75 +79 @@
 }
 
-/** Destroy virtual device.
- */
-void virtdev_destroy_device(virtdev_connection_t *dev)
-{
-        virthub_disconnect_device(&virtual_hub_device, dev);
-        list_remove(&dev->link);
-        free(dev);
-}
-
-/** Send data to all connected devices.
- *
- * @param transaction Transaction to be sent over the bus.
- */
-usb_transaction_outcome_t virtdev_send_to_all(transaction_t *transaction)
+/** Find virtual device by id.
+ *
+ * @param id Device id.
+ * @return Device with given id.
+ * @retval NULL No such device.
+ */
+virtdev_connection_t *virtdev_find(sysarg_t id)
 {
         link_t *pos;
@@ -94 +91 @@
                 virtdev_connection_t *dev
                     = list_get_instance(pos, virtdev_connection_t, link);
+                if (dev->id == id) {
+                        return dev;
+                }
+        }
+
+        return NULL;
+}
+
+/** Destroy virtual device.
+ */
+void virtdev_destroy_device(virtdev_connection_t *dev)
+{
+        virthub_disconnect_device(&virtual_hub_device, dev);
+        list_remove(&dev->link);
+        free(dev);
+}
+
+/** Send data to all connected devices.
+ *
+ * @param transaction Transaction to be sent over the bus.
+ */
+int virtdev_send_to_all(transaction_t *transaction)
+{
+        /* For easier debugging. */
+        switch (transaction->type) {
+                case USBVIRT_TRANSACTION_SETUP:
+                case USBVIRT_TRANSACTION_OUT:
+                        transaction->actual_len = transaction->len;
+                        break;
+                case USBVIRT_TRANSACTION_IN:
+                        transaction->actual_len = 0;
+                        break;
+                default:
+                        assert(false && "unreachable branch in switch()");
+        }
+        int outcome = EBADCHECKSUM;
+
+        link_t *pos;
+        list_foreach(pos, &devices) {
+                virtdev_connection_t *dev
+                    = list_get_instance(pos, virtdev_connection_t, link);
                 
                 if (!virthub_is_device_enabled(&virtual_hub_device, dev)) {
@@ -100 +138 @@
                 
                 ipc_call_t answer_data;
-                ipcarg_t answer_rc;
+                sysarg_t answer_rc;
                 aid_t req;
                 int rc = EOK;
@@ -138 +176 @@
                 } else {
                         async_wait_for(req, &answer_rc);
+                        transaction->actual_len = IPC_GET_ARG1(answer_data);
                         rc = (int)answer_rc;
+                }
+
+                /*
+                 * If at least one device was able to accept this
+                 * transaction and process it, we can announce success.
+                 */
+                if (rc == EOK) {
+                        outcome = EOK;
                 }
         }
@@ -148 +195 @@
         if (virtual_hub_device.address == transaction->target.address) {
                 size_t tmp;
-                dprintf(1, "sending `%s' transaction to hub",
+                usb_log_debug2("Sending `%s' transaction to hub.\n",
                     usbvirt_str_transaction_type(transaction->type));
                 switch (transaction->type) {
@@ -164 +211 @@
                                     transaction->buffer, transaction->len,
                                     &tmp);
-                                if (tmp < transaction->len) {
-                                        transaction->len = tmp;
-                                }
+                                transaction->actual_len = tmp;
                                 break;
                                 
@@ -176 +221 @@
                                 break;
                 }
-                dprintf(4, "transaction on hub processed...");
+                outcome = EOK;
         }
         
@@ -183 +228 @@
          * real-life image.
          */
-        return USB_OUTCOME_OK;
+        return outcome;
 }