Changeset d97d209 in mainline

Timestamp:

2010-10-10T22:01:32Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2c970ee

Parents:

0e41957

Message:

API change in virtual USB device

Instead of passing individual items of device request, the whole
structure is passed-in.

Location:

uspace

Files:

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

uspace/app/virtusbkbd/virtusbkbd.c

@@ -47 +47 @@
 #include <usb/hcd.h>
 #include <usb/device.h>
+#include <usb/hid.h>
 #include <usbvirt/device.h>
 #include <usbvirt/hub.h>
@@ -70 +71 @@
 }
 
+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);
+        
+        return EOK;
+}
+
 static usb_standard_device_descriptor_t std_descriptor = {
         .length = sizeof(usb_standard_device_descriptor_t),
@@ -85 +94 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
+        .on_devreq_class = on_class_request,
         .on_data = on_incoming_data
 };

uspace/lib/usbvirt/ctrlpipe.c

@@ -45 +45 @@
         ((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)
 {
@@ -56 +50 @@
 }
 
-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)
 {
-        if (size < sizeof(devreq_setup_packet_t)) {
+        if (size < sizeof(usb_device_request_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_device_request_setup_packet_t *request = (usb_device_request_setup_packet_t *) buffer;
+        uint8_t *remaining_data = ((uint8_t *) request) + sizeof(usb_device_request_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);
+                        return handle_std_request(request, 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);
+                                    request, remaining_data);
                         }
                         break;

uspace/lib/usbvirt/device.h

@@ -42 +42 @@
 struct usbvirt_device;
 
-typedef int (*usbvirt_on_devreq_t)(struct usbvirt_device *dev,
-    usb_direction_t, int recipient,
-    uint8_t request, uint16_t value, uint16_t index, uint16_t length,
-    uint8_t *remaining_data);
+typedef int (*usbvirt_on_device_request_t)(struct usbvirt_device *dev,
+        usb_device_request_setup_packet_t *request,
+        uint8_t *data);
 
 typedef struct {
-        usbvirt_on_devreq_t on_devreq_std;
-        usbvirt_on_devreq_t on_devreq_class;
+        usbvirt_on_device_request_t on_devreq_std;
+        usbvirt_on_device_request_t on_devreq_class;
         int (*on_data)(struct usbvirt_device *dev,
             usb_endpoint_t endpoint, void *buffer, size_t size);

uspace/lib/usbvirt/private.h

@@ -55 +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);
+int handle_std_request(usb_device_request_setup_packet_t *request, uint8_t *data);
 
 #endif

uspace/lib/usbvirt/stdreq.c

@@ -81 +81 @@
 }
 
-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)
+int handle_std_request(usb_device_request_setup_packet_t *request, uint8_t *data)
 {
         int rc;
         
-        switch (request) {
+        switch (request->request) {
                 case USB_DEVREQ_GET_DESCRIPTOR:
-                        rc = handle_get_descriptor(value >> 8, (uint8_t) value,
-                            index, length);
+                        rc = handle_get_descriptor(
+                            request->value_low, request->value_high,
+                            request->index, request->length);
                         break;
                 
                 case USB_DEVREQ_SET_ADDRESS:
-                        rc = handle_set_address(value, index, length);
+                        rc = handle_set_address(request->value,
+                            request->index, request->length);
                         break;
                 
@@ -108 +108 @@
         if (rc == EFORWARD) {
                 if (DEVICE_HAS_OP(device, on_devreq_std)) {
-                        return device->ops->on_devreq_std(device, direction,
-                            recipient,
-                            request, value, index,
-                            length, remaining_data);
+                        return device->ops->on_devreq_std(device,
+                            request, data);
                 }
         }