L2SDP-206, backup

applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd

@@ -31,6 +31,7 @@ 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 common_lib.common_network_layers_pkg.ALL;
 USE technology_lib.technology_pkg.ALL;
 USE unb2b_board_lib.unb2b_board_pkg.ALL;
 USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL;
@@ -511,10 +512,10 @@ BEGIN
     
     reg_sdp_info_mosi           => reg_sdp_info_mosi,
     reg_sdp_info_miso           => reg_sdp_info_miso,
-    reg_stat_enable_mosi        => reg_enable_mosi,
-    reg_stat_enable_miso        => reg_enable_miso,
-    reg_stat_hdr_dat_mosi       => reg_hdr_dat_mosi,
-    reg_stat_hdr_dat_miso       => reg_hdr_dat_miso
+    reg_stat_enable_mosi        => reg_stat_enable_mosi,
+    reg_stat_enable_miso        => reg_stat_enable_miso,
+    reg_stat_hdr_dat_mosi       => reg_stat_hdr_dat_mosi,
+    reg_stat_hdr_dat_miso       => reg_stat_hdr_dat_miso
   );
 
   

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

@@ -39,6 +39,7 @@ LIBRARY IEEE, common_lib, dp_lib, rTwoSDF_lib, wpfb_lib, filter_lib, si_lib, st_
 USE IEEE.STD_LOGIC_1164.ALL;
 USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
 USE rTwoSDF_lib.rTwoSDFPkg.ALL;
 USE filter_lib.fil_pkg.ALL;
@@ -49,7 +50,8 @@ ENTITY node_sdp_filterbank IS
   GENERIC (
     g_sim                    : BOOLEAN := FALSE;
     g_wpfb                   : t_wpfb := c_sdp_wpfb_subbands;
-    g_scope_selected_subband : NATURAL := 0
+    g_scope_selected_subband : NATURAL := 0;
+    g_offload_time           : NATURAL := 0    
   );
   PORT (
     dp_clk        : IN  STD_LOGIC;
@@ -58,6 +60,8 @@ ENTITY node_sdp_filterbank IS
     in_sosi_arr   : IN  t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0);
     pfb_sosi_arr  : OUT t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
     fsub_sosi_arr : OUT t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
+    sst_udp_siso  : IN  t_dp_siso := c_dp_siso_rst;
+    sst_udp_sosi  : OUT t_dp_sosi;
 
     mm_rst        : IN  STD_LOGIC;
     mm_clk        : IN  STD_LOGIC;
@@ -96,6 +100,10 @@ ARCHITECTURE str OF node_sdp_filterbank IS
   SIGNAL ram_st_sst_mosi_arr : t_mem_mosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_mosi_rst);
   SIGNAL ram_st_sst_miso_arr : t_mem_miso_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_miso_rst);
 
+  -- Subband statistics
+  SIGNAL ram_st_sst_mosi     : t_mem_mosi := c_mem_mosi_rst;
+  SIGNAL ram_st_sst_miso     : t_mem_miso := c_mem_miso_rst;
+
   SIGNAL si_sosi_arr                    : t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0)  := (OTHERS => c_dp_sosi_rst);
   SIGNAL wpfb_unit_out_sosi_arr         : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
   SIGNAL wpfb_unit_fil_sosi_arr         : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
@@ -295,11 +303,11 @@ BEGIN
     reg_hdr_dat_miso  => reg_hdr_dat_miso,
 
     sdp_info  => sdp_info,
-    gn_index  => gn_id,
+    gn_index  => TO_UINT(gn_id),
 
     in_sosi   => dp_selector_out_sosi_arr(0),
-    out_sosi  => offload_sosi,
-    out_siso  => offload_siso,
+    out_sosi  => sst_udp_sosi,
+    out_siso  => sst_udp_siso,
 
     eth_src_mac  => eth_src_mac,
     udp_src_port => udp_src_port,