From 6f07c6e7e389a63a4699f0ca846402e491aebb7d Mon Sep 17 00:00:00 2001 From: Kevin Shelton Date: Tue, 4 Jun 2019 09:54:09 -0700 Subject: ec-devutils: restore servo_updater functionality Adds back and uses the close method that was defined in change 1125354. BRANCH=None BUG=chromium:968700 TEST=ran servo updater on a servo that needed an update (so that the version check was exercised twice). Signed-off-by: Kevin Shelton Change-Id: I0ddce9749a3548d5019c138a2a2266fd93a85ca9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1643658 Tested-by: Kevin Shelton Reviewed-by: Nick Sanders Commit-Queue: Kevin Shelton --- extra/tigertool/ecusb/stm32uart.py | 1 + extra/tigertool/ecusb/stm32usb.py | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'extra') diff --git a/extra/tigertool/ecusb/stm32uart.py b/extra/tigertool/ecusb/stm32uart.py index 459ca8e90f..21fcbd2cc2 100644 --- a/extra/tigertool/ecusb/stm32uart.py +++ b/extra/tigertool/ecusb/stm32uart.py @@ -73,6 +73,7 @@ class Suart(object): if self._tx_thread: self._tx_thread.join(2) self._tx_thread = None + self._susb.close() def run_rx_thread(self): """Background loop to pass data from USB to pty.""" diff --git a/extra/tigertool/ecusb/stm32usb.py b/extra/tigertool/ecusb/stm32usb.py index 5a91c57d13..875251329f 100644 --- a/extra/tigertool/ecusb/stm32usb.py +++ b/extra/tigertool/ecusb/stm32usb.py @@ -87,6 +87,8 @@ class Susb(object): except usb.core.USBError: pass + self._dev = dev + # Get an endpoint instance. cfg = dev.get_active_configuration() intf = usb.util.find_descriptor(cfg, bInterfaceNumber=self._interface) @@ -108,3 +110,6 @@ class Susb(object): write_ep_number = intf.bInterfaceNumber + self.WRITE_ENDPOINT write_ep = usb.util.find_descriptor(intf, bEndpointAddress=write_ep_number) self._write_ep = write_ep + + def close(self): + usb.util.dispose_resources(self._dev) -- cgit v1.2.1