morgan
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Pull Requests Activity

cxp pipeline: remove crc inserter & pak_type

This commit is contained in:
morgan 2024-09-04 14:49:11 +08:00
parent f49f3dbb55
commit 4e2d194b2c
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gateware/cxp_pipeline.py
View File

@ -243,22 +243,16 @@ class Trigger_ACK(Module):
class TX_Command_Packet(Module, AutoCSR): class TX_Command_Packet(Module, AutoCSR):
def __init__(self, layout): def __init__(self, layout):
self.packet_type = CSRStorage(8)
self.din_len = CSRStorage(6) self.din_len = CSRStorage(6)
self.din_data = CSR(8) self.din_data = CSR(8)
self.din_k = CSRStorage()
self.din_ready = CSRStatus() self.din_ready = CSRStatus()
# # # # # #
# a buf is used to simulated a proper endpoint which hold source.stb high as long as data is available # a buf is used to simulated a proper endpoint which hold source.stb high as long as data is available
# otherwise, CSR.re only hold when CSR is written to and it cannot act as a proper source # otherwise, CSR.re only hold when CSR is written to and it cannot act as a proper source
self.submodules.buf_in = buf_in = stream.SyncFIFO(layout, 2) self.submodules.buf_in = buf_in = stream.SyncFIFO(layout, 2)
self.submodules.crc_inserter = crc_inserters = CXPCRC32Inserter(layout)
self.submodules.pak_type = pak_type = Code_Inserter(layout)
self.submodules.pak_wrp = pak_wrp = Packet_Wrapper(layout) self.submodules.pak_wrp = pak_wrp = Packet_Wrapper(layout)
len = Signal(6, reset=1) len = Signal(6, reset=1)
@ -275,18 +269,9 @@ class TX_Command_Packet(Module, AutoCSR):
), ),
buf_in.sink.stb.eq(1), buf_in.sink.stb.eq(1),
buf_in.sink.data.eq(self.din_data.r), buf_in.sink.data.eq(self.din_data.r),
buf_in.sink.k.eq(self.din_k.storage), buf_in.sink.k.eq(0),
), ),
] ]
self.comb += [ self.comb += buf_in.source.connect(pak_wrp.sink),
pak_type.data.eq(self.packet_type.storage), self.source = pak_wrp.source
pak_type.k.eq(0),
]
tx_pipeline = [ buf_in, crc_inserters, pak_type, pak_wrp]
for s, d in zip(tx_pipeline, tx_pipeline[1:]):
self.comb += s.source.connect(d.sink)
self.source = tx_pipeline[-1].source