pass in muxwidth as argument

[pinmux.git] / src / spec / ifaceprint.py

diff --git a/src/spec/ifaceprint.py b/src/spec/ifaceprint.py
index f8b95d2593ec15544ca8f7a8b8500b2412e6546c..51088f52bdbbe56c728d9217eb5b2b452c394ee4 100644 (file)
--- a/src/spec/ifaceprint.py
+++ b/src/spec/ifaceprint.py
@@ -3,7 +3,7 @@
 from copy import deepcopy
 
 
-def display(of, pins, banksel=None):
+def display(of, pins, banksel=None, muxwidth=4):
     of.write("""\
 | Pin | Mux0        | Mux1        | Mux2        | Mux3        |
 | --- | ----------- | ----------- | ----------- | ----------- |
@@ -13,7 +13,7 @@ def display(of, pins, banksel=None):
         pdata = pins.get(pin)
         if banksel:
             skip = False
-            for mux in range(4):
+            for mux in range(muxwidth):
                 if mux not in pdata:
                     continue
                 name, bank = pdata[mux]
@@ -22,7 +22,7 @@ def display(of, pins, banksel=None):
             if skip:
                 continue
         res = '| %3d |' % pin
-        for mux in range(4):
+        for mux in range(muxwidth):
             if mux not in pdata:
                 res += "             |"
                 continue
@@ -136,9 +136,9 @@ def check_functions(of, title, bankspec, fns, pins, required, eint, pwm,
                 continue
             for k in pins.fnspec.keys():
                 if fname.startswith(k):
-                    fk = pins.fnspec[k].keys()
+                    fk = list(pins.fnspec[k].keys())
                     fn = pins.fnspec[k]
-                    fn = fn[list(fn.keys())[0]]
+                    fn = fn[fk[0]]
                     #print fname, fn, dir(fn)
                     if count == 100000:
                         count = len(fn.pingroup)
@@ -167,8 +167,8 @@ def check_functions(of, title, bankspec, fns, pins, required, eint, pwm,
             of.write("* %s %d %s%d/%d\n" % (fname, pin_, bank, pin, mux))
 
         if removedcount != count:
-            print ("not all found", name, removedcount, count, title, found, \
-                    fns[fname])
+            print ("not all found", name, removedcount, count, title, found,
+                   fns[fname])
             print ("pins found", pinfound)
 
         # fnidx.sort(fnsort)