Permalink
Browse files

flow/plumbing: Combinator/Splitter should not inherit CombinatorialActor

  • Loading branch information...
sbourdeauducq committed Jun 17, 2012
1 parent 21eb17f commit 4873cfe1a70ae9c42d3b16665769acb423a5e572
Showing with 2 additions and 4 deletions.
  1. +0 −2 examples/dataflow/fibonacci.py
  2. +2 −2 migen/flow/plumbing.py
@@ -1,5 +1,3 @@
-import sys
-
from migen.flow.ala import *
from migen.flow.network import *
from migen.flow import plumbing
View
@@ -14,7 +14,7 @@ def get_process_fragment(self):
sync = [If(self.pipe_ce, Cat(*sigs_q).eq(Cat(*sigs_d)))]
return Fragment(sync=sync)
-class Combinator(CombinatorialActor):
+class Combinator(Actor):
def __init__(self, layout, subrecords):
source = Record(layout)
subrecords = [source.subrecord(*subr) for subr in subrecords]
@@ -32,7 +32,7 @@ def get_fragment(self):
comb += [sink.ack.eq(source.ack & source.stb) for sink in sinks]
return Fragment(comb)
-class Splitter(CombinatorialActor):
+class Splitter(Actor):
def __init__(self, layout, subrecords):
sink = Record(layout)
subr = []

0 comments on commit 4873cfe

Please sign in to comment.