X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fbsv%2Fperipheral_gen%2Fjtag.py;h=e5f5e2ad3cdb512b69cb983f811ab0e08eaf2d82;hb=9cc8691165170ef5b43b7823c884e99c21a6ab2e;hp=04d4481cbd29c3d08b6a261be1aa0dd4c81bf3c7;hpb=8d57a2e06af1aeb0508c560d6d867d358f95aab6;p=pinmux.git

diff --git a/src/bsv/peripheral_gen/jtag.py b/src/bsv/peripheral_gen/jtag.py
index 04d4481..e5f5e2a 100644
--- a/src/bsv/peripheral_gen/jtag.py
+++ b/src/bsv/peripheral_gen/jtag.py
@@ -4,67 +4,48 @@ from bsv.peripheral_gen.base import PBase
 class jtag(PBase):
 
     def slowimport(self):
-        return "    import jtagtdm::*;\n"
+        return "import jtagdtm::*;\n"
 
     def extfastifinstance(self, name, count):
+        return self._extifinstance(name, count, "_out", "", True)
+
+    def fastifdecl(self, name, count):
         # YUK!
-        print "jtag", name, count
-        return """\
-            method Action tms_i(Bit#(1) tms);
-                {0}.tms_i(tms);
-            endmethod
-            method Action tdi_i(Bit#(1) tdi);
-                {0}.tdi_i(tdi);
-            endmethod
-            method Action bs_chain_i(Bit#(1) bs_chain);
-                {0}.bs_chain_i(bs_chain);
-            endmethod
-            method Bit#(1) shiftBscan2Edge={0}.shiftBscan2Edge;
-            method Bit#(1) selectJtagInput={0}.selectJtagInput;
-            method Bit#(1) selectJtagOutput={0}.selectJtagOutput;
-            method Bit#(1) updateBscan={0}.updateBscan;
-            method Bit#(1) bscan_in={0}.bscan_in;
-            method Bit#(1) scan_shift_en={0}.scan_shift_en;
-            method Bit#(1) tdo={0}.tdo;
-            method Bit#(1) tdo_oe={0}.tdo_oe;
-""".format(self.name, count)
+        return "interface Ifc_jtagdtm jtag{0}_out;".format(count)
 
+    def get_clk_spc(self, typ):
+        return "tck, trst"
 
+    def get_clock_reset(self, name, count):
+        return "slow_clock,  slow_reset"
 
-    def fastifdecl(self, name, count):
-        # YUK!
-        template = """ \
-         (*always_ready,always_enabled*) method Action tms_i(Bit#(1) tms);
-         (*always_ready,always_enabled*) method Action tdi_i(Bit#(1) tdi);
-         (*always_ready,always_enabled*)
-                                 method Action bs_chain_i(Bit#(1) bs_chain);
-         (*always_ready,always_enabled*) method Bit#(1) shiftBscan2Edge;
-         (*always_ready,always_enabled*) method Bit#(1) selectJtagInput;
-         (*always_ready,always_enabled*) method Bit#(1) selectJtagOutput;
-         (*always_ready,always_enabled*) method Bit#(1) updateBscan;
-         (*always_ready,always_enabled*) method Bit#(1) bscan_in;
-         (*always_ready,always_enabled*) method Bit#(1) scan_shift_en;
-         (*always_ready,always_enabled*) method Bit#(1) tdo;
-         (*always_ready,always_enabled*) method Bit#(1) tdo_oe;
-"""
-        return template
+    def pinname_in(self, pname):
+        return {'tms': 'tms',
+                'tdi': 'tdi',
+                }.get(pname, '')
+
+    def pinname_out(self, pname):
+        return {'tck': 'tck',
+                'tdo': 'tdo',
+                }.get(pname, '')
 
     def mkfast_peripheral(self):
         return """\
-        Ifc_jtagdtm jtag{0} <-mkjtagdtm(clocked_by tck, reset_by trst);
-        rule drive_tmp_scan_outs;
-            jtag{0}.scan_out_1_i(1'b0);
-            jtag{0}.scan_out_2_i(1'b0);
-            jtag{0}.scan_out_3_i(1'b0);
-            jtag{0}.scan_out_4_i(1'b0);
-            jtag{0}.scan_out_5_i(1'b0);
-        endrule
+Ifc_jtagdtm jtag{0} <-mkjtagdtm(clocked_by tck, reset_by trst);
+rule drive_tmp_scan_outs;
+    jtag{0}.scan_out_1_i(1'b0);
+    jtag{0}.scan_out_2_i(1'b0);
+    jtag{0}.scan_out_3_i(1'b0);
+    jtag{0}.scan_out_4_i(1'b0);
+    jtag{0}.scan_out_5_i(1'b0);
+endrule
 """
-    def axi_slave_name(self, name, ifacenum, typ=''):
+
+    def axi_slave_name(self, idx, name, ifacenum, typ=None):
         return ''
 
     def axi_slave_idx(self, idx, name, ifacenum, typ):
         return ('', 0)
 
-    def axi_addr_map(self, name, ifacenum):
+    def axi_addr_map(self, name, ifacenum, typ=None):
         return ''