Changeset 2c381250 in mainline for uspace/lib/usbvirt/stdreq.c

Timestamp:

2010-10-13T06:49:48Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7da3219

Parents:

fd17ab5

Message:

virtusb: add get_descriptor(config) handling

The virtusb framework is now able to handle the standard request for
obtaining configuration descriptor. This includes sending extra data
such as interface or endpoint descriptor.

Using this approach, the virtual keyboard sends also its HID descriptor.

File:

• uspace/lib/usbvirt/stdreq.c (modified) (2 diffs)

uspace/lib/usbvirt/stdreq.c

@@ -34 +34 @@
  */
 #include <errno.h>
+#include <stdlib.h>
+#include <mem.h>
 #include <usb/devreq.h>
 
 #include "private.h"
+
+
 
 /*
@@ -52 +56 @@
          */
         if ((type == USB_DESCTYPE_DEVICE) && (index == 0)) {
-                if (device->standard_descriptor) {
+                if (device->descriptors && device->descriptors->device) {
                         return device->send_data(device, 0,
-                            device->standard_descriptor,
-                            device->standard_descriptor->length);
+                            device->descriptors->device,
+                            device->descriptors->device->length);
                 } else {
                         return EFORWARD;
                 }
+        }
+        
+        /*
+         * Configuration descriptor together with interface, endpoint and
+         * class-specific descriptors.
+         */
+        if (type == USB_DESCTYPE_CONFIGURATION) {
+                if (!device->descriptors) {
+                        return EFORWARD;
+                }
+                if (index >= device->descriptors->configuration_count) {
+                        return EFORWARD;
+                }
+                /* Copy the data. */
+                usbvirt_device_configuration_t *config = &device->descriptors
+                    ->configuration[index];
+                uint8_t *all_data = malloc(config->descriptor->total_length);
+                if (all_data == NULL) {
+                        return ENOMEM;
+                }
+                
+                uint8_t *ptr = all_data;
+                memcpy(ptr, config->descriptor, config->descriptor->length);
+                ptr += config->descriptor->length;
+                size_t i;
+                for (i = 0; i < config->extra_count; i++) {
+                        usbvirt_device_configuration_extras_t *extra
+                            = &config->extra[i];
+                        memcpy(ptr, extra->data, extra->length);
+                        ptr += extra->length;
+                }
+                
+                int rc = device->send_data(device, 0, all_data,
+                    config->descriptor->total_length);
+                
+                free(all_data);
+                
+                return rc;
         }