- Load usb/serial libraries only when used

- FTDIJTAG: Accept devices that have a dead JTAG bus
- Various small fixes
- Whitespace cleanup

Author: Michael Sparmann

modules/theseven/bflsingle/bflsinglehotplug.py

@@ -36,21 +36,21 @@
 
 # Worker main class, referenced from __init__.py
 class BFLSingleHotplugWorker(BaseWorker):
-  
+
   version = "theseven.bflsingle hotplug manager v0.1.0beta"
   default_name = "BFL Single hotplug manager"
   can_autodetect = True
   settings = dict(BaseWorker.settings, **{
     "scaninterval": {"title": "Bus scan interval", "type": "float", "position": 2200},
   })
-  
-  
+
+
   @classmethod
   def autodetect(self, core):
     try:
       import serial
       found = False
-      for port in glob("/dev/serial/by-id/usb-Butterfly_Labs_Inc._BitFORCE_SHA256*"):
+      for port in glob("/dev/serial/by-id/usb-Butterfly_Labs_Inc._BitFORCE_SHA256-*"):
         try:
           handle = serial.Serial(port, 115200, serial.EIGHTBITS, serial.PARITY_NONE, serial.STOPBITS_ONE, 1, False, False, 5, False, None)
           handle.close()
@@ -59,8 +59,8 @@ def autodetect(self, core):
         except: pass
       if found: core.add_worker(self(core))
     except: pass
-    
-    
+
+
   # Constructor, gets passed a reference to the miner core and the saved worker state, if present
   def __init__(self, core, state = None):
     # Initialize bus scanner wakeup event
@@ -69,7 +69,7 @@ def __init__(self, core, state = None):
     # Let our superclass do some basic initialization and restore the state if neccessary
     super(BFLSingleHotplugWorker, self).__init__(core, state)
 
-    
+
   # Validate settings, filling them with default values if neccessary.
   # Called from the constructor and after every settings change.
   def apply_settings(self):
@@ -78,7 +78,7 @@ def apply_settings(self):
     if not "scaninterval" in self.settings or not self.settings.scaninterval: self.settings.scaninterval = 10
     # Rescan the bus immediately to apply the new settings
     with self.wakeup: self.wakeup.notify()
-    
+
 
   # Reset our state. Called both from the constructor and from self.start().
   def _reset(self):
@@ -100,8 +100,8 @@ def _start(self):
     self.mainthread = Thread(None, self.main, self.settings.name + "_main")
     self.mainthread.daemon = True
     self.mainthread.start()
-  
-  
+
+
   # Shut down the worker module. This is protected against multiple calls and concurrency by a wrapper.
   def _stop(self):
     # Let our superclass handle everything that isn't specific to this worker module
@@ -121,34 +121,33 @@ def _stop(self):
       except Exception as e:
         self.core.log(self, "Could not stop worker %s: %s\n" % (child.settings.name, traceback.format_exc()), 100, "rB")
 
-      
+
   # Main thread entry point
   # This thread is responsible for scanning for boards and spawning worker modules for them
   def main(self):
+    import serial
     number = 0
-  
+
     # Loop until we are shut down
     while not self.shutdown:
-    
-      import serial
 
       try:
         boards = {}
-        for port in glob("/dev/serial/by-id/usb-Butterfly_Labs_Inc._BitFORCE_SHA256*"):
+        for port in glob("/dev/serial/by-id/usb-Butterfly_Labs_Inc._BitFORCE_SHA256-*"):
           available = False
           try:
             handle = serial.Serial(port, 115200, serial.EIGHTBITS, serial.PARITY_NONE, serial.STOPBITS_ONE, 1, False, False, 5, False, None)
             handle.close()
             available = True
           except: pass
           boards[port] = available
-                
+
         kill = []
-        for serial, child in self.childmap.items():
-          if not serial in boards:
-            kill.append((serial, child))
-            
-        for serial, child in kill:
+        for port, child in self.childmap.items():
+          if not port in boards:
+            kill.append((port, child))
+
+        for port, child in kill:
           try:
             self.core.log(self, "Shutting down worker %s...\n" % (child.settings.name), 800)
             child.stop()
