Changeset 73301a0 in mainline

Timestamp:

2010-10-15T12:57:35Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

47e3a8e

Parents:

cbc00a4d

Message:

Virtual USB keyboard sends its report

Also, the virtual USB framework now handles the standard requests
differently. First, all requests has standalone callbacks and the
user callbacks are always called first. If they return EFORWARD,
the framework will try to satisfy the request by itself.

Location:

uspace

Files:

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

uspace/app/virtusbkbd/Makefile

@@ -38 +38 @@
         kbdconfig.c \
         keys.c \
+        stdreq.c \
         virtusbkbd.c
 

uspace/app/virtusbkbd/virtusbkbd.c

@@ -54 +54 @@
 #include "kbdconfig.h"
 #include "keys.h"
+#include "stdreq.h"
 
 #define LOOPS 5
@@ -76 +77 @@
 static int on_class_request(struct usbvirt_device *dev,
     usb_device_request_setup_packet_t *request, uint8_t *data)
-{
+{       
         printf("%s: class request (%d)\n", NAME, (int) request->request);
         
@@ -86 +87 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .on_devreq_class = on_class_request,
+        .standard_request_ops = &standard_request_ops,
+        .on_class_device_request = on_class_request,
         .on_data = on_incoming_data
 };

uspace/lib/usb/descriptor.h

@@ -45 +45 @@
         USB_DESCTYPE_STRING = 3,
         USB_DESCTYPE_INTERFACE = 4,
-        USB_DESCTYPE_ENDPOINT = 5
+        USB_DESCTYPE_ENDPOINT = 5,
+        USB_DESCTYPE_HID = 0x21,
+        USB_DESCTYPE_HID_REPORT = 0x22,
+        USB_DESCTYPE_HID_PHYSICAL = 0x23,
+        /* USB_DESCTYPE_ = */
 } usb_descriptor_type_t;
 

uspace/lib/usbvirt/ctrlpipe.c

@@ -68 +68 @@
                         break;
                 case REQUEST_TYPE_CLASS:
-                        if (DEVICE_HAS_OP(device, on_devreq_class)) {
-                                return device->ops->on_devreq_class(device,
+                        if (DEVICE_HAS_OP(device, on_class_device_request)) {
+                                return device->ops->on_class_device_request(device,
                                     request, remaining_data);
                         }

uspace/lib/usbvirt/device.h

@@ -46 +46 @@
         uint8_t *data);
 
+/** Callbacks for standard device requests.
+ * When these functions are NULL or return EFORWARD, this
+ * framework will try to satisfy the request by itself.
+ */
+typedef struct {
+        usbvirt_on_device_request_t on_get_status;
+        usbvirt_on_device_request_t on_clear_feature;
+        usbvirt_on_device_request_t on_set_feature;
+        usbvirt_on_device_request_t on_set_address;
+        usbvirt_on_device_request_t on_get_descriptor;
+        usbvirt_on_device_request_t on_set_descriptor;
+        usbvirt_on_device_request_t on_get_configuration;
+        usbvirt_on_device_request_t on_set_configuration;
+        usbvirt_on_device_request_t on_get_interface;
+        usbvirt_on_device_request_t on_set_interface;
+        usbvirt_on_device_request_t on_synch_frame;
+} usbvirt_standard_device_request_ops_t;
+
 /** Device operations. */
 typedef struct {
-        /** Callback for standard USB request.
-         * Called only when the request could not be handled by this
-         * framework.
-         */
-        usbvirt_on_device_request_t on_devreq_std;
+        /** Callbacks for standard deivce requests. */
+        usbvirt_standard_device_request_ops_t *standard_request_ops;
         /** Callback for class-specific USB request. */
-        usbvirt_on_device_request_t on_devreq_class;
+        usbvirt_on_device_request_t on_class_device_request;
         /** Callback for all other incoming data. */
         int (*on_data)(struct usbvirt_device *dev,

uspace/lib/usbvirt/stdreq.c

@@ -123 +123 @@
 }
 
+#define HANDLE_REQUEST(request, data, type, dev, user_callback, default_handler) \
+        do { \
+                if ((request)->request == (type)) { \
+                        int _rc = EFORWARD; \
+                        if (((dev)->ops) && ((dev)->ops->standard_request_ops) \
+                            && ((dev)->ops->standard_request_ops->user_callback)) { \
+                                _rc = (dev)->ops->standard_request_ops->\
+                                    user_callback(dev, request, data); \
+                        } \
+                        if (_rc == EFORWARD) { \
+                                default_handler; \
+                        } \
+                        return _rc; \
+                } \
+        } while (false)
+
+
 int handle_std_request(usb_device_request_setup_packet_t *request, uint8_t *data)
 {
-        int rc;
+        HANDLE_REQUEST(request, data, USB_DEVREQ_GET_DESCRIPTOR,
+            device, on_get_descriptor,
+            handle_get_descriptor(request->value_low, request->value_high,
+                request->index, request->length));
         
-        switch (request->request) {
-                case USB_DEVREQ_GET_DESCRIPTOR:
-                        rc = handle_get_descriptor(
-                            request->value_low, request->value_high,
-                            request->index, request->length);
-                        break;
-                
-                case USB_DEVREQ_SET_ADDRESS:
-                        rc = handle_set_address(request->value,
-                            request->index, request->length);
-                        break;
-                
-                default:
-                        rc = EFORWARD;
-                        break;
-        }
+        HANDLE_REQUEST(request, data, USB_DEVREQ_SET_ADDRESS,
+            device, on_set_address,
+            handle_set_address(request->value,
+                request->index, request->length));
         
-        /*
-         * We preprocessed all we could.
-         * If it was not enough, pass the request to the actual driver.
-         */
-        if (rc == EFORWARD) {
-                if (DEVICE_HAS_OP(device, on_devreq_std)) {
-                        return device->ops->on_devreq_std(device,
-                            request, data);
-                }
-        }
-        
-        return EOK;
+        return ENOTSUP;
 }