From 982bdca4d3ff385796a1cf3184ce04ef4bddafe9 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 15 Feb 2022 17:12:57 +0100
Subject: [PATCH] Removed O_si, N_si from sdp_info because not used. Moved
O_rn, N_rn to ring_info.
---
.../lofar2/libraries/sdp/src/vhdl/node_sdp_correlator.vhd | 3 +++
applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd | 1 +
2 files changed, 4 insertions(+)
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_correlator.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_correlator.vhd
index 35dd7db50e..27239f0578 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_correlator.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_correlator.vhd
@@ -35,6 +35,7 @@ USE common_lib.common_pkg.ALL;
USE common_lib.common_mem_pkg.ALL;
USE common_lib.common_network_layers_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
+USE ring_lib.ring_pkg.ALL;
USE work.sdp_pkg.ALL;
ENTITY node_sdp_correlator IS
@@ -78,6 +79,7 @@ ENTITY node_sdp_correlator IS
reg_xst_udp_monitor_cipo : OUT t_mem_cipo;
sdp_info : IN t_sdp_info;
+ ring_info : IN t_ring_info;
gn_id : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0);
stat_eth_src_mac : IN STD_LOGIC_VECTOR(c_network_eth_mac_addr_w-1 DOWNTO 0);
stat_ip_src_addr : IN STD_LOGIC_VECTOR(c_network_ip_addr_w-1 DOWNTO 0);
@@ -421,6 +423,7 @@ BEGIN
ip_src_addr => stat_ip_src_addr,
gn_index => TO_UINT(gn_id),
+ ring_info => ring_info,
sdp_info => sdp_info,
nof_crosslets => nof_crosslets,
crosslets_info => crosslets_info
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
index 1494eb1126..36ab5c31f8 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
@@ -666,6 +666,7 @@ BEGIN
reg_xst_udp_monitor_cipo => reg_xst_udp_monitor_cipo,
sdp_info => sdp_info,
+ ring_info => ring_info,
gn_id => gn_id,
stat_eth_src_mac => stat_eth_src_mac,
stat_ip_src_addr => stat_ip_src_addr,
--
GitLab