From d82a090d3ec03056ef3cda8469f4fa9499c65623 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Wed, 9 Mar 2022 09:10:27 +0100
Subject: [PATCH] No functional change. Use short index variables names in
capitals, to ease recognizing them as (loop) indices.
---
.../libraries/sdp/src/vhdl/sdp_bf_weights.vhd | 17 ++++++------
.../sdp/src/vhdl/sdp_subband_equalizer.vhd | 26 ++++++++++---------
2 files changed, 23 insertions(+), 20 deletions(-)
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 0785997017..3dec6eb529 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 7ae6012f07..05d222f417 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;
--
GitLab