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

upconn GW: use pipeline upconn layout var

This commit is contained in:
morgan 2024-09-12 13:04:38 +08:00
parent 790f0196b6
commit cb0a0358a3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gateware/cxp_upconn.py
View File

@ -7,6 +7,8 @@ from misoc.cores.code_8b10b import SingleEncoder
from misoc.interconnect import stream from misoc.interconnect import stream
from misoc.interconnect.csr import * from misoc.interconnect.csr import *
from cxp_pipeline import upconn_layout
IDLE_CHARS = Array([ IDLE_CHARS = Array([
#[char, k] #[char, k]
[0xBC, 1], #K28.5 [0xBC, 1], #K28.5
@ -292,7 +294,7 @@ class Debug_buffer(Module,AutoCSR):
class CXP_UpConn_PHY(Module, AutoCSR): class CXP_UpConn_PHY(Module, AutoCSR):
def __init__(self, pad, sys_clk_freq, debug_sma, pmod_pads, layout, nsink=3): def __init__(self, pad, sys_clk_freq, debug_sma, pmod_pads, nsink=3):
self.bitrate2x_enable = Signal() self.bitrate2x_enable = Signal()
self.clk_reset = Signal() self.clk_reset = Signal()
@ -302,12 +304,12 @@ class CXP_UpConn_PHY(Module, AutoCSR):
# # # # # #
self.submodules.cg = cg = UpConn_ClockGen(sys_clk_freq) self.submodules.cg = cg = UpConn_ClockGen(sys_clk_freq)
self.submodules.interface = interface = PHY_Interface(layout, nsink) self.submodules.interface = interface = PHY_Interface(upconn_layout, nsink)
self.sinks = interface.sinks self.sinks = interface.sinks
# DEBUG: # DEBUG:
self.submodules.debug_buf = debug_buf = Debug_buffer(layout) self.submodules.debug_buf = debug_buf = Debug_buffer(upconn_layout)
self.submodules.scheduler = scheduler = Transmit_Scheduler(interface, debug_buf) self.submodules.scheduler = scheduler = Transmit_Scheduler(interface, debug_buf)
self.submodules.serdes = serdes = SERDES_10bits(pad) self.submodules.serdes = serdes = SERDES_10bits(pad)
@ -346,8 +348,8 @@ class CXP_UpConn_PHY(Module, AutoCSR):
] ]
self.specials += [ self.specials += [
# # debug sma # # debug sma
# Instance("OBUF", i_I=cg.clk, o_O=debug_sma.p_tx), Instance("OBUF", i_I=serdes.o, o_O=debug_sma.p_tx),
# Instance("OBUF", i_I=cg.clk_10x, o_O=debug_sma.n_rx), Instance("OBUF", i_I=cg.clk_10x, o_O=debug_sma.n_rx),