@@ -162,7 +161,7 @@ def main(self):
           del self.childmap[port]
           try: self.children.remove(child)
           except: pass
-              
+
         for port, available in boards.items():
           if port in self.childmap or not available: continue
           number += 1
@@ -177,7 +176,7 @@ def main(self):
             child.start()
           except Exception as e:
             self.core.log(self, "Could not start worker %s: %s\n" % (child.settings.name, traceback.format_exc()), 100, "rB")
-              
+
       except: self.core.log(self, "Caught exception: %s\n" % traceback.format_exc(), 100, "rB")
-          
+
       with self.wakeup: self.wakeup.wait(self.settings.scaninterval)

modules/theseven/bflsingle/bflsingleworker.py

@@ -27,7 +27,6 @@
 
 
 import os
-import serial
 import time
 import traceback
 from threading import Condition, Thread
@@ -154,6 +153,7 @@ def main(self):
         self.job = None
 
         # Open the serial port
+        import serial
         self.handle = serial.Serial(self.port, 115200, serial.EIGHTBITS, serial.PARITY_NONE, serial.STOPBITS_ONE, 1, False, False, 5, False, None)
 
         # We keep control of the wakeup lock at all times unless we're sleeping

modules/theseven/ftdijtag/driver.py

@@ -411,11 +411,15 @@ def __init__(self, proxy, deviceid, takeover, firmware):
       script["tdomask"] = byte2int(script["tdo"])
       script["ir_to_dr"] = script["leave_shift"] + script["shift_dr"]
       self.outmask |= script["tckmask"] | script["tmsmask"] | script["tdimask"]
-    self.handle.controlMsg(0x40, 3, None, 0, 0, 1000)
+    self.handle.controlMsg(0x40, 3, None, 0, 0)
     self._switch_async()
+    self.initialized = {}
     self.busdevices = {}
     self.devices = []
-    for bus in sorted(self.jtagscript.keys()): self._init_bus(bus)
+    for bus in sorted(self.jtagscript.keys()):
+      self.initialized[bus] = False
+      try: self._init_bus(bus)
+      except Exception as e: self.proxy.log("%s\n" % e, 150, "rB")
 
 
   def _init_bus(self, bus):
@@ -487,6 +491,7 @@ def _init_bus(self, bus):
                              + script["shift_dr"]
     script["readnonce_pull"] = self._tmstail(bus, clock * readnonce_pull_len)
     script["readnonce_tail"] = script["leave_shift"]
+    self.initialized[bus] = True
 
 
   def register(self, device):
@@ -542,16 +547,16 @@ def _tmstail(self, bus, data):
 
 
   def _purge_buffers(self):
-    self.handle.controlMsg(0x40, 0, None, 1, self.index, 1000)
-    self.handle.controlMsg(0x40, 0, None, 2, self.index, 1000)
+    self.handle.controlMsg(0x40, 0, None, 1, self.index)
+    self.handle.controlMsg(0x40, 0, None, 2, self.index)
 
 
   def _set_bit_mode(self, mask, mode):
-    self.handle.controlMsg(0x40, 0xb, None, (mode << 8) | mask, self.index, 1000)
+    self.handle.controlMsg(0x40, 0xb, None, (mode << 8) | mask, self.index)
 
 
   def _get_bit_mode(self):
-    return struct.unpack("B", bytes(bytearray(self.handle.controlMsg(0xc0, 0xc, 1, 0, self.index, 1000))))[0]
+    return struct.unpack("B", bytes(bytearray(self.handle.controlMsg(0xc0, 0xc, 1, 0, self.index))))[0]
 
 
   def _switch_async(self):
@@ -569,7 +574,7 @@ def _write(self, data):
     offset = 0
     while offset < size:
       write_size = min(4096, size - offset)
-      ret = self.handle.bulkWrite(self.outep, data[offset : offset + write_size], 1000)
+      ret = self.handle.bulkWrite(self.outep, data[offset : offset + write_size])
       offset = offset + ret
 
 
@@ -578,7 +583,7 @@ def _read(self, size, timeout = 1):
     data = b""
     offset = 0
     while offset < size and time.time() < timeout:
