Skip to content
Snippets Groups Projects
Commit bf5f34f1 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Merge branch 'L2SDP-556' into 'master'

connected ref_sync

Closes L2SDP-556

See merge request desp/hdl!180
parents c8dd5e16 991e6dd7
Branches
No related tags found
1 merge request!180connected ref_sync
Pipeline #22402 passed
...@@ -171,6 +171,7 @@ BEGIN ...@@ -171,6 +171,7 @@ BEGIN
reg_bsn_monitor_v2_copi => reg_bsn_monitor_v2_ring_tx_copi, reg_bsn_monitor_v2_copi => reg_bsn_monitor_v2_ring_tx_copi,
reg_bsn_monitor_v2_cipo => reg_bsn_monitor_v2_ring_tx_cipo, reg_bsn_monitor_v2_cipo => reg_bsn_monitor_v2_ring_tx_cipo,
ref_sync => bs_sosi.sync,
tx_select => tx_select, tx_select => tx_select,
remove_channel => lane_info.transport_nof_hops, remove_channel => lane_info.transport_nof_hops,
this_rn => this_rn, this_rn => this_rn,
......
...@@ -63,6 +63,7 @@ ENTITY ring_tx IS ...@@ -63,6 +63,7 @@ ENTITY ring_tx IS
reg_bsn_monitor_v2_copi : IN t_mem_copi; reg_bsn_monitor_v2_copi : IN t_mem_copi;
reg_bsn_monitor_v2_cipo : OUT t_mem_cipo; reg_bsn_monitor_v2_cipo : OUT t_mem_cipo;
ref_sync : IN STD_LOGIC;
tx_select : IN STD_LOGIC; tx_select : IN STD_LOGIC;
remove_channel : IN STD_LOGIC_VECTOR(c_dp_stream_channel_w-1 DOWNTO 0); remove_channel : IN STD_LOGIC_VECTOR(c_dp_stream_channel_w-1 DOWNTO 0);
this_rn : IN STD_LOGIC_VECTOR(c_byte_w-1 DOWNTO 0); this_rn : IN STD_LOGIC_VECTOR(c_byte_w-1 DOWNTO 0);
...@@ -233,7 +234,8 @@ BEGIN ...@@ -233,7 +234,8 @@ BEGIN
dp_rst => dp_rst, dp_rst => dp_rst,
dp_clk => dp_clk, dp_clk => dp_clk,
in_sosi_arr => monitor_sosi_arr in_sosi_arr => monitor_sosi_arr,
ref_sync => ref_sync
); );
END GENERATE; END GENERATE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment