Changeset 47e3a8e in mainline for uspace/srv/hw/bus/usb/hcd/virtual/devices.c

Timestamp:

2010-10-15T16:32:57Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

186d630

Parents:

73301a0

Message:

Virtual USB device tracks its address

Now, each virtual device tracks its address and its state.

The virtual HC dispatches all transactions to all devices, thus
more precisely simulating situation on USB. The usbvirt framework
then decides whether it can accept the data or not, based on
their destination address.

File:

• uspace/srv/hw/bus/usb/hcd/virtual/devices.c (modified) (5 diffs)

uspace/srv/hw/bus/usb/hcd/virtual/devices.c

@@ -44 +44 @@
 
 #include <usbvirt/ids.h>
+#include <usbvirt/hub.h>
 
 #include "devices.h"
@@ -63 +64 @@
         switch (id) {
                 case USBVIRT_DEV_KEYBOARD_ID:
-                        dev = virtdev_add_device(
-                            USBVIRT_DEV_KEYBOARD_ADDRESS, phone);
+                        dev = virtdev_add_device(phone);
                         break;
                 default:
@@ -84 +84 @@
 }
 
-/** Find virtual device by its USB address.
- *
- * @retval NULL No virtual device at given address.
- */
-virtdev_connection_t *virtdev_find_by_address(usb_address_t address)
-{
-        link_t *pos;
-        list_foreach(pos, &devices) {
-                virtdev_connection_t *dev
-                    = list_get_instance(pos, virtdev_connection_t, link);
-                if (dev->address == address) {
-                        return dev;
-                }
-        }
-        
-        return NULL;
-}
-
 /** Create virtual device.
  *
@@ -109 +91 @@
  * @retval NULL Out of memory or address already occupied.
  */
-virtdev_connection_t *virtdev_add_device(usb_address_t address, int phone)
+virtdev_connection_t *virtdev_add_device(int phone)
 {
-        link_t *pos;
-        list_foreach(pos, &devices) {
-                virtdev_connection_t *dev
-                    = list_get_instance(pos, virtdev_connection_t, link);
-                if (dev->address == address) {
-                        return NULL;
-                }
-        }
-        
         virtdev_connection_t *dev = (virtdev_connection_t *)
             malloc(sizeof(virtdev_connection_t));
         dev->phone = phone;
-        dev->address = address;
         list_append(&dev->link, &devices);
         
@@ -137 +109 @@
 }
 
+/** 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)
+{
+        link_t *pos;
+        list_foreach(pos, &devices) {
+                virtdev_connection_t *dev
+                    = list_get_instance(pos, virtdev_connection_t, link);
+                
+                ipc_call_t answer_data;
+                ipcarg_t answer_rc;
+                aid_t req;
+                int rc;
+                
+                req = async_send_3(dev->phone,
+                    IPC_M_USBVIRT_DATA_TO_DEVICE,
+                    transaction->target.address,
+                    transaction->target.endpoint,
+                    transaction->type,
+                    &answer_data);
+                
+                rc = async_data_write_start(dev->phone,
+                    transaction->buffer, transaction->len);
+                if (rc != EOK) {
+                        async_wait_for(req, NULL);
+                } else {
+                        async_wait_for(req, &answer_rc);
+                        rc = (int)answer_rc;
+                }
+        }
+        
+        /*
+         * TODO: maybe screw some transactions to get more
+         * real-life image.
+         */
+        return USB_OUTCOME_OK;
+}
+
 /**
  * @}