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

cxp GW: add 8 ROI & cleanup

Browse Source
This commit is contained in:
morgan 2025-02-07 13:16:54 +08:00
parent 3c5bebbf2e
commit a6ad4501b1
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gateware/cxp.py
View File

@ -287,7 +287,7 @@ class CXP_Frame_Pipeline(Module, AutoCSR):
class CXP_Grabber(Module, AutoCSR):
# optimal stream packet size is 2 KiB - Section 9.5.2 (CXP-001-2021)
def __init__(self, host, roi_engine_count=2, res_width=16, count_width=31):
def __init__(self, host, roi_engine_count=8, res_width=16, count_width=31):
assert count_width <= 31
self.crc_error_cnt = CSRStatus(16)
@ -367,6 +367,8 @@ class CXP_Grabber(Module, AutoCSR):
buffer.source.connect(stream2pix.sink),
]
# ROI engines config and count gating
roi_engines = [cdr(ROI(stream2pix.pixel4x, count_width)) for _ in range(roi_engine_count)]
self.submodules += roi_engines
@ -378,25 +380,6 @@ class CXP_Grabber(Module, AutoCSR):
roi_boundary.eq(self.config.o.data))
self.specials += MultiReg(roi_boundary, target, "cxp_gt_rx")
# roi_out = roi.out
# update = Signal()
# self.submodules.ps = ps = PulseSynchronizer("cxp_gt_rx", "sys")
# self.sync.cxp_gt_rx += ps.i.eq(roi_out.update)
# self.sync += update.eq(ps.o)
# sentinel = 2**count_width
# count_sys = Signal.like(roi_out.count)
# self.specials += MultiReg(roi_out.count, count_sys),
# self.sync.rio += [
# # TODO: add gating
# self.gate_data.i.stb.eq(update),
# # without the slice, unspecified bits will be 1 for some reason
# # i.e. data[count_wdith:] = 0b111111... when using data.eq(count_sys)
# self.gate_data.i.data[:count_width].eq(count_sys),
# ]
self.submodules.synchronizer = synchronizer = CXP_Synchronizer(roi_engines)
self.submodules.serializer = serializer = Serializer(synchronizer.update, synchronizer.counts, self.gate_data.i)