make _connect_in/_connect_out data eq optional

diff --git a/src/add/iocontrol.py b/src/add/iocontrol.py
index 14d2730e04da4877e68d3e081c77cdf95ac8965b..f9d15bd2b9d82c8c6804e632a41216cb9f3e24da 100644 (file)
--- a/src/add/iocontrol.py
+++ b/src/add/iocontrol.py
@@ -188,16 +188,17 @@ class PrevControl(Elaboratable):
             return self.s_ready_o # set dynamically by stage
         return self._ready_o      # return this when not under dynamic control
 
-    def _connect_in(self, prev, direct=False, fn=None):
+    def _connect_in(self, prev, direct=False, fn=None, do_data=True):
         """ internal helper function to connect stage to an input source.
             do not use to connect stage-to-stage!
         """
         valid_i = prev.valid_i if direct else prev.valid_i_test
+        res = [self.valid_i.eq(valid_i),
+               prev.ready_o.eq(self.ready_o)]
+        if do_data is False:
+            return res
         data_i = fn(prev.data_i) if fn is not None else prev.data_i
-        return [self.valid_i.eq(valid_i),
-                prev.ready_o.eq(self.ready_o),
-                nmoperator.eq(self.data_i, data_i),
-               ]
+        return res + [nmoperator.eq(self.data_i, data_i)]
 
     @property
     def valid_i_test(self):

diff --git a/src/add/test_fsm_experiment.py b/src/add/test_fsm_experiment.py
index d9c76e6080cbb9a2a50c31f6f9746ebeed0549aa..0e820c96f00ad213347f0d056001634140169f56 100644 (file)
--- a/src/add/test_fsm_experiment.py
+++ b/src/add/test_fsm_experiment.py
@@ -100,11 +100,8 @@ class FPDIVPipe(ControlBase):
         m.submodules.fpdiv = self.fpdiv
 
         # see if connecting to stb/ack works
-        m.d.comb += self.p.ready_o.eq(self.fpdiv.in_a.ready_o)
-        m.d.comb += self.fpdiv.in_a.valid_i.eq(self.p.valid_i_test)
-
-        m.d.comb += self.n.valid_o.eq(self.fpdiv.out_z.valid_o)
-        m.d.comb += self.fpdiv.out_z.ready_i.eq(self.n.ready_i_test)
+        m.d.comb += self.fpdiv.in_a._connect_in(self.p)
+        m.d.comb += self.fpdiv.out_z._connect_out(self.n, do_data=False)
         m.d.comb += self.n.data_o.eq(self.data_r)
 
         return m