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

frameline GW: add 14bit gearbox support

Browse Source
This commit is contained in:
morgan 2025-01-13 13:25:03 +08:00
parent 1006315b31
commit d53a393f0d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gateware/cxp_frame_pipeline.py
View File

@ -401,7 +401,7 @@ class Frame_Header_Decoder(Module):
class Custom_Pixel_Gearbox(Module): class Custom_Pixel_Gearbox(Module):
def __init__(self, size): def __init__(self, size):
assert size in [8, 10, 12, 16] assert size in [8, 10, 12, 14, 16]
self.x_size = Signal(3*char_width) self.x_size = Signal(3*char_width)
@ -491,6 +491,13 @@ class Custom_Pixel_Gearbox(Module):
} }
# mod 8 # mod 8
self.sync += Case(self.x_size[:3], stb_cases) self.sync += Case(self.x_size[:3], stb_cases)
case 14:
stb_cases = {
9: extra_stb.eq(1),
13: extra_stb.eq(1),
}
# mod 16
self.sync += Case(self.x_size[:4], stb_cases)
# NOTE: # NOTE:
@ -589,7 +596,7 @@ class Frame_Deserializer(Module):
# TODO: fix the edge case where 5 x_size is not working # TODO: fix the edge case where 5 x_size is not working
# the issue arises when the 4th pixel is sent with eop (e.g. 10bits & x_size = 5,6) # the issue arises when the 4th pixel is sent with eop (e.g. 10bits & x_size = 5,6)
# eating the rest of the bits # eating the rest of the bits
self.submodules.gearbox = gearbox = Custom_Pixel_Gearbox(12) self.submodules.gearbox = gearbox = Custom_Pixel_Gearbox(14)
self.sync += gearbox.x_size.eq(self.x_size), self.sync += gearbox.x_size.eq(self.x_size),
self.comb += eol_inserter.source.connect(gearbox.sink) self.comb += eol_inserter.source.connect(gearbox.sink)
@ -754,6 +761,8 @@ class Frame_Packet_Router(Module):
for i, d in enumerate(downconns): for i, d in enumerate(downconns):
# eop is needed for arbiter and crc checker to work correctly # eop is needed for arbiter and crc checker to work correctly
# TODO: move eop inserter inside of broadcaster
# TODO: change arbiter to use K27.7 as eop instead
eop_marker = EOP_Inserter() eop_marker = EOP_Inserter()
self.submodules += eop_marker self.submodules += eop_marker
self.comb += [ self.comb += [