Changeset 2c381250 in mainline for uspace/app/virtusbkbd/virtusbkbd.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/app/virtusbkbd/virtusbkbd.c (modified) (2 diffs)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -89 +89 @@
 };
 
+usbvirt_device_configuration_extras_t extra_descriptors[] = {
+        {
+                .data = (uint8_t *) &std_interface_descriptor,
+                .length = sizeof(std_interface_descriptor)
+        },
+        {
+                .data = (uint8_t *) &hid_descriptor,
+                .length = sizeof(hid_descriptor)
+        },
+        {
+                .data = (uint8_t *) &endpoint_descriptor,
+                .length = sizeof(endpoint_descriptor)
+        }
+};
+
+/** Keyboard configuration. */
+usbvirt_device_configuration_t configuration = {
+        .descriptor = &std_configuration_descriptor,
+        .extra = extra_descriptors,
+        .extra_count = sizeof(extra_descriptors)/sizeof(extra_descriptors[0])
+};
+
+/** Keyboard standard descriptors. */
+usbvirt_descriptors_t descriptors = {
+        .device = &std_device_descriptor,
+        .configuration = &configuration,
+        .configuration_count = 1,
+};
+
 /** Keyboard device.
  * Rest of the items will be initialized later.
@@ -94 +123 @@
 static usbvirt_device_t keyboard_dev = {
         .ops = &keyboard_ops,
-        .standard_descriptor = &std_descriptor,
+        .descriptors = &descriptors,
         .device_id_ = USBVIRT_DEV_KEYBOARD_ID
 };