diff --git a/libraries/dsp/bf/src/vhdl/.bf.vhd b/libraries/dsp/bf/src/vhdl/.bf.vhd
new file mode 100644
index 0000000000000000000000000000000000000000..e60b32728f29f7d3883dd9865895d59e78c1f169
--- /dev/null
+++ b/libraries/dsp/bf/src/vhdl/.bf.vhd
@@ -0,0 +1,187 @@
+-----------------------------------------------------------------------------
+--
+-- Copyright (C) 2011
+-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/>
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-------------------------------------------------------------------------------
+
+-- Purpose: The bf unit is a structure that places multiple single bf_unit
+-- modules in parallel. It can be regarded as a hierarchical level in the design.
+--
+-- The bf entity takes the input data from the in_sosi_arr and feeds it to
+-- all bf_unit modules.
+
+LIBRARY IEEE, common_lib, dp_lib;
+USE IEEE.std_logic_1164.ALL;
+USE IEEE.numeric_std.ALL;
+USE common_lib.common_pkg.ALL;
+USE common_lib.common_mem_pkg.ALL;
+USE dp_lib.dp_stream_pkg.ALL;
+USE work.bf_pkg.ALL;
+
+ENTITY bf IS
+ GENERIC (
+ g_bf : t_c_bf := c_bf;
+ g_bf_weights_file_name : STRING := "UNUSED";
+ g_ss_wide_file_prefix : STRING := "UNUSED"; -- path_to_file
+ g_weights_write_only : BOOLEAN := FALSE -- When set to TRUE the M9K blocks are forced to Simple Dual Port mode. When FALSE it is True Dual Port.
+ );
+ PORT (
+ -- System
+ dp_rst : IN STD_LOGIC := '0';
+ dp_clk : IN STD_LOGIC;
+ mm_rst : IN STD_LOGIC;
+ mm_clk : IN STD_LOGIC;
+
+ -- MM interface
+ ram_ss_ss_wide_mosi : IN t_mem_mosi;
+ ram_ss_ss_wide_miso : OUT t_mem_miso := c_mem_miso_rst;
+ ram_bf_weights_mosi : IN t_mem_mosi;
+ ram_bf_weights_miso : OUT t_mem_miso := c_mem_miso_rst;
+ ram_st_sst_mosi : IN t_mem_mosi; -- Power statistics memory
+ ram_st_sst_miso : OUT t_mem_miso := c_mem_miso_rst;
+ reg_st_sst_mosi : IN t_mem_mosi; -- Power statistics register
+ reg_st_sst_miso : OUT t_mem_miso := c_mem_miso_rst;
+
+ -- ST interface
+ in_sosi_arr : IN t_dp_sosi_arr(g_bf.nof_input_streams-1 DOWNTO 0); -- subbands
+ in_siso_arr : OUT t_dp_siso_arr(g_bf.nof_input_streams-1 DOWNTO 0);
+ out_raw_sosi_arr : OUT t_dp_sosi_arr(g_bf.nof_bf_units-1 DOWNTO 0); -- raw beamlets
+ out_bst_sosi_arr : OUT t_dp_sosi_arr(g_bf.nof_bf_units-1 DOWNTO 0); -- 16b beamlets
+ out_qua_sosi_arr : OUT t_dp_sosi_arr(g_bf.nof_bf_units-1 DOWNTO 0) -- 8b beamlets
+ );
+END bf;
+
+ARCHITECTURE str OF bf IS
+
+ CONSTANT c_frame_size_in : POSITIVE := g_bf.nof_subbands*g_bf.nof_signal_paths/g_bf.nof_input_streams;
+ CONSTANT c_reg_st_addr_w : POSITIVE := ceil_log2(2);
+ CONSTANT c_ram_st_addr_w : POSITIVE := ceil_log2(g_bf.stat_data_sz*g_bf.nof_weights*c_nof_complex); -- The "c_nof_complex" is due to the crosslets capability.
+
+ TYPE t_in_siso_2arr IS ARRAY (INTEGER RANGE <>) OF t_dp_siso_arr(g_bf.nof_input_streams-1 DOWNTO 0);
+
+ SIGNAL in_siso_2arr : t_in_siso_2arr(g_bf.nof_bf_units-1 DOWNTO 0);
+
+ SIGNAL ram_bf_weights_mosi_arr : t_mem_mosi_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL ram_bf_weights_miso_arr : t_mem_miso_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL ram_st_sst_mosi_arr : t_mem_mosi_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL ram_st_sst_miso_arr : t_mem_miso_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL reg_st_sst_mosi_arr : t_mem_mosi_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL reg_st_sst_miso_arr : t_mem_miso_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL ram_ss_ss_wide_mosi_arr : t_mem_mosi_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+ SIGNAL ram_ss_ss_wide_miso_arr : t_mem_miso_arr(g_bf.nof_bf_units-1 DOWNTO 0);
+
+BEGIN
+
+ ------------------------------------------------------------------------------
+ -- The MM multiplexers
+ ------------------------------------------------------------------------------
+
+ -- Combine the internal array of mm interfaces for the weight factors to one array that is connected to the port of bf
+ u_mem_mux_weight : ENTITY common_lib.common_mem_mux
+ GENERIC MAP (
+ g_nof_mosi => g_bf.nof_bf_units,
+ g_mult_addr_w => ceil_log2(g_bf.nof_signal_paths*g_bf.nof_weights)
+ )
+ PORT MAP (
+ mosi => ram_bf_weights_mosi,
+ miso => ram_bf_weights_miso,
+ mosi_arr => ram_bf_weights_mosi_arr,
+ miso_arr => ram_bf_weights_miso_arr
+ );
+
+ -- Combine the internal array of mm interfaces for the beamlet statistics to one array that is connected to the port of bf
+ u_mem_mux_ram_bst : ENTITY common_lib.common_mem_mux
+ GENERIC MAP (
+ g_nof_mosi => g_bf.nof_bf_units,
+ g_mult_addr_w => c_ram_st_addr_w
+ )
+ PORT MAP (
+ mosi => ram_st_sst_mosi,
+ miso => ram_st_sst_miso,
+ mosi_arr => ram_st_sst_mosi_arr,
+ miso_arr => ram_st_sst_miso_arr
+ );
+
+ -- Combine the internal array of mm interfaces for the beamlet statistics to one array that is connected to the port of bf
+ u_mem_mux_reg_bst : ENTITY common_lib.common_mem_mux
+ GENERIC MAP (
+ g_nof_mosi => g_bf.nof_bf_units,
+ g_mult_addr_w => c_reg_st_addr_w
+ )
+ PORT MAP (
+ mosi => reg_st_sst_mosi,
+ miso => reg_st_sst_miso,
+ mosi_arr => reg_st_sst_mosi_arr,
+ miso_arr => reg_st_sst_miso_arr
+ );
+
+ -- Combine the internal array of mm interfaces for the ss_wide to one array that is connected to the port of bf
+ u_mem_mux_ss_wide : ENTITY common_lib.common_mem_mux
+ GENERIC MAP (
+ g_nof_mosi => g_bf.nof_bf_units,
+ g_mult_addr_w => ceil_log2(g_bf.nof_weights*g_bf.nof_signal_paths)
+ )
+ PORT MAP (
+ mosi => ram_ss_ss_wide_mosi,
+ miso => ram_ss_ss_wide_miso,
+ mosi_arr => ram_ss_ss_wide_mosi_arr,
+ miso_arr => ram_ss_ss_wide_miso_arr
+ );
+
+ ------------------------------------------------------------------------------
+ -- The BF units
+ ------------------------------------------------------------------------------
+ -- Instantiate multiple BF units.
+ gen_bf_units : FOR J IN 0 TO g_bf.nof_bf_units-1 GENERATE
+ u_bf_unit : ENTITY work.bf_unit
+ GENERIC MAP (
+ g_bf => g_bf,
+ g_bf_weights_file_name => sel_a_b(g_bf_weights_file_name = "UNUSED", g_bf_weights_file_name, g_bf_weights_file_name & "_" & NATURAL'IMAGE(J)),
+ g_ss_wide_file_prefix => sel_a_b(g_ss_wide_file_prefix = "UNUSED", g_ss_wide_file_prefix, g_ss_wide_file_prefix & "_" & NATURAL'IMAGE(J)),
+ g_weights_write_only => g_weights_write_only
+ )
+ PORT MAP (
+ -- System
+ dp_rst => dp_rst,
+ dp_clk => dp_clk,
+ mm_rst => mm_rst,
+ mm_clk => mm_clk,
+
+ -- MM interface
+ ram_ss_ss_wide_mosi => ram_ss_ss_wide_mosi_arr(J),
+ ram_ss_ss_wide_miso => ram_ss_ss_wide_miso_arr(J),
+ ram_bf_weights_mosi => ram_bf_weights_mosi_arr(J),
+ ram_bf_weights_miso => ram_bf_weights_miso_arr(J),
+ ram_st_sst_mosi => ram_st_sst_mosi_arr(J),
+ ram_st_sst_miso => ram_st_sst_miso_arr(J),
+ reg_st_sst_mosi => reg_st_sst_mosi_arr(J),
+ reg_st_sst_miso => reg_st_sst_miso_arr(J),
+
+ -- ST interface
+ in_sosi_arr => in_sosi_arr,
+ in_siso_arr => in_siso_2arr(J),
+ out_raw_sosi => out_raw_sosi_arr(J),
+ out_bst_sosi => out_bst_sosi_arr(J),
+ out_qua_sosi => out_qua_sosi_arr(J)
+ );
+ END GENERATE gen_bf_units;
+
+ in_siso_arr <= in_siso_2arr(0);
+
+END str;
+
diff --git a/libraries/dsp/bf/src/vhdl/bf_unit.vhd b/libraries/dsp/bf/src/vhdl/bf_unit.vhd
index 507ee9897fbf66dd3865ce9a01d0f73019dccbd6..617db016e3b5372a51cbc21c84cb209587011969 100644
--- a/libraries/dsp/bf/src/vhdl/bf_unit.vhd
+++ b/libraries/dsp/bf/src/vhdl/bf_unit.vhd
@@ -47,12 +47,12 @@
LIBRARY IEEE;
USE IEEE.std_logic_1164.ALL;
USE IEEE.numeric_std.ALL;
-LIBRARY common_lib, dp_lib, st_lib, ss_lib;
+LIBRARY common_lib, dp_lib, st_lib, reorder_lib;
USE common_lib.common_pkg.ALL;
USE common_lib.common_mem_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
USE st_lib.ALL;
-USE ss_lib.ALL;
+USE reorder_lib.ALL;
USE work.bf_pkg.ALL;
ENTITY bf_unit IS
@@ -205,7 +205,7 @@ BEGIN
in_siso_arr(I) <= ss_wide_in_siso_arr(I*c_nof_signal_paths_per_stream);
- u_ss_wide : ENTITY ss_lib.ss_wide
+ u_ss_wide : ENTITY reorder_lib.ss_wide
GENERIC MAP (
g_wb_factor => c_nof_signal_paths_per_stream,
g_dsp_data_w => g_bf.in_dat_w,