Changeset 4971812 in mainline

Timestamp:

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

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0e41957

Parents:

6c1315b

Message:

Standard requests in virtual USB device

The virtual USB device framework can handle some standard requests
alone. Again, this is more about bones than about meat. Meat will
come later.

Update `vuk' app to provide standard device descriptor.

Location:

uspace

Files:

• app/virtusbkbd/virtusbkbd.c (modified) (3 diffs)
• lib/usbvirt/Makefile (modified) (1 diff)
• lib/usbvirt/ctrlpipe.c (modified) (1 diff)
• lib/usbvirt/device.h (modified) (3 diffs)
• lib/usbvirt/private.h (modified) (2 diffs)
• lib/usbvirt/stdreq.c (added)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -46 +46 @@
 
 #include <usb/hcd.h>
+#include <usb/device.h>
 #include <usbvirt/device.h>
 #include <usbvirt/hub.h>
@@ -69 +70 @@
 }
 
+static usb_standard_device_descriptor_t std_descriptor = {
+        .length = sizeof(usb_standard_device_descriptor_t),
+        .descriptor_type = 1,
+        .usb_spec_version = 0x110,
+        .device_class = 0x03,
+        .device_subclass = 0,
+        .device_protocol = 0,
+        .max_packet_size = 64,
+        .configuration_count = 1
+};
+
 /** Keyboard callbacks.
  * We abuse the fact that static variables are zero-filled.
@@ -81 +93 @@
 static usbvirt_device_t keyboard_dev = {
         .ops = &keyboard_ops,
+        .standard_descriptor = &std_descriptor,
         .device_id_ = USBVIRT_DEV_KEYBOARD_ID
 };

uspace/lib/usbvirt/Makefile

@@ -36 +36 @@
         ctrlpipe.c \
         incoming.c \
-        main.c
+        main.c \
+        stdreq.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbvirt/ctrlpipe.c

@@ -37 +37 @@
 #include "private.h"
 
+#define REQUEST_TYPE_STANDARD 0 
+#define REQUEST_TYPE_CLASS 1
+
+#define GET_MIDBITS_MASK(size, shift) \
+        (((1 << size) - 1) << shift)
+#define GET_MIDBITS(value, size, shift) \
+        ((value & GET_MIDBITS_MASK(size, shift)) >> shift)
+
+static usb_direction_t request_get_direction(uint8_t request_type)
+{
+        int bit7 = GET_MIDBITS(request_type, 1, 7);
+        return bit7 ? USB_DIRECTION_IN : USB_DIRECTION_OUT;
+}
+
+static int request_get_type(uint8_t request_type)
+{
+        return GET_MIDBITS(request_type, 2, 5);
+}
+
+static int request_get_recipient(uint8_t request_type)
+{
+        return GET_MIDBITS(request_type, 5, 0);
+}
+
+
+typedef struct {
+        uint8_t request_type;
+        uint8_t request;
+        uint16_t value;
+        uint16_t index;
+        uint16_t length;
+} __attribute__ ((packed)) devreq_setup_packet_t;
+
 int control_pipe(void *buffer, size_t size)
 {
-        // TODO
+        if (size < sizeof(devreq_setup_packet_t)) {
+                return ENOMEM;
+        }
+        
+        devreq_setup_packet_t *request = (devreq_setup_packet_t *) buffer;
+        uint8_t *remaining_data = ((uint8_t *) request) + sizeof(devreq_setup_packet_t);
+        
+        usb_direction_t direction = request_get_direction(request->request_type);
+        int type = request_get_type(request->request_type);
+        int recipient = request_get_recipient(request->request_type);
+        
+        
+        switch (type) {
+                case REQUEST_TYPE_STANDARD:
+                        return handle_std_request(direction, recipient,
+                            request->request, request->value,
+                            request->index, request->length,
+                            remaining_data);
+                        break;
+                case REQUEST_TYPE_CLASS:
+                        if (DEVICE_HAS_OP(device, on_devreq_class)) {
+                                return device->ops->on_devreq_class(device,
+                                    direction, recipient,
+                                    request->request, request->value,
+                                    request->index, request->length,
+                                    remaining_data);
+                        }
+                        break;
+                default:
+                        break;
+        }
+        
         return EOK;
 }

uspace/lib/usbvirt/device.h

@@ -37 +37 @@
 
 #include <usb/hcd.h>
+#include <usb/device.h>
 #include <usb/devreq.h>
 
@@ -43 +44 @@
 typedef int (*usbvirt_on_devreq_t)(struct usbvirt_device *dev,
     usb_direction_t, int recipient,
-    usb_stddevreq_t, int value, int index, int length);
+    uint8_t request, uint16_t value, uint16_t index, uint16_t length,
+    uint8_t *remaining_data);
 
 typedef struct {
@@ -64 +66 @@
             usb_endpoint_t endpoint, void *buffer, size_t size);
         
+        
+        
+        /* Device attributes. */
+        
+        /** Standard device descriptor.
+         * If this descriptor is set (i.e. not NULL), the framework
+         * automatically handles call for its retrieval.
+         */
+        usb_standard_device_descriptor_t *standard_descriptor;
+        
+        
+        /* Private attributes. */
+        
         /** Phone to HC.
          * @warning Do not change, this is private variable.

uspace/lib/usbvirt/private.h

@@ -41 +41 @@
 extern usbvirt_device_t *device;
 
+#define DEVICE_HAS_OP(dev, op) \
+        ( \
+                (  ((dev)->ops) != NULL  ) \
+                && \
+                (  ((dev)->ops->op) != NULL  ) \
+        )
 
 int usbvirt_data_to_host(struct usbvirt_device *dev,
@@ -49 +55 @@
 int control_pipe(void *buffer, size_t size);
 
+int handle_std_request(usb_direction_t direction, int recipient,
+    uint16_t request, uint16_t value, uint16_t index, uint16_t length,
+    uint8_t *remaining_data);
+
 #endif
 /**