Updated libraries to new RadioHDL libraries

boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/node_unb1_fn_terminal_db.vhd

@@ -123,15 +123,17 @@
 --    advantage is that it
 
 
-LIBRARY IEEE, common_lib, dp_lib, unb_common_lib, diag_lib;
+LIBRARY IEEE, common_lib, dp_lib, unb1_board_lib, diag_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 unb_common_lib.unb_common_pkg.ALL;
+USE unb1_board_lib.unb1_board_pkg.ALL;
+USE unb1_board_lib.unb1_board_peripherals_pkg.ALL;
 
-ENTITY node_fn_terminal_db IS
+
+ENTITY node_unb1_fn_terminal_db IS
   GENERIC(
     g_sim                     : BOOLEAN := FALSE;
     g_sim_level               : NATURAL := 0;     -- 0 = simulate GX IP, 1 = use fast serial behavioural model
@@ -153,7 +155,7 @@ ENTITY node_fn_terminal_db IS
     g_mesh_mon_nof_words      : NATURAL := 1024;
     g_mesh_mon_use_sync       : BOOLEAN := TRUE;
     -- Auxiliary Interface
-    g_aux                     : t_c_unb_aux := c_unb_aux
+    g_aux                     : t_c_unb1_board_aux := c_unb1_board_aux
   );
   PORT(
     -- System
@@ -190,12 +192,12 @@ ENTITY node_fn_terminal_db IS
     dp_out_siso_arr             : IN  t_dp_siso_arr(g_usr_nof_streams-1 DOWNTO 0) := (OTHERS => c_dp_siso_rdy);
 
     -- Mesh serial interface (tr_nonbonded)
-    tx_serial_2arr              : OUT t_unb_mesh_sl_2arr;                            -- Tx
-    rx_serial_2arr              : IN  t_unb_mesh_sl_2arr:= (OTHERS=>(OTHERS=>'0'))   -- Rx support for diagnostics
+    tx_serial_2arr              : OUT t_unb1_board_mesh_sl_2arr;                            -- Tx
+    rx_serial_2arr              : IN  t_unb1_board_mesh_sl_2arr:= (OTHERS=>(OTHERS=>'0'))   -- Rx support for diagnostics
   );
-END node_fn_terminal_db;
+END node_unb1_fn_terminal_db;
 
-ARCHITECTURE str OF node_fn_terminal_db IS
+ARCHITECTURE str OF node_unb1_fn_terminal_db IS
   
   -----------------------------------------------------------------------------
   -- BSN align 
@@ -209,7 +211,7 @@ ARCHITECTURE str OF node_fn_terminal_db IS
   -- Terminals
   -----------------------------------------------------------------------------
   
-  CONSTANT c_usr_nof_streams_per_bus : NATURAL := g_usr_nof_streams/c_unb_nof_bn;  -- 16 / 4 = 4
+  CONSTANT c_usr_nof_streams_per_bus : NATURAL := g_usr_nof_streams/c_unb1_board_nof_bn;  -- 16 / 4 = 4
   
   -- . tr_nonbonded rx fifo
   CONSTANT c_burst_phy_nof_block  : NATURAL := c_usr_nof_streams_per_bus;  -- burst of 4 usr blocks per t0 per phy lane
@@ -229,11 +231,11 @@ ARCHITECTURE str OF node_fn_terminal_db IS
   CONSTANT c_sop_timeout          : NATURAL := (c_burst_bsn_latency + 1) * g_usr_block_per;  -- wait for sop for some block periods
   CONSTANT c_xoff_timeout         : NATURAL := c_burst_bsn_latency * 2 * g_usr_block_per;
   
-  SIGNAL rx_usr_siso_2arr         : t_unb_mesh_siso_2arr;
-  SIGNAL rx_usr_sosi_2arr         : t_unb_mesh_sosi_2arr;
+  SIGNAL rx_usr_siso_2arr         : t_unb1_board_mesh_siso_2arr;
+  SIGNAL rx_usr_sosi_2arr         : t_unb1_board_mesh_sosi_2arr;
 
-  SIGNAL rx_rew_siso_2arr         : t_unb_mesh_siso_2arr;
-  SIGNAL rx_rew_sosi_2arr         : t_unb_mesh_sosi_2arr;
+  SIGNAL rx_rew_siso_2arr         : t_unb1_board_mesh_siso_2arr;
+  SIGNAL rx_rew_sosi_2arr         : t_unb1_board_mesh_sosi_2arr;
 
   SIGNAL rx_usr_siso_arr          : t_dp_siso_arr(g_usr_nof_streams-1 DOWNTO 0);
   SIGNAL rx_usr_sosi_arr          : t_dp_sosi_arr(g_usr_nof_streams-1 DOWNTO 0);
@@ -250,13 +252,13 @@ BEGIN
     -- Terminals
     -----------------------------------------------------------------------------
   
-    u_terminals_mesh : ENTITY unb_common_lib.unb_terminals_mesh
+    u_terminals_mesh : ENTITY unb1_board_lib.unb1_board_terminals_mesh
     GENERIC MAP (
       g_sim                  => g_sim,
       g_sim_level            => g_sim_level,
       -- System
       g_node_type            => e_fn,
-      g_nof_bus              => c_unb_nof_bn,     -- 4 to 4 nodes in mesh
+      g_nof_bus              => c_unb1_board_nof_bn,     -- 4 to 4 nodes in mesh
       -- User
       g_usr_use_complex      => TRUE,
       g_usr_data_w           => g_usr_data_w,
@@ -322,14 +324,14 @@ BEGIN
     END GENERATE;
   
     gen_multi_unb: IF g_multi_unb = TRUE GENERATE        
-      rx_rew_sosi_2arr <= func_unb_transpose_2arr(rx_usr_sosi_2arr);
-      rx_usr_siso_2arr <= func_unb_transpose_2arr(rx_rew_siso_2arr);
+      rx_rew_sosi_2arr <= func_unb1_board_transpose_2arr(rx_usr_sosi_2arr);
+      rx_usr_siso_2arr <= func_unb1_board_transpose_2arr(rx_rew_siso_2arr);
     END GENERATE;
    
     ---------------------------------------------------------------------------------------
     -- From 2d to 1d array
     ---------------------------------------------------------------------------------------
-    gen_i : FOR I IN 0 TO c_unb_nof_bn-1 GENERATE
+    gen_i : FOR I IN 0 TO c_unb1_board_nof_bn-1 GENERATE
       gen_j : FOR J IN 0 TO c_usr_nof_streams_per_bus-1 GENERATE
         rx_rew_siso_2arr(I)(J)                           <= rx_usr_siso_arr(I*c_usr_nof_streams_per_bus + J);
         rx_usr_sosi_arr(I*c_usr_nof_streams_per_bus + J) <= rx_rew_sosi_2arr(I)(J);