flow: generic parameter passing to Actor from sequential/pipelined
authorSebastien Bourdeauducq <sebastien@milkymist.org>
Thu, 7 Jun 2012 16:24:33 +0000 (18:24 +0200)
committerSebastien Bourdeauducq <sebastien@milkymist.org>
Thu, 7 Jun 2012 16:24:33 +0000 (18:24 +0200)
migen/flow/actor.py

index f2f6bf0ecdc314b6991547f8be6760b03dff7c31..04793606f81c987b0fd3fdee60a0c26e4bc1bca8 100644 (file)
@@ -90,10 +90,10 @@ class CombinatorialActor(BinaryActor):
                return Fragment([stb_o.eq(stb_i), ack_o.eq(ack_i), self.busy.eq(0)])
 
 class SequentialActor(BinaryActor):
-       def __init__(self, delay, *endpoint_descriptions, endpoints=None):
+       def __init__(self, delay, *endpoint_descriptions, **misc):
                self.delay = delay
                self.trigger = Signal()
-               BinaryActor.__init__(*endpoint_descriptions, endpoints=endpoints)
+               BinaryActor.__init__(*endpoint_descriptions, **misc)
 
        def get_binary_control_fragment(self, stb_i, ack_o, stb_o, ack_i):
                ready = Signal()
@@ -122,10 +122,10 @@ class SequentialActor(BinaryActor):
                return Fragment(comb, sync)
 
 class PipelinedActor(BinaryActor):
-       def __init__(self, latency, *endpoint_descriptions, endpoints=None):
+       def __init__(self, latency, *endpoint_descriptions, **misc):
                self.latency = latency
                self.pipe_ce = Signal()
-               BinaryActor.__init__(*endpoint_descriptions, endpoints=endpoints)
+               BinaryActor.__init__(*endpoint_descriptions, **misc)
 
        def get_binary_control_fragment(self, stb_i, ack_o, stb_o, ack_i):
                valid = Signal(BV(self.latency))