From 474a067de5ad57eb7df0f31d61e8a9e9d8d768c1 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Thu, 19 Oct 2023 16:36:41 +0200
Subject: [PATCH] Process comment comments.
---
.../src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd | 4 +-
.../src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd | 4 +-
.../sdp/src/vhdl/node_sdp_beamformer.vhd | 46 ++++++++++---------
.../sdp/src/vhdl/sdp_beamformer_output.vhd | 2 -
4 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd
index 3c52c23bfd..7a65b2f238 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd
@@ -190,9 +190,11 @@ entity mmm_lofar2_unb2b_sdp_station is
reg_bf_scale_copi : out t_mem_copi;
reg_bf_scale_cipo : in t_mem_cipo;
- -- Beamlet Data Output header fields
+ -- Beamlet Data Output (BDO) header fields
+ -- . single destination, used when revision.nof_bdo_destinations_max = 1
reg_hdr_dat_copi : out t_mem_copi;
reg_hdr_dat_cipo : in t_mem_cipo;
+ -- . multiple destinations, used when revision.nof_bdo_destinations_max > 1
reg_bdo_destinations_copi : out t_mem_copi;
reg_bdo_destinations_cipo : in t_mem_cipo;
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd
index 6b8e3e11f4..e7071c6a16 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd
@@ -183,9 +183,11 @@ entity mmm_lofar2_unb2c_sdp_station is
reg_bf_scale_copi : out t_mem_copi;
reg_bf_scale_cipo : in t_mem_cipo;
- -- Beamlet Data Output header fields
+ -- Beamlet Data Output (BDO) header fields
+ -- . single destination, used when revision.nof_bdo_destinations_max = 1
reg_hdr_dat_copi : out t_mem_copi;
reg_hdr_dat_cipo : in t_mem_cipo;
+ -- . multiple destinations, used when revision.nof_bdo_destinations_max > 1
reg_bdo_destinations_copi : out t_mem_copi;
reg_bdo_destinations_cipo : in t_mem_cipo;
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 050d956475..bfdc7b5a69 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
@@ -67,26 +67,27 @@ entity node_sdp_beamformer is
mm_rst : in std_logic;
mm_clk : in std_logic;
- ram_ss_ss_wide_mosi : in t_mem_mosi := c_mem_mosi_rst;
- ram_ss_ss_wide_miso : out t_mem_miso;
- ram_bf_weights_mosi : in t_mem_mosi := c_mem_mosi_rst;
- ram_bf_weights_miso : out t_mem_miso;
- reg_bf_scale_mosi : in t_mem_mosi := c_mem_mosi_rst;
- reg_bf_scale_miso : out t_mem_miso;
- reg_hdr_dat_mosi : in t_mem_mosi := c_mem_mosi_rst;
- reg_hdr_dat_miso : out t_mem_miso;
+ ram_ss_ss_wide_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ ram_ss_ss_wide_miso : out t_mem_miso;
+ ram_bf_weights_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ ram_bf_weights_miso : out t_mem_miso;
+ reg_bf_scale_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ reg_bf_scale_miso : out t_mem_miso;
+ reg_hdr_dat_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ reg_hdr_dat_miso : out t_mem_miso;
reg_bdo_destinations_copi : in t_mem_copi := c_mem_mosi_rst;
reg_bdo_destinations_cipo : out t_mem_cipo;
- reg_dp_xonoff_mosi : in t_mem_mosi := c_mem_mosi_rst;
- reg_dp_xonoff_miso : out t_mem_miso;
- ram_st_bst_mosi : in t_mem_mosi := c_mem_mosi_rst;
- ram_st_bst_miso : out t_mem_miso;
- reg_stat_enable_mosi : in t_mem_mosi := c_mem_mosi_rst;
- reg_stat_enable_miso : out t_mem_miso;
- reg_stat_hdr_dat_mosi : in t_mem_mosi := c_mem_mosi_rst;
- reg_stat_hdr_dat_miso : out t_mem_miso;
- reg_bsn_align_copi : in t_mem_copi := c_mem_copi_rst;
- reg_bsn_align_cipo : out t_mem_cipo;
+ reg_dp_xonoff_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ reg_dp_xonoff_miso : out t_mem_miso;
+ ram_st_bst_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ ram_st_bst_miso : out t_mem_miso;
+ reg_stat_enable_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ reg_stat_enable_miso : out t_mem_miso;
+ reg_stat_hdr_dat_mosi : in t_mem_mosi := c_mem_mosi_rst;
+ reg_stat_hdr_dat_miso : out t_mem_miso;
+ reg_bsn_align_copi : in t_mem_copi := c_mem_copi_rst;
+ reg_bsn_align_cipo : out t_mem_cipo;
+
reg_bsn_monitor_v2_bsn_align_input_copi : in t_mem_copi := c_mem_copi_rst;
reg_bsn_monitor_v2_bsn_align_input_cipo : out t_mem_cipo;
reg_bsn_monitor_v2_bsn_align_output_copi : in t_mem_copi := c_mem_copi_rst;
@@ -95,6 +96,7 @@ 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;
ring_info : in t_ring_info;
gn_id : in std_logic_vector(c_sdp_W_gn_id - 1 downto 0);
@@ -282,12 +284,12 @@ begin
hdr_fields_out => bdo_hdr_fields_out,
- reg_hdr_dat_mosi => reg_hdr_dat_mosi,
- reg_hdr_dat_miso => reg_hdr_dat_miso,
+ reg_hdr_dat_mosi => reg_hdr_dat_mosi,
+ reg_hdr_dat_miso => reg_hdr_dat_miso,
reg_destinations_copi => reg_bdo_destinations_copi,
reg_destinations_cipo => reg_bdo_destinations_cipo,
- reg_dp_xonoff_mosi => reg_dp_xonoff_mosi,
- reg_dp_xonoff_miso => reg_dp_xonoff_miso
+ reg_dp_xonoff_mosi => reg_dp_xonoff_mosi,
+ reg_dp_xonoff_miso => reg_dp_xonoff_miso
);
bf_udp_sosi <= mon_bf_udp_sosi;
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_beamformer_output.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_beamformer_output.vhd
index f730e3020f..32cf827e73 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_beamformer_output.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_beamformer_output.vhd
@@ -63,10 +63,8 @@ entity sdp_beamformer_output is
reg_hdr_dat_mosi : in t_mem_mosi := c_mem_mosi_rst;
reg_hdr_dat_miso : out t_mem_miso;
-
reg_destinations_copi : in t_mem_copi := c_mem_mosi_rst;
reg_destinations_cipo : out t_mem_cipo;
-
reg_dp_xonoff_mosi : in t_mem_mosi := c_mem_mosi_rst;
reg_dp_xonoff_miso : out t_mem_miso;
--
GitLab