diff --git a/libraries/dsp/fft/src/vhdl/fft_pkg.vhd b/libraries/dsp/fft/src/vhdl/fft_pkg.vhd index c98391b18d8599770bdb4e1166fc9a81b120b820..3f74a55c55f3864014c354c89472016dbd55e0e6 100644 --- a/libraries/dsp/fft/src/vhdl/fft_pkg.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_pkg.vhd @@ -45,7 +45,7 @@ package fft_pkg is constant c_fft : t_fft := (true, true, 0, 4, 0, 1024, 8, 14, c_dsp_mult_w, 2, true, 56, 2); -- Check consistancy of the FFT parameters - function fft_r2_parameter_asserts(g_fft : t_fft; use_fft_shift, use_transpose : boolean) return boolean; -- the return value is void + function fft_r2_parameter_asserts(g_fft : t_fft; use_fft_shift : boolean) return boolean; -- the return value is void -- Definitions for fft slv array (an array can not have unconstraint elements, so choose sufficiently wide 32 bit slv elements) subtype t_fft_slv_arr is t_slv_32_arr; -- use subtype to ease interfacing to existing types and to have central definition for rtwo components @@ -62,19 +62,17 @@ end package fft_pkg; package body fft_pkg is - function fft_r2_parameter_asserts(g_fft : t_fft; use_fft_shift, use_transpose : boolean) return boolean is + function fft_r2_parameter_asserts(g_fft : t_fft; use_fft_shift : boolean) return boolean is begin -- nof_points assert g_fft.nof_points=2**ceil_log2(g_fft.nof_points) report "fft_r2: nof_points must be a power of 2" severity failure; -- use_reorder if g_fft.use_reorder=false then - assert use_fft_shift=false report "fft_r2 : without use_reorder there cannot be use_fft_shift for complex input" severity failure; assert g_fft.use_separate=false report "fft_r2 : without use_reorder there cannot be use_separate for two real inputs" severity failure; - assert use_transpose=false report "fft_r2 : without use_reorder there cannot be use_transpose for wideband data" severity failure; + assert use_fft_shift=false report "fft_r2 : without use_reorder there cannot be use_fft_shift for complex input" severity failure; end if; - -- use_transpose - if g_fft.wb_factor=1 then - assert use_transpose=false report "fft_r2: for wb_factor=1 use_transpose is void, because use_transpose is only applicable for wideband data" severity failure; + if g_fft.use_separate=true then + assert use_fft_shift=false report "fft_r2 : with use_separate there cannot be use_fft_shift for real input" severity failure; end if; return true; end;