jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed valid_out signal for gain_corr=disabled

Browse Source 
git-svn-id: http://moon:8086/svn/vhdl/trunk@142 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2008-12-21 16:39:05 +00:00
parent 32e4a933b9
commit 080e286b1c
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/radio/cordic/src/cordic_pipe_top.vhd
+18 -10
View File
@@ -33,7 +33,7 @@ Generic
( (
cordic_mode : cordic_mode_t := cordic_mode_rotate; cordic_mode : cordic_mode_t := cordic_mode_rotate;
z_range : real := pi; z_range : real := pi;
gain_corr_mode : gain_corr_mode_t := gain_mode_unity; gain_corr_mode : gain_corr_mode_t := gain_mode_disabled;
nstages : integer := 18; nstages : integer := 18;
nbits_x_in : integer := 18; nbits_x_in : integer := 18;
nbits_y_in : integer := 18; nbits_y_in : integer := 18;
@@ -184,7 +184,7 @@ signal post_zin : sfixed(shi(nbits_z_out, nbits_frac_z_out) downto slo(nbits_z_
signal post_xout : sfixed(shi(nbits_x_out, nbits_frac_x_out) downto slo(nbits_x_out, nbits_frac_x_out)); signal post_xout : sfixed(shi(nbits_x_out, nbits_frac_x_out) downto slo(nbits_x_out, nbits_frac_x_out));
signal post_yout : sfixed(shi(nbits_y_out, nbits_frac_y_out) downto slo(nbits_y_out, nbits_frac_y_out)); signal post_yout : sfixed(shi(nbits_y_out, nbits_frac_y_out) downto slo(nbits_y_out, nbits_frac_y_out));
signal post_zout : sfixed(shi(nbits_z_out, nbits_frac_z_out) downto slo(nbits_z_out, nbits_frac_z_out)); signal post_zout : sfixed(shi(nbits_z_out, nbits_frac_z_out) downto slo(nbits_z_out, nbits_frac_z_out));
signal post_vld : std_logic;
begin begin
@@ -206,6 +206,7 @@ gen_output_unity:
xout <= post_xout; xout <= post_xout;
yout <= post_yout; yout <= post_yout;
zout <= post_zout; zout <= post_zout;
vld_out <= post_vld;
end generate; end generate;
gen_output_disabled: gen_output_disabled:
@@ -214,6 +215,7 @@ gen_output_disabled:
xout <= post_xin; xout <= post_xin;
yout <= post_yin; yout <= post_yin;
zout <= post_zin; zout <= post_zin;
vld_out <= stage_vld(nstages);
end generate; end generate;
----------------------------------------------------------------------- -----------------------------------------------------------------------
@@ -275,9 +277,13 @@ gen_pipe:
end generate; end generate;
Inst_cordic_pipe_post: cordic_pipe_post gen_post_process:
GENERIC MAP if gain_corr_mode = gain_mode_unity generate
( begin
Inst_cordic_pipe_post: cordic_pipe_post
GENERIC MAP
(
cordic_mode => cordic_mode_rotate, cordic_mode => cordic_mode_rotate,
nstages => nstages, nstages => nstages,
nbits_x => nbits_x_out, nbits_x => nbits_x_out,
@@ -286,9 +292,9 @@ GENERIC MAP
nbits_y_frac => nbits_frac_y_out, nbits_y_frac => nbits_frac_y_out,
nbits_z => nbits_z_out, nbits_z => nbits_z_out,
nbits_z_frac => nbits_frac_z_out nbits_z_frac => nbits_frac_z_out
) )
PORT MAP PORT MAP
( (
rst => rst, rst => rst,
clk => clk, clk => clk,
vld_in => stage_vld(nstages), vld_in => stage_vld(nstages),
@@ -298,8 +304,10 @@ PORT MAP
xout => post_xout, xout => post_xout,
yout => post_yout, yout => post_yout,
zout => post_zout, zout => post_zout,
vld_out => vld_out vld_out => post_vld
); );
end generate;
-------------------------------------------------------------------- --------------------------------------------------------------------
end Behavioral; end Behavioral;