Skip to content

fix hidapi read() have no timeout on windows #2011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hoohaha wants to merge 1 commit into
base: develop
Choose a base branch
from
+4 −1
Open

fix hidapi read() have no timeout on windows #2011

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pyocd/probe/pydapaccess/interface/hidapi_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,10 @@ def read(self):
"""@brief Read data on the IN endpoint associated to the HID interface"""
# Windows doesn't use the read thread, so read directly.
if _IS_WINDOWS:
read_data = bytes(self.device.read(self.packet_size))
# Pass a timeout so the read cannot block forever if the probe stops responding.
read_data = bytes(self.device.read(self.packet_size, timeout_ms=self.DEFAULT_USB_TIMEOUT_MS))
if not read_data:
raise DAPAccessIntf.DeviceError(f"Timeout reading from probe {self.serial_number}")

if TRACE.isEnabledFor(logging.DEBUG):
# Strip off trailing zero bytes to reduce clutter.
Expand Down
Loading