Define and use c_sdp_stat_data_sz = 2 and c_sdp_stat_data_byte_sz = 8.

applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd

@@ -164,6 +164,9 @@ PACKAGE sdp_pkg is
   CONSTANT c_sdp_offload_time : NATURAL := 600000;  -- L2SDP-452
 
   -- packet lengths, see ICD SC-SDP
+  CONSTANT c_sdp_stat_data_sz           : NATURAL := 2;  -- = 2 words = 64 bit data (= c_sdp_wpfb_subbands.stat_data_sz)
+  CONSTANT c_sdp_stat_data_byte_sz      : NATURAL := c_sdp_stat_data_sz * c_word_sz;  -- = 8 bytes = 64 bit data
+
   CONSTANT c_sdp_stat_app_header_len    : NATURAL := 32;
 
   FUNCTION func_sdp_get_stat_marker(g_statistics_type : STRING) RETURN NATURAL;
@@ -424,7 +427,7 @@ PACKAGE sdp_pkg is
 
   -- FSUB MM address widths
   CONSTANT c_sdp_ram_fil_coefs_addr_w       : NATURAL := ceil_log2(c_sdp_N_fft * c_sdp_N_taps);
-  CONSTANT c_sdp_ram_st_sst_addr_w          : NATURAL := ceil_log2(c_sdp_P_pfb*c_sdp_N_sub*c_sdp_Q_fft*c_sdp_wpfb_subbands.stat_data_sz);
+  CONSTANT c_sdp_ram_st_sst_addr_w          : NATURAL := ceil_log2(c_sdp_P_pfb * c_sdp_N_sub * c_sdp_Q_fft * c_sdp_stat_data_sz);
   CONSTANT c_sdp_reg_si_addr_w              : NATURAL := 1; --enable/disable
   CONSTANT c_sdp_ram_equalizer_gains_addr_w : NATURAL := ceil_log2(c_sdp_P_pfb*c_sdp_N_sub*c_sdp_Q_fft);
   CONSTANT c_sdp_reg_dp_selector_addr_w     : NATURAL := 1; --Select input 0 or 1.
@@ -438,7 +441,7 @@ PACKAGE sdp_pkg is
   CONSTANT c_sdp_ram_bf_weights_addr_w      : NATURAL := ceil_log2(c_sdp_N_beamsets) + ceil_log2(c_sdp_N_pol_bf * c_sdp_P_pfb * c_sdp_S_sub_bf * c_sdp_Q_fft);
   CONSTANT c_sdp_reg_bf_scale_addr_w        : NATURAL := ceil_log2(c_sdp_N_beamsets) + 1;  
   CONSTANT c_sdp_reg_dp_xonoff_addr_w       : NATURAL := ceil_log2(c_sdp_N_beamsets) + 1;
-  CONSTANT c_sdp_ram_st_bst_addr_w          : NATURAL := ceil_log2(c_sdp_N_beamsets) + ceil_log2(c_sdp_S_sub_bf*c_sdp_N_pol_bf*(c_longword_sz/c_word_sz));
+  CONSTANT c_sdp_ram_st_bst_addr_w          : NATURAL := ceil_log2(c_sdp_N_beamsets) + ceil_log2(c_sdp_S_sub_bf * c_sdp_N_pol_bf * c_sdp_stat_data_sz);
   CONSTANT c_sdp_reg_stat_enable_bst_addr_w : NATURAL := ceil_log2(c_sdp_N_beamsets) + c_sdp_reg_stat_enable_addr_w;
   CONSTANT c_sdp_reg_stat_hdr_dat_bst_addr_w: NATURAL := ceil_log2(c_sdp_N_beamsets) + c_sdp_reg_stat_hdr_dat_addr_w;
 
@@ -464,7 +467,7 @@ PACKAGE sdp_pkg is
   CONSTANT c_sdp_reg_crosslets_info_addr_w          : NATURAL := c_sdp_mm_reg_crosslets_info.adr_w;
   CONSTANT c_sdp_reg_nof_crosslets_addr_w           : NATURAL := c_sdp_mm_reg_nof_crosslets.adr_w;
   CONSTANT c_sdp_reg_bsn_sync_scheduler_xsub_addr_w : NATURAL := 4; 
-  CONSTANT c_sdp_ram_st_xsq_addr_w                  : NATURAL := ceil_log2(c_sdp_P_sq) + ceil_log2(c_sdp_N_crosslets_max * c_sdp_X_sq * c_nof_complex * (c_longword_sz/c_word_sz) );
+  CONSTANT c_sdp_ram_st_xsq_addr_w                  : NATURAL := ceil_log2(c_sdp_P_sq) + ceil_log2(c_sdp_N_crosslets_max * c_sdp_X_sq * c_nof_complex * c_sdp_stat_data_sz );
 
   -- RING MM address widths
   CONSTANT c_sdp_reg_bsn_monitor_v2_ring_rx_addr_w        : NATURAL := ceil_log2(c_sdp_N_ring_lanes_max) + ceil_log2(c_sdp_N_pn_max) + ceil_Log2(7); 
@@ -525,7 +528,7 @@ PACKAGE BODY sdp_pkg IS
     -- . SST : 4128 (= 4096 + 32)
     -- . BST : 7840 (= 7808 + 32)
     -- . XST : 2336 (= 2304 + 32)
-    RETURN c_nof_statistics_per_packet * c_longword_sz + c_sdp_stat_app_header_len;
+    RETURN c_nof_statistics_per_packet * c_sdp_stat_data_byte_sz + c_sdp_stat_app_header_len;
   END func_sdp_get_stat_app_total_length;
 
   FUNCTION func_sdp_get_stat_udp_total_length(g_statistics_type : STRING) RETURN NATURAL IS