diff --git a/libraries/base/diag/src/vhdl/diag_pkg.vhd b/libraries/base/diag/src/vhdl/diag_pkg.vhd
index c24f0aaa651999b4766123f9030b997335b77005..95a73d6343f66e255ea73262ce3d2702da4a1e8f 100644
--- a/libraries/base/diag/src/vhdl/diag_pkg.vhd
+++ b/libraries/base/diag/src/vhdl/diag_pkg.vhd
@@ -117,15 +117,24 @@ PACKAGE diag_pkg IS
     bsn_init           : STD_LOGIC_VECTOR(c_diag_bg_bsn_init_w           -1 DOWNTO 0);  
   END RECORD;   
   
-  CONSTANT c_diag_block_gen_rst : t_diag_block_gen := (                       '0',      
-                                                                              '0',      
-                                                       TO_UVEC(               256, c_diag_bg_samples_per_packet_w), 
-                                                       TO_UVEC(                10, c_diag_bg_blocks_per_sync_w),      
-                                                       TO_UVEC(               128, c_diag_bg_gapsize_w), 
-                                                       TO_UVEC(                 0, c_diag_bg_mem_low_adrs_w),      
-                                                       TO_UVEC(                 1, c_diag_bg_mem_high_adrs_w), 
-                                                       TO_UVEC(                 0, c_diag_bg_bsn_init_w));      
-  
+  CONSTANT c_diag_block_gen_rst     : t_diag_block_gen := (         '0',      
+                                                                    '0',      
+                                                           TO_UVEC( 256, c_diag_bg_samples_per_packet_w), 
+                                                           TO_UVEC(  10, c_diag_bg_blocks_per_sync_w),      
+                                                           TO_UVEC( 128, c_diag_bg_gapsize_w), 
+                                                           TO_UVEC(   0, c_diag_bg_mem_low_adrs_w),      
+                                                           TO_UVEC(   1, c_diag_bg_mem_high_adrs_w), 
+                                                           TO_UVEC(   0, c_diag_bg_bsn_init_w));      
+  
+  CONSTANT c_diag_block_gen_enabled : t_diag_block_gen := (         '1',
+                                                                    '0',      
+                                                           TO_UVEC(  50, c_diag_bg_samples_per_packet_w), 
+                                                           TO_UVEC(  10, c_diag_bg_blocks_per_sync_w),      
+                                                           TO_UVEC(   7, c_diag_bg_gapsize_w), 
+                                                           TO_UVEC(   0, c_diag_bg_mem_low_adrs_w),      
+                                                           TO_UVEC(  15, c_diag_bg_mem_high_adrs_w),   -- fits any BG buffer that has address width >= 4
+                                                           TO_UVEC(   0, c_diag_bg_bsn_init_w));
+                                                       
   TYPE t_diag_block_gen_arr IS ARRAY (INTEGER RANGE <>) OF t_diag_block_gen;
  
   -- Overloaded sel_a_b (from common_pkg) for t_diag_block_gen