stronger autopep8 whitespace cleanup

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

diff --git a/src/spec/gen.py b/src/spec/gen.py
index 3c66f34a7c8412caa90ac9b87debe5e51e97b130..36b815e87c846e11f689ed68e14d7422d0749984 100644 (file)
--- a/src/spec/gen.py
+++ b/src/spec/gen.py
@@ -20,18 +20,18 @@ def specgen(pth, pinouts, bankspec, fixedpins):
             with open(os.path.join(pth, '%s.txt' % k.lower()), 'w') as g:
                 if len(s0.pingroup) == 1:  # only one function, grouped higher
                     for ks in s.keys():  # grouped by interface
-                        k = "%s_%s" % (s[ks].fname, s[ks].suffix)
+                        assert False, "TODO, single-function"
+                        fntype = 'inout'  # XXX TODO
+                        k = s[ks].suffix
                         k_ = k.lower()
                         g.write("%s\t%s\n" % (k_, fntype))
                 else:
                     for pinname in s0.pingroup:
                         fntype = s0.fntype.get(pinname, 'inout')
-                        k_ = k.lower()
                         pn = pinname.lower()
-                        g.write("%s_%s\t%s\n" % (k_, pn, fntype))
+                        g.write("%s\t%s\n" % (pn, fntype))
 
-    pks = pinouts.keys()
-    pks.sort()
+    pks = sorted(pinouts.keys())
 
     # truly dreadful way to work out the max mux size...
     muxsz = 0
@@ -39,15 +39,22 @@ def specgen(pth, pinouts, bankspec, fixedpins):
         for m in pinouts[k].keys():
             muxsz = max(muxsz, m + 1)
 
+    # write out the mux...
     with open(os.path.join(pth, 'pinmap.txt'), 'w') as g:
         for k in pks:
             res = [str(k)]
             # append pin mux
             for midx in range(muxsz):
-                if pinouts[k].has_key(midx):
+                if midx in pinouts[k]:
                     fname = pinouts[k][midx][0]
                 else:
                     fname = ''
-                print k, midx, fname
                 res.append(fname.lower())
             g.write('\t'.join(res) + '\n')
+
+    # ... and the dedicated pins
+    with open(os.path.join(pth, 'fixedpins.txt'), 'w') as g:
+        for p in fixedpins:
+            p = map(str, p)
+            p = map(str.lower, p)
+            g.write('\t'.join(p) + '\n')