Changeset 08af5a6 in mainline

Timestamp:

2010-10-20T21:15:51Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b8507a1

Parents:

bbfb86c

Message:

Virtual USB device handles set_configuration

No checks etc. are done but it must be sufficient for now.

Location:

uspace/lib/usbvirt

Files:

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

uspace/lib/usbvirt/device.h

@@ -104 +104 @@
         /** Number of configurations. */
         size_t configuration_count;
+        /** Index of currently selected configuration. */
+        uint8_t current_configuration;
 } usbvirt_descriptors_t;
 

uspace/lib/usbvirt/stdreq.c

@@ -132 +132 @@
 }
 
+static int handle_set_configuration(uint16_t configuration_value,
+    uint16_t zero1, uint16_t zero2)
+{
+        if ((zero1 != 0) || (zero2 != 0)) {
+                return EINVAL;
+        }
+        
+        /*
+         * Configuration value is 1 byte information.
+         */
+        if (configuration_value > 255) {
+                return EINVAL;
+        }
+        
+        /*
+         * Do nothing when in default state. According to specification,
+         * this is not specified.
+         */
+        if (device->state == USBVIRT_STATE_DEFAULT) {
+                return EOK;
+        }
+        
+        if (configuration_value == 0) {
+                device->state = USBVIRT_STATE_ADDRESS;
+        } else {
+                /*
+                * TODO: browse provided configurations and verify that
+                * user selected existing configuration.
+                */
+                device->state = USBVIRT_STATE_CONFIGURED;
+                if (device->descriptors) {
+                        device->descriptors->current_configuration
+                            = configuration_value;
+                }
+        }
+                
+        return EOK;
+}
+
 #define HANDLE_REQUEST(request, data, type, dev, user_callback, default_handler) \
         do { \
@@ -161 +200 @@
                 request->index, request->length));
         
+        HANDLE_REQUEST(request, data, USB_DEVREQ_SET_CONFIGURATION,
+            device, on_set_configuration,
+            handle_set_configuration(request->value,
+                request->index, request->length));
+        
         return ENOTSUP;
 }