diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_bf_weights.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_bf_weights.vhd index 07859970174088b07c794e12cf7081b2b71e9f82..3dec6eb52968ae1f86598a42c32e9e7771852cf2 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_bf_weights.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_bf_weights.vhd @@ -77,31 +77,32 @@ BEGIN -- [N_pol_bf][S_pn/Q_fft]_[S_sub_bf][Q_fft]. Therefore this counter -- has to account for this difference in order. p_cnt : PROCESS(dp_clk, dp_rst) - -- Use short index variables v_Q, v_B names, to ease recognizing them as (loop) indices. - VARIABLE v_Q, v_B : NATURAL; + -- Use short index variables v_Q, v_BLET names in capitals, to ease + -- recognizing them as (loop) indices. + VARIABLE v_Q, v_BLET : NATURAL; BEGIN IF dp_rst = '1' THEN cnt <= 0; v_Q := 0; - v_B := 0; + v_BLET := 0; ELSIF rising_edge(dp_clk) THEN IF in_sosi_arr(0).valid = '1' THEN IF in_sosi_arr(0).eop = '1' THEN v_Q := 0; - v_B := 0; + v_BLET := 0; ELSE IF v_Q >= c_sdp_Q_fft-1 THEN v_Q := 0; - IF v_B >= c_sdp_S_sub_bf-1 THEN - v_B := 0; + IF v_BLET >= c_sdp_S_sub_bf-1 THEN + v_BLET := 0; ELSE - v_B := v_B + 1; + v_BLET := v_BLET + 1; END IF; ELSE v_Q := v_Q + 1; END IF; END IF; - cnt <= v_Q * c_sdp_S_sub_bf + v_B; + cnt <= v_Q * c_sdp_S_sub_bf + v_BLET; END IF; END IF; END PROCESS; diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_subband_equalizer.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_subband_equalizer.vhd index 7ae6012f078832edcae802a8e94dec511874f292..05d222f417f158351779bbee469fc7b5543f3124 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_subband_equalizer.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_subband_equalizer.vhd @@ -77,30 +77,32 @@ BEGIN -- fsub[S_pn/Q_fft]_[N_sub][Q_fft]. Therefore the counter in -- sdp_subband_equalizer.vhd has to account for this difference in order. p_cnt : PROCESS(dp_clk, dp_rst) - VARIABLE v_Q_fft, v_N_sub : NATURAL; + -- Use short index variables v_Q, v_SUB names in capitals, to ease + -- recognizing them as (loop) indices. + VARIABLE v_Q, v_SUB : NATURAL; BEGIN IF dp_rst = '1' THEN cnt <= 0; - v_Q_fft := 0; - v_N_sub := 0; + v_Q := 0; + v_SUB := 0; ELSIF rising_edge(dp_clk) THEN IF in_sosi_arr(0).valid = '1' THEN IF in_sosi_arr(0).eop = '1' THEN - v_Q_fft := 0; - v_N_sub := 0; + v_Q := 0; + v_SUB := 0; ELSE - IF v_Q_fft >= c_sdp_Q_fft-1 THEN - v_Q_fft := 0; - IF v_N_sub >= c_sdp_N_sub-1 THEN - v_N_sub := 0; + IF v_Q >= c_sdp_Q_fft-1 THEN + v_Q := 0; + IF v_SUB >= c_sdp_N_sub-1 THEN + v_SUB := 0; ELSE - v_N_sub := v_N_sub + 1; + v_SUB := v_SUB + 1; END IF; ELSE - v_Q_fft := v_Q_fft + 1; + v_Q := v_Q + 1; END IF; END IF; - cnt <= v_Q_fft * c_sdp_N_sub + v_N_sub; + cnt <= v_Q * c_sdp_N_sub + v_SUB; END IF; END IF; END PROCESS;