Merge branch 'master' into L2SDP-502

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

@@ -69,6 +69,7 @@ ARCHITECTURE str OF sdp_crosslets_subband_select IS
 
 
   CONSTANT c_crosslets_info_dly  : NATURAL := 1;
+  CONSTANT c_col_select_addr_w   : NATURAL := ceil_log2(c_sdp_Q_fft * c_sdp_N_sub);
   CONSTANT c_row_select_slv_w    : NATURAL := ceil_log2(c_sdp_P_pfb);
   CONSTANT c_row_select_pipeline : NATURAL := 1;
   CONSTANT c_out_sosi_pipeline   : NATURAL := 1;
@@ -232,7 +233,7 @@ BEGIN
         END IF;
 
         v.col_select_mosi.rd := '1';
-        v.col_select_mosi.address(c_sdp_crosslets_index_w-1 DOWNTO 0) := TO_UVEC(c_sdp_Q_fft*v_offsets(r.offset_index) + r.col_index, c_sdp_crosslets_index_w);
+        v.col_select_mosi.address(c_col_select_addr_w-1 DOWNTO 0) := TO_UVEC(c_sdp_Q_fft*v_offsets(r.offset_index) + r.col_index, c_col_select_addr_w);
         v.row_select_slv := TO_UVEC(r.row_index, c_row_select_slv_w);
       END IF;
     END IF;