move PassThroughStage out of FIFOControl

diff --git a/src/add/singlepipe.py b/src/add/singlepipe.py
index 9bed317578668ed87e9e8b1a2bf66f317deb4767..98f29d2bfb99675b3a9336b830c2991c2401ade0 100644 (file)
--- a/src/add/singlepipe.py
+++ b/src/add/singlepipe.py
@@ -1021,7 +1021,7 @@ class FIFOControl(ControlBase):
         i_data -> fifo.din -> FIFO -> fifo.dout -> o_data
     """
 
-    def __init__(self, depth, iospecfn):
+    def __init__(self, depth, stage):
         """ * iospecfn: specification for incoming and outgoing data
             * depth   : number of entries in the FIFO
 
@@ -1029,7 +1029,6 @@ class FIFOControl(ControlBase):
         """
 
         self.fdepth = depth
-        stage = PassThroughStage(iospecfn)
         ControlBase.__init__(self, stage=stage)
 
     def elaborate(self, platform):

diff --git a/src/add/test_buf_pipe.py b/src/add/test_buf_pipe.py
index d5b556525ef7ffc63f8e0ba75b56c4bc031c3d1e..b0e31b27c76709ea4df0b9330ee82e15a9cfea22 100644 (file)
--- a/src/add/test_buf_pipe.py
+++ b/src/add/test_buf_pipe.py
@@ -770,7 +770,8 @@ def iospecfn():
 class FIFOTest16(FIFOControl):
 
     def __init__(self):
-        FIFOControl.__init__(self, 2, iospecfn)
+        stage = PassThroughStage(iospecfn)
+        FIFOControl.__init__(self, 2, stage)
 
 
 ######################################################################
@@ -840,7 +841,8 @@ def iospecfnrecord():
 class FIFOTestRecordControl(FIFOControl):
 
     def __init__(self):
-        FIFOControl.__init__(self, 2, iospecfnrecord)
+        stage = PassThroughStage(iospecfnrecord)
+        FIFOControl.__init__(self, 2, stage)
 
 
 class ExampleFIFORecordObjectPipe(ControlBase):
@@ -869,7 +871,8 @@ def iospecfn24():
 class FIFOTest2x16(FIFOControl):
 
     def __init__(self):
-        FIFOControl.__init__(self, iospecfn2, 2)
+        stage = PassThroughStage(iospecfn2)
+        FIFOControl.__init__(self, 2, stage)
 
 
 ######################################################################