Changeset b5c92d7 in mainline

Timestamp:

2018-01-19T22:42:46Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

609f3f73

Parents:

4c03793

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 22:42:44)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-19 22:42:46)

Message:

libusbdev: pass correct endpoint index to reset endpoint

… and do not trust that the index is correct in libusbhost.

Location:

uspace/lib

Files:

• usbdev/src/request.c (modified) (1 diff)
• usbhost/src/utility.c (modified) (1 diff)

uspace/lib/usbdev/src/request.c

@@ -843 +843 @@
                 return EINVAL;
         }
-        return usb_request_clear_endpoint_halt(ctrl_pipe,
-            target_pipe->desc.endpoint_no);
+
+        uint16_t index = target_pipe->desc.endpoint_no;
+        index |= (target_pipe->desc.direction == USB_DIRECTION_IN) << 7;
+        return usb_request_clear_endpoint_halt(ctrl_pipe, index);
 }
 

uspace/lib/usbhost/src/utility.c

@@ -233 +233 @@
                 if ((request->request_type == 0x2) &&
                     (request->value == USB_FEATURE_ENDPOINT_HALT)) {
-                        const unsigned index = uint16_usb2host(request->index);
-                        const unsigned ep_num = index & 0xf;
+                        const uint16_t index = uint16_usb2host(request->index);
+                        const usb_endpoint_t ep_num = index & 0xf;
                         const usb_direction_t dir = (index >> 7) ? USB_DIRECTION_IN : USB_DIRECTION_OUT;
 
                         endpoint_t *ep = bus_find_endpoint(dev, ep_num, dir);
-                        reset_cb(ep);
+                        if (ep) {
+                                reset_cb(ep);
+                                endpoint_del_ref(ep);
+                        } else {
+                                usb_log_warning("Device(%u): Resetting unregistered endpoint %u %s.", dev->address, ep_num, usb_str_direction(dir));
+                        }
                 }
                 break;