Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flow/plumbing: Combinator/Splitter should not inherit CombinatorialActor

This commit is contained in:
Sebastien Bourdeauducq 2012-06-17 13:45:18 +02:00
parent 21eb17fc36
commit 4873cfe1a7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dataflow/fibonacci.py
View File

@ -1,5 +1,3 @@
import sys
from migen.flow.ala import * from migen.flow.ala import *
from migen.flow.network import * from migen.flow.network import *
from migen.flow import plumbing from migen.flow import plumbing

4
migen/flow/plumbing.py
View File

@ -14,7 +14,7 @@ class Buffer(PipelinedActor):
sync = [If(self.pipe_ce, Cat(*sigs_q).eq(Cat(*sigs_d)))] sync = [If(self.pipe_ce, Cat(*sigs_q).eq(Cat(*sigs_d)))]
return Fragment(sync=sync) return Fragment(sync=sync)
class Combinator(CombinatorialActor): class Combinator(Actor):
def __init__(self, layout, subrecords): def __init__(self, layout, subrecords):
source = Record(layout) source = Record(layout)
subrecords = [source.subrecord(*subr) for subr in subrecords] 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] comb += [sink.ack.eq(source.ack & source.stb) for sink in sinks]
return Fragment(comb) return Fragment(comb)
class Splitter(CombinatorialActor): class Splitter(Actor):
def __init__(self, layout, subrecords): def __init__(self, layout, subrecords):
sink = Record(layout) sink = Record(layout)
subr = [] subr = []