Get Wishbone from c4m lib.

[c4m-jtag.git] / c4m / nmigen / jtag / tap.py

diff --git a/c4m/nmigen/jtag/tap.py b/c4m/nmigen/jtag/tap.py
index 0e4de64a43e03e646114301e3614fa27a2da7506..725e7e6321df9c5b5f511c74519de746f790916d 100755 (executable)
--- a/c4m/nmigen/jtag/tap.py
+++ b/c4m/nmigen/jtag/tap.py
@@ -4,15 +4,14 @@ import os
 from nmigen import *
 from nmigen.build import *
 from nmigen.lib.io import *
+from nmigen.tracer import get_var_name
 
-from wishbone import Wishbone
+from c4m_repo.nmigen.lib import Wishbone
 
 __all__ = [
-    "JTAG",
+    "TAP",
 ]
 
-#TODO: Provide more documentation
-
 
 class ShiftReg(Elaboratable):
     def __init__(self, ircodes, length, domain):
@@ -171,7 +170,8 @@ class JTAGWishbone(Elaboratable):
         return m
 
 
-class JTAG(Elaboratable):
+class TAP(Elaboratable):
+    #TODO: Document TAP
     @staticmethod
     def _add_files(platform, prefix):
         d = os.path.realpath("{dir}{sep}{par}{sep}{par}{sep}vhdl{sep}jtag".format(
@@ -222,7 +222,7 @@ class JTAG(Elaboratable):
         self._wbs = []
 
     def elaborate(self, platform):
-        JTAG._add_files(platform, "jtag" + os.path.sep)
+        TAP._add_files(platform, "jtag" + os.path.sep)
 
         m = Module()