-      ret = bytes(bytearray(self.handle.bulkRead(self.inep, min(64, size - offset + 2), 1000)))
+      ret = bytes(bytearray(self.handle.bulkRead(self.inep, min(64, size - offset + 2))))
       data += ret[2:]
       offset += len(ret) - 2
     return data
@@ -637,6 +642,7 @@ def read_nonces(self):
     nonces = {}
     for bus in self.jtagscript:
       script = self.jtagscript[bus]
+      if not self.initialized[bus]: continue
       with self.lock:
         self._write(script["readnonce_head"])
         data = self._shift(bus, script["readnonce_pull"])

modules/theseven/ftdijtag/ftdijtaghotplug.py

@@ -26,7 +26,6 @@
 
 
 
-import usb
 import traceback
 from threading import Condition, Thread
 from core.baseworker import BaseWorker
@@ -75,6 +74,7 @@ class FTDIJTAGHotplugWorker(BaseWorker):
   def autodetect(self, core):
     return  #TODO: Remove modules/fpgamining tree and activate this once ztexmerge has been evicted
     try:
+      import usb
       found = False
       try:
         import usb
@@ -196,6 +196,8 @@ def _stop(self):
   # Main thread entry point
   # This thread is responsible for scanning for boards and spawning worker modules for them
   def main(self):
+    import usb
+
     # Loop until we are shut down
     while not self.shutdown:
       try:

modules/theseven/icarus/icarusworker.py

@@ -26,7 +26,6 @@
 
 
 
-import serial
 import time
 import struct
 import traceback
@@ -70,7 +69,7 @@ def apply_settings(self):
     if not "jobinterval" in self.settings or not self.settings.jobinterval: self.settings.jobinterval = 60
     # We can't change the port name or baud rate on the fly, so trigger a restart if they changed.
     # self.port/self.baudrate are cached copys of self.settings.port/self.settings.baudrate
-    if self.started and self.settings.port != self.port or self.settings.baudrate != self.baudrate: self.async_restart()
+    if self.started and (self.settings.port != self.port or self.settings.baudrate != self.baudrate): self.async_restart()
 
 
   # Reset our state. Called both from the constructor and from self.start().
@@ -172,6 +171,7 @@ def main(self):
         self.oldjob = None
 
         # Open the serial port
+        import serial
         self.handle = serial.Serial(self.port, self.baudrate, serial.EIGHTBITS, serial.PARITY_NONE, serial.STOPBITS_ONE, 1, False, False, 5, False, None)
 
         # We keep control of the wakeup lock at all times unless we're sleeping

modules/theseven/simplers232/simplers232worker.py

@@ -26,7 +26,6 @@
 
 
 
-import serial
 import time
 import struct
 import traceback
@@ -70,7 +69,7 @@ def apply_settings(self):
     if not "jobinterval" in self.settings or not self.settings.jobinterval: self.settings.jobinterval = 60
     # We can't change the port name or baud rate on the fly, so trigger a restart if they changed.
     # self.port/self.baudrate are cached copys of self.settings.port/self.settings.baudrate
-    if self.started and self.settings.port != self.port or self.settings.baudrate != self.baudrate: self.async_restart()
+    if self.started and (self.settings.port != self.port or self.settings.baudrate != self.baudrate): self.async_restart()
 
 
   # Reset our state. Called both from the constructor and from self.start().
@@ -173,6 +172,7 @@ def main(self):
         self.nextjob = None
 
         # Open the serial port
+        import serial
         self.handle = serial.Serial(self.port, self.baudrate, serial.EIGHTBITS, serial.PARITY_NONE, serial.STOPBITS_ONE, 1, False, False, 5, False, None)
 
         # Send enough zero bytes to make sure that the device is not expecting data any more.

modules/theseven/webui/api/debug.py

@@ -35,6 +35,5 @@ def dumpthreadstates(core, webui, httprequest, path, request, privileges):
       code.append("\n# Thread: %s(%d)" % (id2name.get(threadId,""), threadId))
       for filename, lineno, name, line in traceback.extract_stack(stack):
           code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
-          if line:
-              code.append("  %s" % (line.strip()))
+          if line: code.append("  %s" % (line.strip()))
   return {"data": "\n".join(code)}