Made nmigen code independent of VHDL code.

[c4m-jtag.git] / test / nmigen / cocotb / controller / generate.py

diff --git a/test/nmigen/cocotb/controller/generate.py b/test/nmigen/cocotb/controller/generate.py
index fee62fe81d5d3cfe286cfe5c8eb1cdceb75cf98f..21226ef3bdad5c0e8267257f2b76020e26bda534 100755 (executable)
--- a/test/nmigen/cocotb/controller/generate.py
+++ b/test/nmigen/cocotb/controller/generate.py
@@ -5,7 +5,7 @@ from nmigen import *
 from nmigen.back.verilog import convert
 from nmigen.build import Platform
 
 from nmigen.back.verilog import convert
 from nmigen.build import Platform
 

-from c4m.nmigen.jtag import TAP
+from c4m.nmigen.jtag import TAP, IOType, IOConn

 
 class DummyPlatform(Platform):
     resources = []
 
 class DummyPlatform(Platform):
     resources = []


@@ -16,37 +16,31 @@ class DummyPlatform(Platform):
         raise NotImplementedError
 
 class Top(Elaboratable):
         raise NotImplementedError
 
 class Top(Elaboratable):

+    iotypes = (IOType.In, IOType.Out, IOType.TriOut, IOType.InTriOut)
+

     def __init__(self, io_count):
     def __init__(self, io_count):

-        self.tap = TAP(io_count)
-        self.core_i = Signal(io_count, name="top_corei")
-        self.core_o = Signal(io_count, name="top_coreo")
-        self.core_oe = Signal(io_count, name="top_coreoe")
-        self.pad_i = Signal(io_count, name="top_padi")
-        self.pad_o = Signal(io_count, name="top_pado")
-        self.pad_oe = Signal(io_count, name="top_padoe")
+        self.tap = tap = TAP()
+        self.ios = [tap.add_io(iotype=iotype) for iotype in self.iotypes]

 
     def elaborate(self, platform):
         m = Module()
 
         m.submodules.tap = self.tap
 
 
     def elaborate(self, platform):
         m = Module()
 
         m.submodules.tap = self.tap
 

-        m.d.comb += [
-            self.core_i.eq(Cat(io.i for io in self.tap.core)),
-            Cat(io.o for io in self.tap.core).eq(self.core_o),
-            Cat(io.oe for io in self.tap.core).eq(self.core_oe),
-            Cat(io.i for io in self.tap.pad).eq(self.pad_i),
-            self.pad_o.eq(Cat(io.o for io in self.tap.pad)),
-            self.pad_oe.eq(Cat(io.oe for io in self.tap.pad)),
-        ]
-

         return m
 
 top = Top(2)
 
 p = DummyPlatform()
 
         return m
 
 top = Top(2)
 
 p = DummyPlatform()
 

-ports = [top.tap.bus.tck, top.tap.bus.tms, top.tap.bus.tdi, top.tap.bus.tdo,
-         top.core_i, top.core_o, top.core_oe, top.pad_i, top.pad_o, top.pad_oe]
+ports = [top.tap.bus.tck, top.tap.bus.tms, top.tap.bus.tdi, top.tap.bus.tdo]
+for conn in top.ios:
+    for sig in ("i", "o", "oe"):
+        try:
+            ports += [getattr(conn.core, sig), getattr(conn.pad, sig)]
+        except:
+            pass
+

 # for io in tap.core:
 #     ports += [io.i, io.o, io.oe]
 # for io in tap.pad:
 # for io in tap.core:
 #     ports += [io.i, io.o, io.oe]
 # for io in tap.pad: