From baa3f7e09d3cdd52b73f143706a9cb2231570d63 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Thu, 2 Dec 2021 16:47:26 +0100
Subject: [PATCH] Use same port order as on sdp_statistics_offload entity.
---
.../libraries/sdp/src/vhdl/node_sdp_beamformer.vhd | 12 ++++++------
.../libraries/sdp/src/vhdl/node_sdp_filterbank.vhd | 10 +++++-----
2 files changed, 11 insertions(+), 11 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 e09f093799..9d6215cc77 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
@@ -297,11 +297,8 @@ BEGIN
reg_enable_mosi => reg_stat_enable_mosi,
reg_enable_miso => reg_stat_enable_miso,
- reg_hdr_dat_mosi => reg_stat_hdr_dat_mosi,
- reg_hdr_dat_miso => reg_stat_hdr_dat_miso,
-
- sdp_info => sdp_info,
- gn_index => TO_UINT(gn_id),
+ reg_hdr_dat_mosi => reg_stat_hdr_dat_mosi,
+ reg_hdr_dat_miso => reg_stat_hdr_dat_miso,
in_sosi => bf_sum_sosi,
out_sosi => bst_udp_sosi,
@@ -309,7 +306,10 @@ BEGIN
eth_src_mac => stat_eth_src_mac,
udp_src_port => stat_udp_src_port,
- ip_src_addr => stat_ip_src_addr
+ ip_src_addr => stat_ip_src_addr,
+
+ sdp_info => sdp_info,
+ gn_index => TO_UINT(gn_id)
);
---------------------------------------------------------------
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
index 4995e93e5b..aadbfee3b3 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
@@ -354,17 +354,17 @@ BEGIN
reg_hdr_dat_mosi => reg_hdr_dat_mosi,
reg_hdr_dat_miso => reg_hdr_dat_miso,
- sdp_info => sdp_info,
- gn_index => TO_UINT(gn_id),
- subband_calibrated_flag => subband_calibrated_flag,
-
in_sosi => dp_selector_out_sosi_arr(0),
out_sosi => sst_udp_sosi,
out_siso => sst_udp_siso,
eth_src_mac => eth_src_mac,
udp_src_port => udp_src_port,
- ip_src_addr => ip_src_addr
+ ip_src_addr => ip_src_addr,
+
+ gn_index => TO_UINT(gn_id),
+ sdp_info => sdp_info,
+ subband_calibrated_flag => subband_calibrated_flag
);
END str;
--
GitLab