diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd
index c8614845fb78c196b93ba64c9d0654c6e5567946..fc88e90a4a3bb1d561ce39a0571146b0799a99ec 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd
@@ -141,6 +141,7 @@ architecture tb of tb_lofar2_unb2b_sdp_station_bf is
constant c_exp_beamlet_scale : natural := natural(g_beamlet_scale * real(c_sdp_unit_beamlet_scale)); -- c_sdp_unit_beamlet_scale = 2**15;
constant c_exp_beamlet_index : natural := 0; -- depends on beamset bset * c_sdp_S_sub_bf
+ constant c_beamlet_index_mod : boolean := true;
constant c_exp_sdp_info : t_sdp_info := (
TO_UVEC(3, 6), -- antenna_field_index
@@ -1094,7 +1095,9 @@ begin
-- Therefore accept any beamlet_index MOD c_sdp_S_sub_bf = 0 as correct
-- in func_sdp_verify_cep_header().
if rx_beamlet_sosi.eop = '1' then
- v_bool := func_sdp_verify_cep_header(rx_sdp_cep_header, exp_sdp_cep_header);
+ v_bool := func_sdp_verify_cep_header(rx_sdp_cep_header,
+ exp_sdp_cep_header,
+ c_beamlet_index_mod);
end if;
end process;
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/tb_lofar2_unb2c_sdp_station_bf.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/tb_lofar2_unb2c_sdp_station_bf.vhd
index 0e6167477ddb76d0a8d3921ad585908e4aa30fce..6d12a8748c603307877e1ff8b00d90efd6c72014 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/tb_lofar2_unb2c_sdp_station_bf.vhd
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/tb_lofar2_unb2c_sdp_station_bf.vhd
@@ -233,6 +233,7 @@ architecture tb of tb_lofar2_unb2c_sdp_station_bf is
constant c_exp_beamlet_scale : natural := natural(g_beamlet_scale * real(c_sdp_unit_beamlet_scale)); -- c_sdp_unit_beamlet_scale = 2**15;
constant c_exp_beamlet_index : natural := 0; -- depends on beamset bset * c_sdp_S_sub_bf
+ constant c_beamlet_index_mod : boolean := true;
constant c_exp_sdp_info : t_sdp_info := (
TO_UVEC(3, 6), -- antenna_field_index
@@ -1352,7 +1353,9 @@ begin
-- Therefore accept any beamlet_index MOD c_sdp_S_sub_bf = 0 as correct
-- in func_sdp_verify_cep_header().
if rx_beamlet_sosi.eop = '1' then
- v_bool := func_sdp_verify_cep_header(rx_sdp_cep_header, exp_sdp_cep_header);
+ v_bool := func_sdp_verify_cep_header(rx_sdp_cep_header,
+ exp_sdp_cep_header,
+ c_beamlet_index_mod);
end if;
end process;
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/tb_lofar2_unb2c_sdp_station_bf_ring.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/tb_lofar2_unb2c_sdp_station_bf_ring.vhd
index f4ada61682a5443c7be855ec9c9ad6a42fd86828..18702afb27646b839fa7bcb523075e7799bd1366 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/tb_lofar2_unb2c_sdp_station_bf_ring.vhd
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/tb_lofar2_unb2c_sdp_station_bf_ring.vhd
@@ -245,6 +245,7 @@ architecture tb of tb_lofar2_unb2c_sdp_station_bf_ring is
constant c_exp_beamlet_scale : natural := natural(g_beamlet_scale * real(c_sdp_unit_beamlet_scale)); -- c_sdp_unit_beamlet_scale = 2**15;
constant c_exp_beamlet_index : natural := 0; -- depends on beamset bset * c_sdp_S_sub_bf
+ constant c_beamlet_index_mod : boolean := true;
constant c_exp_sdp_info : t_sdp_info := (
TO_UVEC(3, 6), -- antenna_field_index
@@ -1443,7 +1444,9 @@ begin
-- Therefore accept any beamlet_index MOD c_sdp_S_sub_bf = 0 as correct
-- in func_sdp_verify_cep_header().
if rx_beamlet_sosi.eop = '1' then
- v_bool := func_sdp_verify_cep_header(rx_sdp_cep_header, exp_sdp_cep_header);
+ v_bool := func_sdp_verify_cep_header(rx_sdp_cep_header,
+ exp_sdp_cep_header,
+ c_beamlet_index_mod);
end if;
end process;
diff --git a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd
index 512e44428bfef575e28ad1f8289af9f5250cb426..a6f9b19d3f5f044bee8c7b314f833dac4efd3275 100644
--- a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd
@@ -100,7 +100,11 @@ package tb_sdp_pkg is
beamlet_index : natural;
dp_bsn : natural) return t_sdp_cep_header;
- function func_sdp_verify_cep_header(in_hdr, exp_hdr : t_sdp_cep_header) return boolean;
+ function func_sdp_verify_cep_header(in_hdr : t_sdp_cep_header;
+ exp_hdr : t_sdp_cep_header;
+ beamlet_index_mod : boolean) return boolean;
+ function func_sdp_verify_cep_header(in_hdr : t_sdp_cep_header;
+ exp_hdr : t_sdp_cep_header) return boolean;
-----------------------------------------------------------------------------
-- Subband equalizer (ESub)
@@ -478,7 +482,9 @@ package body tb_sdp_pkg is
dp_bsn);
end func_sdp_compose_cep_header;
- function func_sdp_verify_cep_header(in_hdr, exp_hdr : t_sdp_cep_header) return boolean is
+ function func_sdp_verify_cep_header(in_hdr : t_sdp_cep_header;
+ exp_hdr : t_sdp_cep_header;
+ beamlet_index_mod : boolean) return boolean is
variable v_beamlet_index : natural;
begin
-- eth header
@@ -524,8 +530,11 @@ package body tb_sdp_pkg is
assert in_hdr.app.sdp_reserved = exp_hdr.app.sdp_reserved report "Wrong beamlet app.sdp_reserved" severity ERROR;
assert in_hdr.app.sdp_beamlet_scale = exp_hdr.app.sdp_beamlet_scale report "Wrong beamlet app.sdp_beamlet_scale" severity ERROR;
- -- Treat beamlet_index modulo c_sdp_S_sub_bf, because the beamlet packets from different beamsets may arrive in arbitrary order
- v_beamlet_index := TO_UINT(in_hdr.app.sdp_beamlet_index) mod c_sdp_S_sub_bf;
+ v_beamlet_index := TO_UINT(in_hdr.app.sdp_beamlet_index);
+ if beamlet_index_mod then
+ -- Treat beamlet_index modulo c_sdp_S_sub_bf, because the beamlet packets from different beamsets may arrive in arbitrary order
+ v_beamlet_index := v_beamlet_index mod c_sdp_S_sub_bf;
+ end if;
assert v_beamlet_index = TO_UINT(exp_hdr.app.sdp_beamlet_index) report "Wrong beamlet app.sdp_beamlet_index" severity ERROR;
assert in_hdr.app.sdp_nof_blocks_per_packet = exp_hdr.app.sdp_nof_blocks_per_packet report "Wrong beamlet app.sdp_nof_blocks_per_packet" severity ERROR;
assert in_hdr.app.sdp_nof_beamlets_per_block = exp_hdr.app.sdp_nof_beamlets_per_block report "Wrong beamlet app.sdp_nof_beamlets_per_block" severity ERROR;
@@ -535,6 +544,12 @@ package body tb_sdp_pkg is
return true;
end func_sdp_verify_cep_header;
+ function func_sdp_verify_cep_header(in_hdr : t_sdp_cep_header;
+ exp_hdr : t_sdp_cep_header) return boolean is
+ begin
+ return func_sdp_verify_cep_header(in_hdr, exp_hdr, false);
+ end func_sdp_verify_cep_header;
+
function func_sdp_subband_equalizer(sp_subband_ampl, sp_subband_phase, sp_esub_gain, sp_esub_phase,
cross_subband_ampl, cross_subband_phase, cross_esub_gain, cross_esub_phase : real)
return t_real_arr is -- 0:3 = ampl, phase, re, im