From d01be1f2d10bd496a7fdef027261a2f01eda0757 Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Fri, 18 Mar 2022 12:12:07 +0100
Subject: [PATCH] processed review comments
---
.../lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd | 8 +++++---
.../lofar2/libraries/sdp/src/vhdl/sdp_station.vhd | 1 +
2 files changed, 6 insertions(+), 3 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 6069c939c6..e834c03983 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
@@ -85,8 +85,9 @@ ENTITY node_sdp_beamformer IS
reg_bsn_monitor_v2_bst_offload_cipo : OUT t_mem_cipo;
reg_bsn_monitor_v2_beamlet_output_copi : IN t_mem_copi := c_mem_copi_rst;
reg_bsn_monitor_v2_beamlet_output_cipo : OUT t_mem_cipo;
- sdp_info : IN t_sdp_info;
- gn_id : IN STD_LOGIC_VECTOR(c_sdp_W_gn_id-1 DOWNTO 0);
+ 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);
-- beamlet data output
bdo_eth_src_mac : IN STD_LOGIC_VECTOR(c_network_eth_mac_addr_w-1 DOWNTO 0);
@@ -133,7 +134,7 @@ ARCHITECTURE str OF node_sdp_beamformer IS
BEGIN
- rn_index <= TO_UINT(gn_id);
+ rn_index <= TO_UINT(SUB_UVEC(gn_id, ring_info.O_rn)) WHEN rising_edge(dp_clk); -- Using register to ease timing closure.
---------------------------------------------------------------
-- Beamlet Subband Select
@@ -379,6 +380,7 @@ BEGIN
ip_src_addr => stat_ip_src_addr,
gn_index => TO_UINT(gn_id),
+ ring_info => ring_info,
sdp_info => sdp_info,
weighted_subbands_flag => '1' -- because BF uses in_sosi_arr = fsub_sosi_arr, so weighted subbands
);
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
index 788ce58dd3..652c2b7f64 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd
@@ -821,6 +821,7 @@ BEGIN
reg_bsn_monitor_v2_beamlet_output_cipo => reg_bsn_monitor_v2_beamlet_output_cipo_arr(beamset_id),
sdp_info => sdp_info,
+ ring_info => ring_info,
gn_id => gn_id,
bdo_eth_src_mac => cep_eth_src_mac,
--
GitLab