From b4fe47f9f95965015529450f113bbfe69702bc75 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 12 Apr 2019 03:50:02 +0100 Subject: [PATCH] swap iospecfn and depth arguments in FIFOControl --- src/add/singlepipe.py | 2 +- src/add/test_buf_pipe.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add/singlepipe.py b/src/add/singlepipe.py index 93712077..9bed3175 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, iospecfn, depth): + def __init__(self, depth, iospecfn): """ * iospecfn: specification for incoming and outgoing data * depth : number of entries in the FIFO diff --git a/src/add/test_buf_pipe.py b/src/add/test_buf_pipe.py index 651d907a..d5b55652 100644 --- a/src/add/test_buf_pipe.py +++ b/src/add/test_buf_pipe.py @@ -214,7 +214,7 @@ class Test5: send = True else: send = randint(0, send_range) != 0 - #send = True + send = True o_p_ready = yield self.dut.p.o_ready if not o_p_ready: yield @@ -233,7 +233,7 @@ class Test5: stall_range = randint(0, 3) for j in range(randint(1,10)): ready = randint(0, stall_range) != 0 - #ready = True + ready = True yield self.dut.n.i_ready.eq(ready) yield o_n_valid = yield self.dut.n.o_valid @@ -770,7 +770,7 @@ def iospecfn(): class FIFOTest16(FIFOControl): def __init__(self): - FIFOControl.__init__(self, iospecfn, 2) + FIFOControl.__init__(self, 2, iospecfn) ###################################################################### @@ -840,7 +840,7 @@ def iospecfnrecord(): class FIFOTestRecordControl(FIFOControl): def __init__(self): - FIFOControl.__init__(self, iospecfnrecord, 2) + FIFOControl.__init__(self, 2, iospecfnrecord) class ExampleFIFORecordObjectPipe(ControlBase): -- 2.30.2