From 4873cfe1a70ae9c42d3b16665769acb423a5e572 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 17 Jun 2012 13:45:18 +0200 Subject: [PATCH] flow/plumbing: Combinator/Splitter should not inherit CombinatorialActor --- examples/dataflow/fibonacci.py | 2 -- migen/flow/plumbing.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/dataflow/fibonacci.py b/examples/dataflow/fibonacci.py index f58000674..709cfe499 100644 --- a/examples/dataflow/fibonacci.py +++ b/examples/dataflow/fibonacci.py @@ -1,5 +1,3 @@ -import sys - from migen.flow.ala import * from migen.flow.network import * from migen.flow import plumbing diff --git a/migen/flow/plumbing.py b/migen/flow/plumbing.py index 9d5736f49..8a6de4d45 100644 --- a/migen/flow/plumbing.py +++ b/migen/flow/plumbing.py @@ -14,7 +14,7 @@ class Buffer(PipelinedActor): 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 @@ class Combinator(CombinatorialActor): 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 = []