From 0da99806a6484081f413f71e12ee2e829e9c6ea3 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 25 Jan 2022 15:42:18 +0100
Subject: [PATCH] Use bdo_ = beamlets data output, as prefix.
---
.../sdp/src/vhdl/node_sdp_beamformer.vhd | 18 ++++++++++--------
.../libraries/sdp/src/vhdl/sdp_station.vhd | 15 ++++++++-------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
index 9d6215cc77..c82f450ad9 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
@@ -77,12 +77,14 @@ ENTITY node_sdp_beamformer IS
sdp_info : IN t_sdp_info;
gn_id : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0);
- eth_src_mac : IN STD_LOGIC_VECTOR(c_network_eth_mac_addr_w-1 DOWNTO 0);
- ip_src_addr : IN STD_LOGIC_VECTOR(c_network_ip_addr_w-1 DOWNTO 0);
- udp_src_port : IN STD_LOGIC_VECTOR(c_network_udp_port_w-1 DOWNTO 0);
+ -- beamlet data output
+ bdo_eth_src_mac : IN STD_LOGIC_VECTOR(c_network_eth_mac_addr_w-1 DOWNTO 0);
+ bdo_ip_src_addr : IN STD_LOGIC_VECTOR(c_network_ip_addr_w-1 DOWNTO 0);
+ bdo_udp_src_port : IN STD_LOGIC_VECTOR(c_network_udp_port_w-1 DOWNTO 0);
- hdr_fields_out : OUT STD_LOGIC_VECTOR(1023 DOWNTO 0); -- Needed by nw_10GbE for PING/ARP
+ bdo_hdr_fields_out : OUT STD_LOGIC_VECTOR(1023 DOWNTO 0); -- Needed by nw_10GbE for PING/ARP
+ -- beamlet statistics offload
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);
stat_udp_src_port : IN STD_LOGIC_VECTOR(c_network_udp_port_w-1 DOWNTO 0)
@@ -220,11 +222,11 @@ BEGIN
sdp_info => sdp_info,
gn_id => gn_id,
- eth_src_mac => eth_src_mac,
- ip_src_addr => ip_src_addr,
- udp_src_port => udp_src_port,
+ eth_src_mac => bdo_eth_src_mac,
+ ip_src_addr => bdo_ip_src_addr,
+ udp_src_port => bdo_udp_src_port,
- hdr_fields_out => hdr_fields_out,
+ hdr_fields_out => bdo_hdr_fields_out,
reg_hdr_dat_mosi => reg_hdr_dat_mosi,
reg_hdr_dat_miso => reg_hdr_dat_miso,
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
index e9d91c1011..71f21d3af7 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
@@ -842,14 +842,15 @@ BEGIN
sdp_info => sdp_info,
gn_id => gn_id,
- eth_src_mac => cep_eth_src_mac,
- ip_src_addr => cep_ip_src_addr,
- udp_src_port => cep_udp_src_port,
- stat_eth_src_mac => stat_eth_src_mac,
+
+ bdo_eth_src_mac => cep_eth_src_mac,
+ bdo_ip_src_addr => cep_ip_src_addr,
+ bdo_udp_src_port => cep_udp_src_port,
+ bdo_hdr_fields_out => bf_10GbE_hdr_fields_out_arr(beamset_id),
+
+ stat_eth_src_mac => stat_eth_src_mac,
stat_ip_src_addr => stat_ip_src_addr,
- stat_udp_src_port => bst_udp_src_port,
-
- hdr_fields_out => bf_10GbE_hdr_fields_out_arr(beamset_id)
+ stat_udp_src_port => bst_udp_src_port
);
END GENERATE;
--
GitLab