From 19e19251a4539cda91680200ffa9b1f1fcf9e866 Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Fri, 20 Mar 2015 15:51:05 +0000
Subject: [PATCH] -Made field defaults easier to regognize.
---
.../apertif_unb1_correlator_vis_offload.vhd | 50 +++++++++----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
index df778b9b40..04345ab16e 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator_vis_offload.vhd
@@ -87,8 +87,8 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
( field_name_pad("udp_checksum" ), " ", 16, field_default(0) ),
( field_name_pad("id_marker_byte" ), " ", 8, field_default(65) ), -- ASCII 'A'
( field_name_pad("id_format_version" ), " ", 8, field_default(1) ),
- ( field_name_pad("id_beamlet_index" ), " ", 16, field_default(0) ),
- ( field_name_pad("id_channel_index" ), " ", 16, field_default(0) ),
+ ( field_name_pad("id_beamlet_index" ), " ", 16, field_default(x"BEA1") ),
+ ( field_name_pad("id_channel_index" ), " ", 16, field_default(x"C0A1") ),
( field_name_pad("id_reserved" ), " ", 16, field_default(0) ),
( field_name_pad("id_timestamp" ), " ", 64, field_default(0) ),
-- ( field_name_pad("flag_input_0_7_reserved_1" ), " ", 1, field_default(0) ), --FIXME
@@ -106,7 +106,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_1_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_1_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_1_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_1_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_1_0_crc_error" ), " ", 8, field_default(1) ),
-- ( field_name_pad("flag_input_2_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_2_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_2_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -114,7 +114,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_2_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_2_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_2_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_2_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_2_0_crc_error" ), " ", 8, field_default(2) ),
-- ( field_name_pad("flag_input_3_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_3_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_3_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -122,7 +122,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_3_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_3_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_3_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_3_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_3_0_crc_error" ), " ", 8, field_default(3) ),
-- ( field_name_pad("flag_input_4_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_4_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_4_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -130,7 +130,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_4_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_4_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_4_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_4_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_4_0_crc_error" ), " ", 8, field_default(4) ),
-- ( field_name_pad("flag_input_5_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_5_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_5_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -138,7 +138,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_5_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_5_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_5_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_5_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_5_0_crc_error" ), " ", 8, field_default(5) ),
-- ( field_name_pad("flag_input_6_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_6_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_6_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -146,7 +146,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_6_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_6_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_6_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_6_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_6_0_crc_error" ), " ", 8, field_default(6) ),
-- ( field_name_pad("flag_input_7_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_7_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_7_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -154,7 +154,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_7_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_7_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_7_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_7_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_7_0_crc_error" ), " ", 8, field_default(7) ),
-- ( field_name_pad("flag_input_8_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_8_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_8_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -162,7 +162,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_8_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_8_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_8_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_8_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_8_0_crc_error" ), " ", 8, field_default(8) ),
-- ( field_name_pad("flag_input_9_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_9_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_9_5_telescope_off_target" ), " ", 1, field_default(0) ),
@@ -170,7 +170,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_9_3_noise_source_enabled" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_9_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_9_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_9_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_9_0_crc_error" ), " ", 8, field_default(9) ),
-- ( field_name_pad("flag_input_10_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_10_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_10_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -178,7 +178,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_10_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_10_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_10_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_10_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_10_0_crc_error" ), " ", 8, field_default(10) ),
-- ( field_name_pad("flag_input_11_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_11_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_11_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -186,7 +186,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_11_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_11_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_11_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_11_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_11_0_crc_error" ), " ", 8, field_default(11) ),
-- ( field_name_pad("flag_input_12_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_12_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_12_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -194,7 +194,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_12_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_12_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_12_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_12_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_12_0_crc_error" ), " ", 8, field_default(12) ),
-- ( field_name_pad("flag_input_13_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_13_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_13_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -202,7 +202,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_13_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_13_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_13_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_13_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_13_0_crc_error" ), " ", 8, field_default(13) ),
-- ( field_name_pad("flag_input_14_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_14_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_14_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -210,7 +210,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_14_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_14_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_14_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_14_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_14_0_crc_error" ), " ", 8, field_default(14) ),
-- ( field_name_pad("flag_input_15_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_15_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_15_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -218,7 +218,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_15_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_15_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_15_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_15_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_15_0_crc_error" ), " ", 8, field_default(15) ),
-- ( field_name_pad("flag_input_16_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_16_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_16_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -226,7 +226,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_16_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_16_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_16_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_16_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_16_0_crc_error" ), " ", 8, field_default(16) ),
-- ( field_name_pad("flag_input_17_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_17_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_17_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -234,7 +234,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_17_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_17_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_17_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_17_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_17_0_crc_error" ), " ", 8, field_default(17) ),
-- ( field_name_pad("flag_input_18_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_18_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_18_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -242,7 +242,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_18_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_18_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_18_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_18_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_18_0_crc_error" ), " ", 8, field_default(18) ),
-- ( field_name_pad("flag_input_19_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_19_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_19_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -250,7 +250,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_19_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_19_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_19_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_19_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_19_0_crc_error" ), " ", 8, field_default(19) ),
-- ( field_name_pad("flag_input_20_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_20_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_20_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -258,7 +258,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_20_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_20_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_20_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_20_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_20_0_crc_error" ), " ", 8, field_default(20) ),
-- ( field_name_pad("flag_input_21_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_21_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_21_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -266,7 +266,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_21_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_21_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_21_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_21_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_21_0_crc_error" ), " ", 8, field_default(21) ),
-- ( field_name_pad("flag_input_22_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_22_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_22_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -274,7 +274,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_22_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_22_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_22_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_22_0_crc_error" ), " ", 8, field_default(0) ),
+ ( field_name_pad("flag_input_22_0_crc_error" ), " ", 8, field_default(22) ),
-- ( field_name_pad("flag_input_23_7_reserved_1" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_23_6_reserved_0" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_23_5_telescope_off_target"), " ", 1, field_default(0) ),
@@ -282,7 +282,7 @@ ARCHITECTURE wrap OF apertif_unb1_correlator_vis_offload IS
-- ( field_name_pad("flag_input_23_3_noise_source_enabled"), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_23_2_uploading_weights" ), " ", 1, field_default(0) ),
-- ( field_name_pad("flag_input_23_1_no_signal" ), " ", 1, field_default(0) ),
- ( field_name_pad("flag_input_23_0_crc_error" ), " ", 8, field_default(0) ) );
+ ( field_name_pad("flag_input_23_0_crc_error" ), " ", 8, field_default(23) ) );
CONSTANT c_nof_id_fields : NATURAL := 6;
-- CONSTANT c_nof_flags_per_input : NATURAL := 8;--FIXME
--
GitLab