From 4e8812c680f77724f5ccac1952602279d356b237 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 15 Feb 2022 16:04:59 +0100
Subject: [PATCH] Made antenne_band_index RW. Remove O_si, N_si because not
used. Move O_rn, N_rn to ring_info.
---
.../libraries/sdp/src/vhdl/sdp_info_reg.vhd | 21 ++++++-------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd
index 62bd4b9c5e..0fbbe4d31b 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd
@@ -60,18 +60,14 @@ END sdp_info_reg;
ARCHITECTURE str OF sdp_info_reg IS
- CONSTANT c_field_arr : t_common_field_arr(11 DOWNTO 0) :=
+ CONSTANT c_field_arr : t_common_field_arr(7 DOWNTO 0) :=
( (field_name_pad("station_id"), "RW", 16, field_default(0)),
- (field_name_pad("antenna_band_index"), "RO", 1, field_default(0)),
+ (field_name_pad("antenna_band_index"), "RW", 1, field_default(0)),
(field_name_pad("observation_id"), "RW", 32, field_default(0)),
(field_name_pad("nyquist_zone_index"), "RW", 2, field_default(0)),
(field_name_pad("f_adc"), "RO", 1, field_default(0)),
(field_name_pad("fsub_type"), "RO", 1, field_default(0)),
(field_name_pad("beam_repositioning_flag"), "RW", 1, field_default(0)),
- (field_name_pad("O_si"), "RW", 8, field_default(0)),
- (field_name_pad("N_si"), "RW", 8, field_default(0)),
- (field_name_pad("O_rn"), "RW", 8, field_default(0)),
- (field_name_pad("N_rn"), "RW", 8, field_default(0)),
(field_name_pad("block_period"), "RO", 16, field_default(0)) );
SIGNAL mm_fields_in : STD_LOGIC_VECTOR(field_slv_in_len(c_field_arr)-1 DOWNTO 0);
@@ -90,7 +86,6 @@ BEGIN
sdp_info_rd <= sdp_info_wr;
-- overrule the read only fields
- sdp_info_rd.antenna_band_index <= sdp_info_ro.antenna_band_index;
sdp_info_rd.f_adc <= sdp_info_ro.f_adc;
sdp_info_rd.fsub_type <= sdp_info_ro.fsub_type;
sdp_info_rd.block_period <= sdp_info_ro.block_period;
@@ -119,19 +114,15 @@ BEGIN
);
-- add "RO" fields to mm_fields
- mm_fields_in(field_hi(c_field_arr, "antenna_band_index") DOWNTO field_lo(c_field_arr, "antenna_band_index")) <= slv(sdp_info_rd.antenna_band_index);
- mm_fields_in(field_hi(c_field_arr, "f_adc") DOWNTO field_lo(c_field_arr, "f_adc")) <= slv(sdp_info_rd.f_adc);
- mm_fields_in(field_hi(c_field_arr, "fsub_type") DOWNTO field_lo(c_field_arr, "fsub_type")) <= slv(sdp_info_rd.fsub_type);
- mm_fields_in(field_hi(c_field_arr, "block_period") DOWNTO field_lo(c_field_arr, "block_period")) <= sdp_info_rd.block_period;
+ mm_fields_in(field_hi(c_field_arr, "f_adc") DOWNTO field_lo(c_field_arr, "f_adc")) <= slv(sdp_info_rd.f_adc);
+ mm_fields_in(field_hi(c_field_arr, "fsub_type") DOWNTO field_lo(c_field_arr, "fsub_type")) <= slv(sdp_info_rd.fsub_type);
+ mm_fields_in(field_hi(c_field_arr, "block_period") DOWNTO field_lo(c_field_arr, "block_period")) <= sdp_info_rd.block_period;
-- get "RW" fields from mm_fields
sdp_info_wr.station_id <= mm_fields_out(field_hi(c_field_arr, "station_id") DOWNTO field_lo(c_field_arr, "station_id"));
+ sdp_info_wr.antenna_band_index <= sl(mm_fields_out(field_hi(c_field_arr, "antenna_band_index") DOWNTO field_lo(c_field_arr, "antenna_band_index")));
sdp_info_wr.observation_id <= mm_fields_out(field_hi(c_field_arr, "observation_id") DOWNTO field_lo(c_field_arr, "observation_id"));
sdp_info_wr.nyquist_zone_index <= mm_fields_out(field_hi(c_field_arr, "nyquist_zone_index") DOWNTO field_lo(c_field_arr, "nyquist_zone_index"));
sdp_info_wr.beam_repositioning_flag <= sl(mm_fields_out(field_hi(c_field_arr, "beam_repositioning_flag") DOWNTO field_lo(c_field_arr, "beam_repositioning_flag")));
- sdp_info_wr.O_si <= mm_fields_out(field_hi(c_field_arr, "O_si") DOWNTO field_lo(c_field_arr, "O_si"));
- sdp_info_wr.N_si <= mm_fields_out(field_hi(c_field_arr, "N_si") DOWNTO field_lo(c_field_arr, "N_si"));
- sdp_info_wr.O_rn <= mm_fields_out(field_hi(c_field_arr, "O_rn") DOWNTO field_lo(c_field_arr, "O_rn"));
- sdp_info_wr.N_rn <= mm_fields_out(field_hi(c_field_arr, "N_rn") DOWNTO field_lo(c_field_arr, "N_rn"));
END str;
--
GitLab