From f0d245b618e61da33f6327ee42cd4b8276957179 Mon Sep 17 00:00:00 2001 From: Daniel van der Schuur <schuur@astron.nl> Date: Fri, 27 Jul 2018 07:45:07 +0000 Subject: [PATCH] -Removed unnecessary unb1_board_lib dependencies. --- .../arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab.vhd | 5 ++--- .../src/vhdl/arts_unb1_sc4_output_tab_i_packetizer.vhd | 5 ++--- .../src/vhdl/arts_unb1_sc4_output_tab_i_reorder.vhd | 3 +-- .../src/vhdl/arts_unb1_sc4_output_tab_iquv_buffer.vhd | 3 +-- .../src/vhdl/arts_unb1_sc4_output_tab_iquv_packetizer.vhd | 5 ++--- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab.vhd b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab.vhd index 8a81e17d6a..e2e246a1e8 100644 --- a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab.vhd +++ b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab.vhd @@ -31,7 +31,7 @@ -- Notes: -- . the 12 substreams of tab_snk_in_arr must be in sync -LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, unb1_board_lib, dp_lib, tech_tse_lib; +LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, dp_lib, tech_tse_lib; USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; @@ -39,7 +39,6 @@ USE common_lib.common_mem_pkg.ALL; USE common_lib.common_str_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE unb1_board_lib.unb1_board_pkg.ALL; USE tech_tse_lib.tech_tse_pkg.ALL; USE technology_lib.technology_select_pkg.ALL; @@ -89,7 +88,7 @@ ENTITY arts_unb1_sc4_output_tab IS reg_dp_xonoff_i_mosi : IN t_mem_mosi; reg_dp_xonoff_i_miso : OUT t_mem_miso; - ID : IN STD_LOGIC_VECTOR(c_unb1_board_aux.id_w-1 DOWNTO 0) + ID : IN STD_LOGIC_VECTOR(c_byte_w-1 DOWNTO 0) ); END arts_unb1_sc4_output_tab; diff --git a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_packetizer.vhd b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_packetizer.vhd index ebf939b448..f0dd6aa2d9 100644 --- a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_packetizer.vhd +++ b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_packetizer.vhd @@ -26,7 +26,7 @@ -- Description: -- . -LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, unb1_board_lib, dp_lib, tech_tse_lib, diag_lib; +LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, dp_lib, tech_tse_lib, diag_lib; USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; @@ -34,7 +34,6 @@ USE common_lib.common_mem_pkg.ALL; USE common_lib.common_str_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE unb1_board_lib.unb1_board_pkg.ALL; USE tech_tse_lib.tech_tse_pkg.ALL; USE technology_lib.technology_select_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -68,7 +67,7 @@ ENTITY arts_unb1_sc4_output_tab_i_packetizer IS snk_out : OUT t_dp_siso; snk_in : IN t_dp_sosi; - ID : IN STD_LOGIC_VECTOR(c_unb1_board_aux.id_w-1 DOWNTO 0) + ID : IN STD_LOGIC_VECTOR(c_byte_w-1 DOWNTO 0) ); END arts_unb1_sc4_output_tab_i_packetizer; diff --git a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_reorder.vhd b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_reorder.vhd index d57ca792d4..09ec84661f 100644 --- a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_reorder.vhd +++ b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_i_reorder.vhd @@ -27,7 +27,7 @@ -- . TODO For sim, we're passing along the input TAB/CB/SB/channel tags in the DP channel field. -- . We need to add an option to disable this for HW. -LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, unb1_board_lib, dp_lib, tech_tse_lib; +LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, dp_lib, tech_tse_lib; USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; @@ -35,7 +35,6 @@ USE common_lib.common_mem_pkg.ALL; USE common_lib.common_str_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE unb1_board_lib.unb1_board_pkg.ALL; USE tech_tse_lib.tech_tse_pkg.ALL; USE technology_lib.technology_select_pkg.ALL; diff --git a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_buffer.vhd b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_buffer.vhd index 8f949e5522..9dc66746bb 100644 --- a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_buffer.vhd +++ b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_buffer.vhd @@ -28,7 +28,7 @@ -- . Output: Single stream -LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, unb1_board_lib, dp_lib, tech_tse_lib; +LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, dp_lib, tech_tse_lib; USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; @@ -36,7 +36,6 @@ USE common_lib.common_mem_pkg.ALL; USE common_lib.common_str_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE unb1_board_lib.unb1_board_pkg.ALL; USE tech_tse_lib.tech_tse_pkg.ALL; USE technology_lib.technology_select_pkg.ALL; diff --git a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_packetizer.vhd b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_packetizer.vhd index 2be5b58af2..66e60bc6e5 100644 --- a/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_packetizer.vhd +++ b/applications/arts/designs/arts_unb1_sc4/src/vhdl/arts_unb1_sc4_output_tab_iquv_packetizer.vhd @@ -26,7 +26,7 @@ -- Description: -- . -LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, unb1_board_lib, dp_lib, tech_tse_lib, diag_lib; +LIBRARY IEEE, common_lib, work, technology_lib, mm_lib, dp_lib, tech_tse_lib, diag_lib; USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; @@ -34,7 +34,6 @@ USE common_lib.common_mem_pkg.ALL; USE common_lib.common_str_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE unb1_board_lib.unb1_board_pkg.ALL; USE tech_tse_lib.tech_tse_pkg.ALL; USE technology_lib.technology_select_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -68,7 +67,7 @@ ENTITY arts_unb1_sc4_output_tab_iquv_packetizer IS src_out : OUT t_dp_sosi; src_in : IN t_dp_siso; - ID : IN STD_LOGIC_VECTOR(c_unb1_board_aux.id_w-1 DOWNTO 0) + ID : IN STD_LOGIC_VECTOR(c_byte_w-1 DOWNTO 0) ); END arts_unb1_sc4_output_tab_iquv_packetizer; -- GitLab