summaryrefslogtreecommitdiff
path: root/extra/usb_serial
diff options
context:
space:
mode:
authorNick Sanders <nsanders@chromium.org>2018-07-02 18:44:50 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-05-24 15:09:15 -0700
commit94468b6b0077e27ab1d25d6a8266deae73bc0e32 (patch)
tree036536ed7ce545408327cb83ab8f9e97c66e848b /extra/usb_serial
parentea1f2d28c3618556cb6d18032eafd15f2d215a6f (diff)
downloadchrome-ec-94468b6b0077e27ab1d25d6a8266deae73bc0e32.tar.gz
ec-devutils: update for pyusb-1.0.2
pyusb 1.0.2 changed two API calls upon which we depend: b3ee6cdfef8f find function returns an iterator. dac78933f6a6 Removed unnecessary length argument to util.get_string This CL only updates callers of these APIs (the previous CL contained some unrelated changes around kernel driver detach and closing stm32usb). Signed-off-by: Nick Sanders <nsanders@chromium.org> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Based-on: https://chromium-review.googlesource.com/1125354 BRANCH=None BUG=chromium:958677 TEST=precq passes TEST=chromiumos-sdk tryjob buildbucketId=8915374561970847360 TEST=using servo v2 servod -b grunt => no python exceptions when starting servod TEST=using servo v4 servod -b grunt => no python exceptions when starting servod TEST=using u-Servo: servod -b grunt => no python exceptions when starting servod for i in {1..10000} ; do echo $i $(dut-control ec_uart_en spi1_buf_en ); done => No stability regression versus pyusb-1.0.0b1 TEST=servo_updater, EC console via servo Cq-Depend: chromium:1597548,chromium:1597156,chromium:1597157 Change-Id: Ic8101707838e5d19e901cf1f7125b97b5102f089 Reviewed-on: https://chromium-review.googlesource.com/1597156 Commit-Ready: Daniel Kurtz <djkurtz@chromium.org> Tested-by: Daniel Kurtz <djkurtz@chromium.org> Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org> Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Diffstat (limited to 'extra/usb_serial')
-rwxr-xr-xextra/usb_serial/console.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/usb_serial/console.py b/extra/usb_serial/console.py
index 3ab73890d5..bc03ea869e 100755
--- a/extra/usb_serial/console.py
+++ b/extra/usb_serial/console.py
@@ -71,7 +71,8 @@ class Susb():
SusbError: An error accessing Susb object
"""
# Find the device.
- dev_list = usb.core.find(idVendor=vendor, idProduct=product, find_all=True)
+ dev_g = usb.core.find(idVendor=vendor, idProduct=product, find_all=True)
+ dev_list = list(dev_g)
if dev_list is None:
raise SusbError("USB device not found")