Changeset b4b534ac in mainline for uspace/lib/usbvirt/src/ctrltransfer.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbvirt/src/ctrltransfer.c (modified) (3 diffs)

uspace/lib/usbvirt/src/ctrltransfer.c

@@ -50 +50 @@
  */
 int process_control_transfer(usbvirt_device_t *dev,
-    usbvirt_control_request_handler_t *control_handlers,
-    usb_device_request_setup_packet_t *setup,
+    const usbvirt_control_request_handler_t *control_handlers,
+    const usb_device_request_setup_packet_t *setup,
     uint8_t *data, size_t *data_sent_size)
 {
@@ -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;
+        const usbvirt_control_request_handler_t *handler = control_handlers;
+        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++;
         }