cleanup mux ota mode symbols

diff --git a/python-lib/mpsse-test.py b/python-lib/mpsse-test.py
index 7f0b21f9de031a245d5e9acf69474eaa3259568a..0e39e1c56a66567ca61a83de768e09bd768a15c0 100755 (executable)
--- a/python-lib/mpsse-test.py
+++ b/python-lib/mpsse-test.py
@@ -185,7 +185,7 @@ chain.write()
 mux.selA = 48
 mux.selB = 48
 for ota in mux.ota:
-    ota.mode = mux.CAL_CMP
+    ota.mode = ota.MUX_CMP
     ota.fast = 1
     ota.gain = 8
     ota.offset = 0
@@ -207,7 +207,7 @@ arb.write()
 amux.selA = 48
 amux.selB = 48
 for ota in amux.ota:
-    ota.mode = mux.CAL_CMP
+    ota.mode = ota.CAL_CMP
     ota.fast = 1
     ota.gain = 8
     ota.offset = 0

diff --git a/python-lib/usbio.py b/python-lib/usbio.py
index 52c08e83c1034fe1275b6c38f3764d5a2950122d..f83149f7bc695b516d0fe91f735892922fb89193 100644 (file)
--- a/python-lib/usbio.py
+++ b/python-lib/usbio.py
@@ -427,8 +427,14 @@ class OTA(object):
 
 class MuxOTA(OTA):
     """Cast bits cint and zero as the mode.  Bit se is unused."""
-    MODE_SHIFT = 14
-    MODE_WIDTH = 2
+    MODE_SHIFT = 13
+    MODE_WIDTH = 3
+
+    # mode symbols
+    MUX_CMP = 0
+    MUX_BUF = 2
+    CAL_CMP = 4
+    CAL_BUF = 6
 
     @property
     def mode(self):
@@ -522,17 +528,11 @@ class Chain(object):
 class Mux(object):
     MUX_WIDTH = 48
     SEL_WIDTH = 6
-    MODE_WIDTH = 2
     SEL_A_SHIFT = 40
     SEL_B_SHIFT = 32
     OTA_A_SHIFT = 16
     OTA_B_SHIFT = 0
 
-    # mode symbols
-    MUX_CMP = 0
-    MUX_BUF = 1
-    CAL_CMP = 2
-    CAL_BUF = 3
 
     def __init__(self, spibus, csname):
         self.bus = spibus
@@ -542,8 +542,8 @@ class Mux(object):
         self._selB = intbv(48, max=2**self.SEL_WIDTH) #select CMI
         self.otaA = MuxOTA()
         self.otaB = MuxOTA()
-        self.otaA.mode = self.MUX_BUF
-        self.otaB.mode = self.MUX_BUF
+        self.otaA.mode = self.otaA.MUX_BUF
+        self.otaB.mode = self.otaB.MUX_BUF
         self.ota = (self.otaA, self.otaB)
 
     def __str__(self):