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

soc/interconnect/packet/Depacketizer: replace no_payload with sink_d.last

This commit is contained in:
Florent Kermarrec 2019-11-17 11:50:09 +01:00
parent 6059712794
commit 8272a00d6e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
litex/soc/interconnect/packet.py
View File

@ -287,7 +287,6 @@ class Depacketizer(Module):
sr = Signal(header.length*8, reset_less=True) sr = Signal(header.length*8, reset_less=True)
sr_shift = Signal() sr_shift = Signal()
sr_shift_leftover = Signal() sr_shift_leftover = Signal()
no_payload = Signal()
count = Signal(max=max(header_words, 2)) count = Signal(max=max(header_words, 2))
sink_d = stream.Endpoint(sink_description) sink_d = stream.Endpoint(sink_description)
@ -312,7 +311,6 @@ class Depacketizer(Module):
sr_shift.eq(1), sr_shift.eq(1),
NextValue(fsm_from_idle, 1), NextValue(fsm_from_idle, 1),
If(header_words == 1, If(header_words == 1,
NextValue(no_payload, sink.last),
If(header_leftover, If(header_leftover,
NextState("UNALIGNED-DATA-COPY") NextState("UNALIGNED-DATA-COPY")
).Else( ).Else(
@ -329,7 +327,6 @@ class Depacketizer(Module):
NextValue(count, count + 1), NextValue(count, count + 1),
sr_shift.eq(1), sr_shift.eq(1),
If(count == (header_words - 1), If(count == (header_words - 1),
NextValue(no_payload, sink.last),
If(header_leftover, If(header_leftover,
NextValue(count, count + 1), NextValue(count, count + 1),
NextState("UNALIGNED-DATA-COPY") NextState("UNALIGNED-DATA-COPY")
@ -341,8 +338,8 @@ class Depacketizer(Module):
) )
self.sync += If(sink.ready, sink_d.eq(sink)) self.sync += If(sink.ready, sink_d.eq(sink))
fsm.act("UNALIGNED-DATA-COPY", fsm.act("UNALIGNED-DATA-COPY",
source.valid.eq((sink.valid & ~fsm_from_idle) | no_payload), source.valid.eq((sink.valid & ~fsm_from_idle) | sink_d.last),
source.last.eq(sink.last | no_payload), source.last.eq(sink.last | sink_d.last),
sink.ready.eq(source.ready | fsm_from_idle), sink.ready.eq(source.ready | fsm_from_idle),
If(sink.valid & sink.ready, If(sink.valid & sink.ready,
NextValue(fsm_from_idle, 0), NextValue(fsm_from_idle, 0),
@ -358,10 +355,10 @@ class Depacketizer(Module):
) )
) )
fsm.act("ALIGNED-DATA-COPY", fsm.act("ALIGNED-DATA-COPY",
source.last.eq(sink.last | no_payload), source.last.eq(sink.last | sink_d.last),
source.data.eq(sink.data), source.data.eq(sink.data),
sink.ready.eq(source.ready), sink.ready.eq(source.ready),
source.valid.eq(sink.valid | no_payload), source.valid.eq(sink.valid | sink_d.last),
If(source.valid & source.ready, If(source.valid & source.ready,
If(source.last, If(source.last,
NextState("IDLE") NextState("IDLE")