Changeset c9399c0 in mainline for uspace/lib/usbvirt

Timestamp:

2013-01-05T17:05:37Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2a6e2358

Parents:

d1974966

Message:

libusbvirt: Drop custom request type format.

use the one provided by libusb.

Location:

uspace/lib/usbvirt

Files:

• include/usbvirt/device.h (modified) (1 diff)
• src/ctrltransfer.c (modified) (2 diffs)
• src/stdreq.c (modified) (3 diffs)

uspace/lib/usbvirt/include/usbvirt/device.h

@@ -94 +94 @@
  */
 typedef struct {
-        /** Request direction (in or out). */
-        usb_direction_t req_direction;
-        /** Request recipient (device, interface or endpoint). */
-        usb_request_recipient_t req_recipient;
-        /** Request type (standard, class or vendor). */
-        usb_request_type_t req_type;
+        /* Request type. See usb/request.h */
+        uint8_t request_type;
         /** Actual request code. */
         uint8_t request;

uspace/lib/usbvirt/src/ctrltransfer.c

@@ -60 +60 @@
                 return EFORWARD;
         }
-
-        usb_direction_t direction = setup->request_type & 128 ?
-            USB_DIRECTION_IN : USB_DIRECTION_OUT;
-        usb_request_recipient_t req_recipient = setup->request_type & 31;
-        usb_request_type_t req_type = (setup->request_type >> 5) & 3;
-
         usbvirt_control_request_handler_t *handler = control_handlers;
-        while (handler->callback != NULL) {
-                if (handler->req_direction != direction) {
-                        goto next;
-                }
-                if (handler->req_recipient != req_recipient) {
-                        goto next;
-                }
-                if (handler->req_type != req_type) {
-                        goto next;
-                }
-                if (handler->request != setup->request) {
-                        goto next;
+        for (;handler->callback != NULL; ++handler) {
+                if (handler->request != setup->request ||
+                    handler->request_type != setup->request_type) {
+                        continue;
                 }
 
@@ -84 +70 @@
                     usb_debug_str_buffer((uint8_t*) setup, sizeof(*setup), 0));
                 int rc = handler->callback(dev, setup, data, data_sent_size);
-                if (rc == EFORWARD) {
-                        goto next;
+                if (rc != EFORWARD) {
+                        return rc;
                 }
 
-                return rc;
-
-next:
-                handler++;
         }
 

uspace/lib/usbvirt/src/stdreq.c

@@ -192 +192 @@
 usbvirt_control_request_handler_t library_handlers[] = {
         {
-                .req_direction = USB_DIRECTION_OUT,
-                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
-                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
                 .request = USB_DEVREQ_SET_ADDRESS,
                 .name = "SetAddress",
@@ -200 +198 @@
         },
         {
-                .req_direction = USB_DIRECTION_IN,
-                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
-                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .name = "GetDescriptor",
@@ -208 +204 @@
         },
         {
-                .req_direction = USB_DIRECTION_OUT,
-                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
-                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
                 .request = USB_DEVREQ_SET_CONFIGURATION,
                 .name = "SetConfiguration",
                 .callback = req_set_configuration
         },
-
         { .callback = NULL }
 };