add pinspec to json output

diff --git a/src/spec/ifaceprint.py b/src/spec/ifaceprint.py
index d5ad116b85a61c968904e371577b77287cb91e45..dba37e651a426fea980a2d4783d293fe3682d7f5 100644 (file)
--- a/src/spec/ifaceprint.py
+++ b/src/spec/ifaceprint.py
@@ -92,7 +92,7 @@ def python_pindict(of, pinmap, pins, function_names, dname, remap):
     of.write("%s = {\n" % dname)
 
     for k, pingroup in pins.byspec.items():
-        (a, n) = k
+        (a, n) = k.split(":")
         if n.isdigit():
             a = "%s%s" % (a, n)
         fblower = a.lower()

diff --git a/src/spec/interfaces.py b/src/spec/interfaces.py
index c59a83d1530a26f44a822f4dd5b856dd6475c15d..f66e474d4a9d8a52a7768e920da50e753bf3e99e 100644 (file)
--- a/src/spec/interfaces.py
+++ b/src/spec/interfaces.py
@@ -77,7 +77,7 @@ class PinGen(object):
             prefix = self.fname
         if start and limit:  # limit turns into an offset from start
             limit = start + limit
-        sk = (self.fname, suffix)
+        sk = "%s:%s" % (self.fname, str(suffix))
         print "pingroup pre", sk, pingroup
         pingroup = pingroup[start:limit]  # see comment in spec.pinfunctions
         print "pingroup post", sk, pingroup

diff --git a/src/spec/ls180.py b/src/spec/ls180.py
index 2869a011ec1b68551ba3fbbcc1f588f6bbfe23ce..9fdf135bab189d53002ac7ef18625830b960d00c 100644 (file)
--- a/src/spec/ls180.py
+++ b/src/spec/ls180.py
@@ -350,6 +350,8 @@ def pinparse(psp, pinspec):
     pprint(domains)
     print "chip clocks (excluding sys-default)"
     pprint(clocks)
+    print "pin spec"
+    pprint(psp.byspec)
 
     chip = {
              'pads.south'      : ps,
@@ -357,6 +359,7 @@ def pinparse(psp, pinspec):
               'pads.north'      : pn,
               'pads.west'       : pw,
               'pads.instances' : iopads,
+              'pins.specs' : psp.byspec,
               'chip.domains' : domains,
               'chip.clocks' : clocks,
               'chip.n_intpower': n_intpower,