From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 4 Jul 2018 22:33:21 +0000 (+0100)
Subject: make arguments to pmux4 a list, as an experiment (worked)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=21f4d5c08784ba1b2a6848090b685faf55d9cef8;p=pinmux.git

make arguments to pmux4 a list, as an experiment (worked)
---

diff --git a/src/myhdl/mux.py b/src/myhdl/mux.py
index 1559fdd..4baecac 100644
--- a/src/myhdl/mux.py
+++ b/src/myhdl/mux.py
@@ -19,6 +19,7 @@ def mux4(clk, in_a, in_b, in_c, in_d,
 
     return instances()  # return all instances
 
+
 @block
 def pmux1(clk, in_a,
           sel_a, out):
@@ -71,8 +72,10 @@ def pmux3(clk, in_a, in_b, in_c,
 
 
 @block
-def pmux4(clk, in_a, in_b, in_c, in_d,
-          sel_a, sel_b, sel_c, sel_d, out):
+def pmux4(clk, ins, sels, out):
+
+    (sel_a, sel_b, sel_c, sel_d) = sels
+    (in_a, in_b, in_c, in_d) = ins
 
     @always(sel_a, sel_b, sel_c, sel_d,
             in_a, in_b, in_c, in_d)
@@ -106,8 +109,9 @@ def pmux_tb4():
     sel_d = Signal(bool(0))
     out = Signal(bool(0))
 
-    mux_inst = pmux4(clk, in_a, in_b, in_c, in_d,
-                    sel_a, sel_b, sel_c, sel_d, out)
+    sels = (sel_a, sel_b, sel_c, sel_d)
+    ins = (in_a, in_b, in_c, in_d)
+    mux_inst = pmux4(clk, ins, sels, out)
 
     @instance
     def clk_signal():
@@ -138,9 +142,9 @@ def pmux_tb4():
     file_data = open("pmux.csv", 'w')  # file for saving data
     # # print header on screen
     s = "{0},{1},{2},{3},{4},{5},{6},{7},{8}".format(
-                                    "in_a", "in_b", "in_c", "in_d",
-                                    "sel_a", "sel_b", "sel_c", "sel_d",
-                                    "out")
+        "in_a", "in_b", "in_c", "in_d",
+        "sel_a", "sel_b", "sel_c", "sel_d",
+        "out")
     print(s)
     # # print header to file
     file_data.write(s)
@@ -171,6 +175,8 @@ def pmux_tb4():
     return instances()
 
 # testbench
+
+
 @block
 def mux_tb():
 
@@ -272,8 +278,9 @@ def test_pmux4():
     sel_d = Signal(bool(0))
     out = Signal(bool(0))
 
-    pmux_v = pmux4(clk, in_a, in_b, in_c, in_d,
-                  sel_a, sel_b, sel_c, sel_d, out)
+    sels = (sel_a, sel_b, sel_c, sel_d)
+    ins = (in_a, in_b, in_c, in_d)
+    pmux_v = pmux4(clk, ins, sels, out)
     pmux_v.convert(hdl="Verilog", initial_values=True)
 
     # test bench
@@ -282,10 +289,10 @@ def test_pmux4():
     # keep following lines below the 'tb.convert' line
     # otherwise error will be reported
     tb.config_sim(trace=True)
-    tb.run_sim(4*66 * period)  # run for 15 clock cycle
+    tb.run_sim(4 * 66 * period)  # run for 15 clock cycle
 
 
 if __name__ == '__main__':
-    #test_mux()
+    # test_mux()
     print "test pmux"
     test_pmux4()