Replace shelling out to fxload with CypressFX.FX2 calls

Makefile

@@ -11,6 +11,7 @@ conda:
 	conda config --add channels timvideos
 	conda install openocd
 	pip install pyusb
+	pip install git+https://github.com/John-K/CypressFX.git
 	pip install pep8
 	pip install autopep8
 	pip install setuptools-pep8

hdmi2usb/modeswitch/boards.py

@@ -19,8 +19,9 @@
 
 from collections import namedtuple
 
-from . import lsusb as usbapi
+from . import libusb as usbapi
 from . import files
+from CypressFX import FX2
 
 
 def assert_in(needle, haystack):
@@ -103,7 +104,10 @@ def firmware_path(filepath):
 class Board(BoardBase):
 
     def tty(self):
-        return self.dev.tty()
+        try:
+            return self.dev.tty()
+        except AttributeError:
+            return None
 
 
 def load_fx2(board, mode=None, filename=None, verbose=False):
@@ -122,27 +126,22 @@ def load_fx2(board, mode=None, filename=None, verbose=False):
 
     sys.stderr.write("Using FX2 firmware %s\n" % filename)
 
-    cmdline = "fxload -t fx2lp".split()
-    cmdline += ["-D", str(board.dev.path)]
-    cmdline += ["-I", filepath]
-    if verbose:
-        cmdline += ["-v", ]
-
-    if verbose:
-        sys.stderr.write("Running %r\n" % " ".join(cmdline))
-
-    env = os.environ.copy()
-    env['PATH'] = env['PATH'] + ':/usr/sbin:/sbin'
+    fx2 = FX2(board.dev.libusb_open())
+    if not fx2:
+        print("Could not intantiate FX2 from {}".format(board.dev._str()))
+        raise
 
     try:
-        output = subprocess.check_output(
-            cmdline, stderr=subprocess.STDOUT, env=env)
-        if verbose > 2:
-            sys.stderr.write(output.decode('utf-8'))
-    except subprocess.CalledProcessError as e:
-        if b"can't modify CPUCS: Protocol error\n" not in e.output:
-            print(e.output)
+        bytes_programmed = fx2.load_intelhex_firmware(filepath)
+        if bytes_programmed < 1:
+            print("Was unable to program any bytes to {}".format(
+                  board.dev._str()))
             raise
+        if verbose > 2:
+            print("Programmed {} bytes".format(bytes_programmed))
+    except IOError as e:
+        print(e.args[-1])
+        raise
 
 
 def flash_fx2(board, filename, verbose=False):

hdmi2usb/modeswitch/cli.py

@@ -179,7 +179,7 @@ def find_boards(args):
                 board.state,
                 board.dev.path,
             ))
-            for sp in board.dev.syspaths:
+            for sp in getattr(board.dev, "syspaths", []):
                 sys.stderr.write(" %s\n" % (sp,))
 
             if board.dev.inuse():

hdmi2usb/modeswitch/libusb.py

@@ -21,8 +21,7 @@ class LibDevice(DeviceBase):
     def inuse(self, dev=None):
         try:
             if dev is None:
-                dev = usb.core.find(bus=self.path.bus,
-                                    address=self.path.address)
+                dev = self.libusb_open()
 
             # config = dev.get_active_configuration()
             active = False
@@ -37,7 +36,7 @@ def inuse(self, dev=None):
 
     def detach(self):
         # Detach any driver currently attached.
-        dev = usb.core.find(bus=self.path.bus, address=self.path.address)
+        dev = self.libusb_open()
 
         if not self.inuse(dev):
             return True
@@ -47,6 +46,15 @@ def detach(self):
             if dev.is_kernel_driver_active(inf.bInterfaceNumber):
                 dev.detach_kernel_driver(inf.bInterfaceNumber)
 
+    def drivers(self):
+        if self.inuse():
+            return ["unknown"]
+        else:
+            return []
+
+    def libusb_open(self):
+        return usb.core.find(bus=self.path.bus, address=self.path.address)
+
 
 Device = LibDevice