Skip to content
Snippets Groups Projects
Commit efc1d7e8 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Rather use library work instead of pft2_lib (equivalent).

parent 77cd752e
No related branches found
No related tags found
2 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!68Resolve L2SDP-162
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
LIBRARY IEEE; LIBRARY IEEE;
USE IEEE.std_logic_1164.ALL; USE IEEE.std_logic_1164.ALL;
USE IEEE.numeric_std.ALL; USE IEEE.numeric_std.ALL;
USE work.pft_pkg.ALL;
LIBRARY pft2_lib;
USE pft2_lib.pft_pkg.ALL;
ENTITY pft IS ENTITY pft IS
...@@ -130,7 +128,7 @@ BEGIN ...@@ -130,7 +128,7 @@ BEGIN
-- NB. The first stage has index c_nof_stages-1, the last stage has index 0. -- NB. The first stage has index c_nof_stages-1, the last stage has index 0.
switch: ENTITY pft2_lib.pft_switch switch: ENTITY work.pft_switch
GENERIC MAP ( GENERIC MAP (
g_dat_w => g_in_dat_w, g_dat_w => g_in_dat_w,
g_fft_sz_w => g_fft_size_w g_fft_sz_w => g_fft_size_w
...@@ -150,7 +148,7 @@ BEGIN ...@@ -150,7 +148,7 @@ BEGIN
); );
first_gen : IF (c_nof_stages>1) GENERATE first_gen : IF (c_nof_stages>1) GENERATE
first_stage : ENTITY pft2_lib.pft_stage first_stage : ENTITY work.pft_stage
GENERIC MAP ( GENERIC MAP (
g_index => c_nof_stages-1, g_index => c_nof_stages-1,
g_in_dat_w => g_in_dat_w, g_in_dat_w => g_in_dat_w,
...@@ -172,7 +170,7 @@ BEGIN ...@@ -172,7 +170,7 @@ BEGIN
middle_gen : FOR i IN c_nof_stages-2 DOWNTO 1 GENERATE middle_gen : FOR i IN c_nof_stages-2 DOWNTO 1 GENERATE
middle_stage : ENTITY pft2_lib.pft_stage middle_stage : ENTITY work.pft_stage
GENERIC MAP ( GENERIC MAP (
g_index => i, g_index => i,
g_in_dat_w => g_stage_dat_w, g_in_dat_w => g_stage_dat_w,
...@@ -193,7 +191,7 @@ BEGIN ...@@ -193,7 +191,7 @@ BEGIN
END GENERATE; END GENERATE;
last_gen : IF c_nof_stages>1 GENERATE last_gen : IF c_nof_stages>1 GENERATE
last_stage : ENTITY pft2_lib.pft_stage last_stage : ENTITY work.pft_stage
GENERIC MAP ( GENERIC MAP (
g_index => 0, g_index => 0,
g_in_dat_w => g_stage_dat_w, g_in_dat_w => g_stage_dat_w,
...@@ -214,7 +212,7 @@ BEGIN ...@@ -214,7 +212,7 @@ BEGIN
END GENERATE; END GENERATE;
only_gen : IF c_nof_stages=1 GENERATE only_gen : IF c_nof_stages=1 GENERATE
only_stage : ENTITY pft2_lib.pft_stage only_stage : ENTITY work.pft_stage
GENERIC MAP ( GENERIC MAP (
g_index => 0, g_index => 0,
g_in_dat_w => g_in_dat_w, g_in_dat_w => g_in_dat_w,
...@@ -244,7 +242,7 @@ BEGIN ...@@ -244,7 +242,7 @@ BEGIN
buf_gen : IF g_mode /= PFT_MODE_BITREV GENERATE buf_gen : IF g_mode /= PFT_MODE_BITREV GENERATE
buf : ENTITY pft2_lib.pft_buffer buf : ENTITY work.pft_buffer
GENERIC MAP ( GENERIC MAP (
g_fft_size_w => g_fft_size_w, g_fft_size_w => g_fft_size_w,
g_dat_w => c_pft_dat_w g_dat_w => c_pft_dat_w
...@@ -268,7 +266,7 @@ BEGIN ...@@ -268,7 +266,7 @@ BEGIN
reverse_gen : IF g_mode = PFT_MODE_COMPLEX GENERATE reverse_gen : IF g_mode = PFT_MODE_COMPLEX GENERATE
reverse : ENTITY pft2_lib.pft_reverse reverse : ENTITY work.pft_reverse
GENERIC MAP ( GENERIC MAP (
g_fft_sz => 2**g_fft_size_w, g_fft_sz => 2**g_fft_size_w,
g_fft_sz_w => g_fft_size_w, g_fft_sz_w => g_fft_size_w,
...@@ -294,7 +292,7 @@ BEGIN ...@@ -294,7 +292,7 @@ BEGIN
separate_gen : IF g_mode = PFT_MODE_REAL2 GENERATE separate_gen : IF g_mode = PFT_MODE_REAL2 GENERATE
separate : ENTITY pft2_lib.pft_separate separate : ENTITY work.pft_separate
GENERIC MAP ( GENERIC MAP (
g_fft_sz => 2**g_fft_size_w, g_fft_sz => 2**g_fft_size_w,
g_fft_sz_w => g_fft_size_w, g_fft_sz_w => g_fft_size_w,
...@@ -318,7 +316,7 @@ BEGIN ...@@ -318,7 +316,7 @@ BEGIN
); );
END GENERATE; END GENERATE;
unswitch: ENTITY pft2_lib.pft_unswitch unswitch: ENTITY work.pft_unswitch
GENERIC MAP ( GENERIC MAP (
g_dat_w => g_out_dat_w, g_dat_w => g_out_dat_w,
g_fft_sz_w => g_fft_size_w g_fft_sz_w => g_fft_size_w
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment