diff --git a/applications/apertif/designs/apertif_unb1_fn_bf_emu/src/vhdl/apertif_unb1_fn_bf_emu.vhd b/applications/apertif/designs/apertif_unb1_fn_bf_emu/src/vhdl/apertif_unb1_fn_bf_emu.vhd
index f815e8addca3837211830c6a941925c70f73d3c9..4d14c8d3409d6180eb983ed219f8853addd8cb46 100644
--- a/applications/apertif/designs/apertif_unb1_fn_bf_emu/src/vhdl/apertif_unb1_fn_bf_emu.vhd
+++ b/applications/apertif/designs/apertif_unb1_fn_bf_emu/src/vhdl/apertif_unb1_fn_bf_emu.vhd
@@ -198,6 +198,59 @@ ARCHITECTURE str OF apertif_unb1_fn_bf_emu IS
BEGIN
+ -----------------------------------------------------------------------------
+ -- Block generators: one for every BF unit (4)
+ -----------------------------------------------------------------------------
+ u_mms_diag_block_gen : ENTITY diag_lib.mms_diag_block_gen
+ GENERIC MAP (
+ g_nof_streams => 4,
+ g_buf_dat_w => 16,
+ g_buf_addr_w => ceil_log2(2*64),
+ g_file_name_prefix => "hex/bg_data",
+ g_diag_block_gen_rst => c_bg_ctrl
+ )
+ PORT MAP (
+ mm_rst => mm_rst,
+ mm_clk => mm_clk,
+
+ dp_rst => dp_rst,
+ dp_clk => dp_clk,
+
+ en_sync => dp_pps,
+
+ reg_bg_ctrl_mosi => reg_diag_bg_mosi,
+ reg_bg_ctrl_miso => reg_diag_bg_miso,
+
+ ram_bg_data_mosi => ram_diag_bg_mosi,
+ ram_bg_data_miso => ram_diag_bg_miso,
+
+ out_sosi_arr => dp_offload_tx_snk_in_arr
+ );
+
+ -----------------------------------------------------------------------------
+ -- DP offload TX : BF out -> 10GbE
+ -----------------------------------------------------------------------------
+ u_fn_beamformer_udp_offload : ENTITY work.apertif_unb1_fn_beamformer_udp_offload
+ PORT MAP (
+ mm_rst => mm_rst,
+ mm_clk => mm_clk,
+
+ dp_rst => dp_rst,
+ dp_clk => dp_clk,
+
+ snk_in_arr => dp_offload_tx_snk_in_arr, -- 8b beamlets
+
+ src_out_arr => dp_offload_tx_src_out_arr,
+ src_in_arr => dp_offload_tx_src_in_arr,
+
+ ID => ID,
+
+ reg_dp_offload_tx_mosi => c_mem_mosi_rst,
+ reg_dp_offload_tx_miso => OPEN,
+ reg_dp_offload_tx_hdr_dat_mosi => c_mem_mosi_rst,
+ reg_dp_offload_tx_hdr_dat_miso => OPEN
+ );
+
-----------------------------------------------------------------------------
-- Interface : 10GbE
-----------------------------------------------------------------------------
@@ -294,59 +347,6 @@ BEGIN
SI_FN_3_CNTRL => SI_FN_3_CNTRL
);
- -----------------------------------------------------------------------------
- -- Block generators: one for every BF unit (4)
- -----------------------------------------------------------------------------
- u_mms_diag_block_gen : ENTITY diag_lib.mms_diag_block_gen
- GENERIC MAP (
- g_nof_streams => 4,
- g_buf_dat_w => 16,
- g_buf_addr_w => ceil_log2(2*64),
- g_file_name_prefix => "hex/bg_data",
- g_diag_block_gen_rst => c_bg_ctrl
- )
- PORT MAP (
- mm_rst => mm_rst,
- mm_clk => mm_clk,
-
- dp_rst => dp_rst,
- dp_clk => dp_clk,
-
- en_sync => dp_pps,
-
- reg_bg_ctrl_mosi => reg_diag_bg_mosi,
- reg_bg_ctrl_miso => reg_diag_bg_miso,
-
- ram_bg_data_mosi => ram_diag_bg_mosi,
- ram_bg_data_miso => ram_diag_bg_miso,
-
- out_sosi_arr => dp_offload_tx_snk_in_arr
- );
-
- -----------------------------------------------------------------------------
- -- DP offload TX : BF out -> 10GbE
- -----------------------------------------------------------------------------
- u_fn_beamformer_udp_offload : ENTITY work.apertif_unb1_fn_beamformer_udp_offload
- PORT MAP (
- mm_rst => mm_rst,
- mm_clk => mm_clk,
-
- dp_rst => dp_rst,
- dp_clk => dp_clk,
-
- snk_in_arr => dp_offload_tx_snk_in_arr, -- 8b beamlets
-
- src_out_arr => dp_offload_tx_src_out_arr,
- src_in_arr => dp_offload_tx_src_in_arr,
-
- ID => ID,
-
- reg_dp_offload_tx_mosi => c_mem_mosi_rst,
- reg_dp_offload_tx_miso => OPEN,
- reg_dp_offload_tx_hdr_dat_mosi => c_mem_mosi_rst,
- reg_dp_offload_tx_hdr_dat_miso => OPEN
- );
-
-----------------------------------------------------------------------------
-- MM Master
-----------------------------------------------------------------------------