From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 12 Apr 2019 02:54:00 +0000 (+0100)
Subject: move PassThroughStage out of FIFOControl
X-Git-Tag: ls180-24jan2020~1246
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25c40d3549a57bec53269bf4a42aa37df12b6432;p=ieee754fpu.git

move PassThroughStage out of FIFOControl
---

diff --git a/src/add/singlepipe.py b/src/add/singlepipe.py
index 9bed3175..98f29d2b 100644
--- 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 d5b55652..b0e31b27 100644
--- 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)
 
 
 ######################################################################