Changeset 47e3a8e in mainline for uspace/lib/usbvirt

Timestamp:

2010-10-15T16:32:57Z (15 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.

Location:

uspace/lib/usbvirt

Files:

• device.h (modified) (2 diffs)
• main.c (modified) (4 diffs)
• stdreq.c (modified) (1 diff)

uspace/lib/usbvirt/device.h

@@ -106 +106 @@
 } usbvirt_descriptors_t;
 
+/** Possible states of virtual USB device.
+ * Notice that these are not 1:1 mappings to those in USB specification.
+ */
+typedef enum {
+        USBVIRT_STATE_DEFAULT,
+        USBVIRT_STATE_ADDRESS,
+        USBVIRT_STATE_CONFIGURED
+} usbvirt_device_state_t;
 
+/** Virtual USB device. */
 typedef struct usbvirt_device {
         /** Callback device operations. */
@@ -126 +135 @@
         usbvirt_descriptors_t *descriptors;
         
+        /** Current device state. */
+        usbvirt_device_state_t state;
+        /** Device address. */
+        usb_address_t address;
         
         /* Private attributes. */

uspace/lib/usbvirt/main.c

@@ -50 +50 @@
 static void handle_data_to_device(ipc_callid_t iid, ipc_call_t icall)
 {
-        usb_endpoint_t endpoint = IPC_GET_ARG1(icall);
+        usb_address_t address = IPC_GET_ARG1(icall);
+        usb_endpoint_t endpoint = IPC_GET_ARG2(icall);
+        
+        if (address != device->address) {
+                ipc_answer_0(iid, EADDRNOTAVAIL);
+                return;
+        }
         
         size_t len;
@@ -95 +101 @@
 }
 
+static void device_init(usbvirt_device_t *dev)
+{
+        dev->send_data = usbvirt_data_to_host;
+        dev->state = USBVIRT_STATE_DEFAULT;
+        dev->address = 0;
+}
+
 int usbvirt_data_to_host(struct usbvirt_device *dev,
     usb_endpoint_t endpoint, void *buffer, size_t size)
@@ -112 +125 @@
         int rc;
         
-        req = async_send_1(phone,
+        req = async_send_2(phone,
             IPC_M_USBVIRT_DATA_FROM_DEVICE,
+            dev->address,
             endpoint,
             &answer_data);
@@ -174 +188 @@
         
         dev->vhcd_phone_ = hcd_phone;
-        dev->send_data = usbvirt_data_to_host;
+        device_init(dev);
         
         device = dev;

uspace/lib/usbvirt/stdreq.c

@@ -118 +118 @@
         
         /*
-         * TODO: inform the HC that device has new address assigned.
+         * TODO: handle when this request is invalid (e.g.
+         * setting address when in configured state).
          */
+        if (new_address == 0) {
+                device->state = USBVIRT_STATE_DEFAULT;
+        } else {
+                device->state = USBVIRT_STATE_ADDRESS;
+        }
+        
+        device->address = new_address;
+        
         return EOK;
 }