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

use sets for leave_out

This commit is contained in:
Florent Kermarrec 2015-07-05 22:49:23 +02:00
parent c100ef6406
commit e011f9378f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misoclib/com/liteeth/core/mac/core/preamble.py
View File

@ -47,7 +47,7 @@ class LiteEthMACPreambleInserter(Module):
self.source.last_be.eq(self.sink.last_be) self.source.last_be.eq(self.sink.last_be)
] ]
fsm.act("COPY", fsm.act("COPY",
Record.connect(self.sink, self.source, leave_out=["data", "last_be"]), Record.connect(self.sink, self.source, leave_out=set(["data", "last_be"])),
self.source.sop.eq(0), self.source.sop.eq(0),
If(self.sink.stb & self.sink.eop & self.source.ack, If(self.sink.stb & self.sink.eop & self.source.ack,
@ -140,7 +140,7 @@ class LiteEthMACPreambleChecker(Module):
self.source.last_be.eq(self.sink.last_be) self.source.last_be.eq(self.sink.last_be)
] ]
fsm.act("COPY", fsm.act("COPY",
Record.connect(self.sink, self.source, leave_out=["data", "last_be"]), Record.connect(self.sink, self.source, leave_out=set(["data", "last_be"])),
self.source.sop.eq(sop), self.source.sop.eq(sop),
clr_sop.eq(self.source.stb & self.source.ack), clr_sop.eq(self.source.stb & self.source.ack),

8
misoclib/mem/litesata/frontend/mirroring.py
View File

@ -59,8 +59,8 @@ class LiteSATAMirroringTX(Module):
read_status = Status(read) read_status = Status(read)
self.submodules += read_status self.submodules += read_status
self.comb += [ self.comb += [
Record.connect(sink, read, leave_out=["stb", "ack"]), Record.connect(sink, read, leave_out=set(["stb", "ack"])),
Record.connect(sink, write, leave_out=["stb", "ack"]), Record.connect(sink, write, leave_out=set(["stb", "ack"])),
read.stb.eq(sink.stb & (sink.read | sink.identify) & ~read_stall), read.stb.eq(sink.stb & (sink.read | sink.identify) & ~read_stall),
write.stb.eq(sink.stb & sink.write), write.stb.eq(sink.stb & sink.write),
If(sink.read | sink.identify, If(sink.read | sink.identify,
@ -127,8 +127,8 @@ class LiteSATAMirroringRX(Module):
sink_status = Status(sinks[i]) sink_status = Status(sinks[i])
self.submodules += sink_status self.submodules += sink_status
self.comb += [ self.comb += [
Record.connect(sinks[i], reads[i], leave_out=["stb", "ack"]), Record.connect(sinks[i], reads[i], leave_out=set(["stb", "ack"])),
Record.connect(sinks[i], write_striper.sinks[i], leave_out=["stb", "ack"]), Record.connect(sinks[i], write_striper.sinks[i], leave_out=set(["stb", "ack"])),
reads[i].stb.eq(sinks[i].stb & ctrl.reading), reads[i].stb.eq(sinks[i].stb & ctrl.reading),
write_striper.sinks[i].stb.eq(sinks[i].stb & ctrl.writing), write_striper.sinks[i].stb.eq(sinks[i].stb & ctrl.writing),
sinks[i].ack.eq(reads[i].ack | write_striper.sinks[i].ack), sinks[i].ack.eq(reads[i].ack | write_striper.sinks[i].ack),

4
misoclib/mem/litesata/frontend/striping.py
View File

@ -39,7 +39,7 @@ class LiteSATAStripingTX(Module):
# split data and ctrl signals (except stb & ack managed in fsm) # split data and ctrl signals (except stb & ack managed in fsm)
for i, s in enumerate(sources): for i, s in enumerate(sources):
self.comb += Record.connect(sink, s, leave_out=["stb", "ack", "data"]) self.comb += Record.connect(sink, s, leave_out=set(["stb", "ack", "data"]))
if mirroring_mode: if mirroring_mode:
self.comb += s.data.eq(sink.data) self.comb += s.data.eq(sink.data)
else: else:
@ -82,7 +82,7 @@ class LiteSATAStripingRX(Module):
) )
# use first sink for ctrl signals (except for stb, ack & failed) # use first sink for ctrl signals (except for stb, ack & failed)
self.comb += Record.connect(sinks[0], source, leave_out=["stb", "ack", "failed", "data"]) self.comb += Record.connect(sinks[0], source, leave_out=set(["stb", "ack", "failed", "data"]))
# combine datas # combine datas
if mirroring_mode: if mirroring_mode:
self.comb += source.data.eq(0) # mirroring only used for writes self.comb += source.data.eq(0) # mirroring only used for writes