Changes in uspace/lib/usbvirt/src/ctrltransfer.c [81da273b:9d58539] in mainline

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,
-    const usbvirt_control_request_handler_t *control_handlers,
-    const usb_device_request_setup_packet_t *setup,
+    usbvirt_control_request_handler_t *control_handlers,
+    usb_device_request_setup_packet_t *setup,
     uint8_t *data, size_t *data_sent_size)
 {
@@ -60 +60 @@
                 return EFORWARD;
         }
-        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;
+
+        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;
                 }
 
@@ -70 +84 @@
                     usb_debug_str_buffer((uint8_t*) setup, sizeof(*setup), 0));
                 int rc = handler->callback(dev, setup, data, data_sent_size);
-                if (rc != EFORWARD) {
-                        return rc;
+                if (rc == EFORWARD) {
+                        goto next;
                 }
 
+                return rc;
+
+next:
+                handler++;
         }