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

flow/plumbing/muxdemux: use existing connect() method instead of new function

This commit is contained in:
Sebastien Bourdeauducq 2013-11-02 23:15:03 +01:00
parent 7170ae3a67
commit b4a7d36fa5
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migen/flow/plumbing.py
View File

@ -3,14 +3,6 @@ from migen.flow.actor import *
from migen.genlib.record import * from migen.genlib.record import *
from migen.genlib.misc import optree from migen.genlib.misc import optree
def pipe(s1, s2):
r = [
s2.stb.eq(s1.stb),
s2.payload.eq(s1.payload),
s1.ack.eq(s2.ack)
]
return r
class Buffer(PipelinedActor): class Buffer(PipelinedActor):
def __init__(self, layout): def __init__(self, layout):
self.d = Sink(layout) self.d = Sink(layout)
@ -75,7 +67,7 @@ class Multiplexer(Module):
case = {} case = {}
for i, sink in enumerate(sinks): for i, sink in enumerate(sinks):
cases[i] = [pipe(sink, self.source)] cases[i] = self.source.connect(sink)
self.comb += Case(self.sel, cases) self.comb += Case(self.sel, cases)
class Demultiplexer(Module): class Demultiplexer(Module):
@ -93,7 +85,7 @@ class Demultiplexer(Module):
cases = {} cases = {}
for i, source in enumerate(sources): for i, source in enumerate(sources):
cases[i] = [pipe(self.sink, source)] cases[i] = source.connect(self.sink)
self.comb += Case(self.sel, cases) self.comb += Case(self.sel, cases)
# Actors whose layout should be inferred from what their single sink is connected to. # Actors whose layout should be inferred from what their single sink is connected to.