From 89941b2315af83a27035770695a8776d7dd7cb0a Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sat, 28 Apr 2012 21:12:23 +0200 Subject: Increase USB timeout to 2000 msec Signed-off-by: Michael Buesch --- libtoprammer/hardware_access_usb.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libtoprammer/hardware_access_usb.py b/libtoprammer/hardware_access_usb.py index 682dee9..cd44e0a 100644 --- a/libtoprammer/hardware_access_usb.py +++ b/libtoprammer/hardware_access_usb.py @@ -38,6 +38,8 @@ class FoundUSBDev(object): class HardwareAccessUSB(CommandQueue): "Lowlevel USB hardware access" + TIMEOUT_MSEC = 2000 + @classmethod def scan(cls, checkCallback): "Scan for devices. Returns a list of FoundUSBDev()." @@ -110,7 +112,8 @@ class HardwareAccessUSB(CommandQueue): if self.doRawDump: print("Sending command:") dumpMem(data) - self.usbh.bulkWrite(self.bulkOut.address, data) + self.usbh.bulkWrite(self.bulkOut.address, data, + self.TIMEOUT_MSEC) except (usb.USBError), e: raise TOPException("USB bulk write error: " + str(e)) @@ -120,8 +123,9 @@ class HardwareAccessUSB(CommandQueue): self.flushCommands() try: ep = self.bulkIn.address - data = b"".join(map(lambda b: int2byte(b), - self.usbh.bulkRead(ep, size))) + data = b"".join([ int2byte(b) for b in + self.usbh.bulkRead(ep, size, + self.TIMEOUT_MSEC) ]) if len(data) != size: raise TOPException("USB bulk read error: Could not read the " +\ "requested number of bytes (req %d, got %d)" % (size, len(data))) -- cgit v1.2.3