M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

gateware/serwb: cleanup packet

This commit is contained in:
Florent Kermarrec 2018-01-03 17:30:12 +01:00
parent 08dada9e16
commit 7f4756a869
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
artiq/gateware/serwb/packet.py
View File

@ -89,34 +89,31 @@ class Packetizer(Module):
# - length : 4 bytes # - length : 4 bytes
# - payload # - payload
fsm = FSM(reset_state="IDLE") fsm = FSM(reset_state="PREAMBLE")
self.submodules += fsm self.submodules += fsm
fsm.act("IDLE", fsm.act("PREAMBLE",
If(sink.stb, If(sink.stb,
NextState("INSERT_PREAMBLE") source.stb.eq(1),
source.data.eq(0x5aa55aa5),
If(source.ack,
NextState("LENGTH")
)
) )
) )
fsm.act("INSERT_PREAMBLE", fsm.act("LENGTH",
source.stb.eq(1),
source.data.eq(0x5aa55aa5),
If(source.ack,
NextState("INSERT_LENGTH")
)
)
fsm.act("INSERT_LENGTH",
source.stb.eq(1), source.stb.eq(1),
source.data.eq(sink.length), source.data.eq(sink.length),
If(source.ack, If(source.ack,
NextState("COPY") NextState("DATA")
) )
) )
fsm.act("COPY", fsm.act("DATA",
source.stb.eq(sink.stb), source.stb.eq(sink.stb),
source.data.eq(sink.data), source.data.eq(sink.data),
sink.ack.eq(source.ack), sink.ack.eq(source.ack),
If(source.ack & sink.eop, If(source.ack & sink.eop,
NextState("IDLE") NextState("PREAMBLE")
) )
) )
@ -128,45 +125,49 @@ class Depacketizer(Module):
# # # # # #
count = Signal(len(source.length))
length = Signal(len(source.length))
# Packet description # Packet description
# - preamble : 4 bytes # - preamble : 4 bytes
# - length : 4 bytes # - length : 4 bytes
# - payload # - payload
fsm = FSM(reset_state="IDLE") fsm = FSM(reset_state="PREAMBLE")
self.submodules += fsm self.submodules += fsm
self.submodules.timer = WaitTimer(clk_freq*timeout) timer = WaitTimer(clk_freq*timeout)
self.comb += self.timer.wait.eq(~fsm.ongoing("IDLE")) self.submodules += timer
fsm.act("IDLE", fsm.act("PREAMBLE",
sink.ack.eq(1), sink.ack.eq(1),
If(sink.stb & (sink.data == 0x5aa55aa5), If(sink.stb &
NextState("RECEIVE_LENGTH") (sink.data == 0x5aa55aa5),
NextState("LENGTH")
) )
) )
fsm.act("RECEIVE_LENGTH", fsm.act("LENGTH",
sink.ack.eq(1), sink.ack.eq(1),
If(sink.stb, If(sink.stb,
NextValue(source.length, sink.data), NextValue(count, 0),
NextState("COPY") NextValue(length, sink.data),
) NextState("DATA")
),
timer.wait.eq(1)
) )
eop = Signal() fsm.act("DATA",
cnt = Signal(32)
fsm.act("COPY",
source.stb.eq(sink.stb), source.stb.eq(sink.stb),
source.eop.eq(eop), source.eop.eq(count == (length[2:] - 1)),
source.length.eq(length),
source.data.eq(sink.data), source.data.eq(sink.data),
sink.ack.eq(source.ack), sink.ack.eq(source.ack),
If((source.stb & source.ack & eop) | self.timer.done, If(timer.done,
NextState("IDLE") NextState("PREAMBLE")
)
)
self.sync += \
If(fsm.ongoing("IDLE"),
cnt.eq(0)
).Elif(source.stb & source.ack, ).Elif(source.stb & source.ack,
cnt.eq(cnt + 1) NextValue(count, count + 1),
) If(source.eop,
self.comb += eop.eq(cnt == source.length[2:] - 1) NextState("PREAMBLE")
)
),
timer.wait.eq(1)
)