move pin-adding into separate function in JTAG class

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

diff --git a/src/spec/jtag.py b/src/spec/jtag.py
index efda2806c07e6f01f3e8501e9bcdd8245fc63991..56aadbb839707b8041cf6fa4fede354508790bf2 100644 (file)
--- a/src/spec/jtag.py
+++ b/src/spec/jtag.py
@@ -14,13 +14,14 @@ iotypes = {'-': IOType.In,
            '>': IOType.TriOut,
            '*': IOType.InTriOut,
         }
-
+# Resources
+# nmigen Resources has a different encoding for direction: "i", "o", "io", "oe"
 resiotypes = {'i': IOType.In,
            'o': IOType.Out,
            'oe': IOType.TriOut,
            'io': IOType.InTriOut,
         }
-
+# How many bits in each signal type
 scanlens = {IOType.In: 1,
            IOType.Out: 1,
            IOType.TriOut: 2,
@@ -79,11 +80,7 @@ class JTAG(TAP, Pins):
         # we store the boundary scan register offset in the IOConn record
         self.ios = {} # these are enumerated in external_ports
         self.scan_len = 0
-        for fn, pin, iotype, pin_name, scan_idx in list(self):
-            io = self.add_io(iotype=iotype, name=pin_name)
-            io._scan_idx = scan_idx # hmm shouldn't really do this
-            self.scan_len += scan_idx # record full length of boundary scan
-            self.ios[pin_name] = io
+        self.add_pins(list(self))
 
         # this is redundant.  or maybe part of testing, i don't know.
         self.sr = self.add_shiftreg(ircode=4, length=3,
@@ -110,6 +107,13 @@ class JTAG(TAP, Pins):
         self.sr_en = self.add_shiftreg(ircode=11, length=len(en_sigs),
                                        domain=domain)
 
+    def add_pins(self, pinlist):
+        for fn, pin, iotype, pin_name, scan_idx in pinlist:
+            io = self.add_io(iotype=iotype, name=pin_name)
+            io._scan_idx = scan_idx # hmm shouldn't really do this
+            self.scan_len += scan_idx # record full length of boundary scan
+            self.ios[pin_name] = io
+
     def elaborate(self, platform):
         m = super().elaborate(platform)
         m.d.comb += self.sr.i.eq(self.sr.o) # loopback as part of test?