diff options
author | Matt Ettus <matt@ettus.com> | 2009-09-24 22:34:06 -0700 |
---|---|---|
committer | Matt Ettus <matt@ettus.com> | 2009-09-24 22:34:06 -0700 |
commit | 1b613dc7c995029b88391ffff768672d30149a1e (patch) | |
tree | e1a479a267d091e50f5e127a9458b846abdd6e0b /sdr_lib/dsp_core_rx.v | |
parent | 622efe894fd4ec2fced85355029b879e5c1fb32f (diff) | |
parent | 618ebd292a5b0acf221ef2d4ccf1a19596bc6c86 (diff) | |
download | uhd-1b613dc7c995029b88391ffff768672d30149a1e.tar.gz uhd-1b613dc7c995029b88391ffff768672d30149a1e.tar.bz2 uhd-1b613dc7c995029b88391ffff768672d30149a1e.zip |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to 'sdr_lib/dsp_core_rx.v')
-rw-r--r-- | sdr_lib/dsp_core_rx.v | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sdr_lib/dsp_core_rx.v b/sdr_lib/dsp_core_rx.v index ee713e4ac..af4f0b9fb 100644 --- a/sdr_lib/dsp_core_rx.v +++ b/sdr_lib/dsp_core_rx.v @@ -139,20 +139,20 @@ module dsp_core_rx always @(posedge clk) strobe_cic_d1 <= strobe_cic; small_hb_dec #(.WIDTH(18)) small_hb_i - (.clk(clk),.rst(rst),.bypass(~enable_hb1), + (.clk(clk),.rst(rst),.bypass(~enable_hb1),.run(run), .stb_in(strobe_cic_d1),.data_in(i_cic_scaled),.stb_out(strobe_hb1),.data_out(i_hb1)); small_hb_dec #(.WIDTH(18)) small_hb_q - (.clk(clk),.rst(rst),.bypass(~enable_hb1), + (.clk(clk),.rst(rst),.bypass(~enable_hb1),.run(run), .stb_in(strobe_cic_d1),.data_in(q_cic_scaled),.stb_out(),.data_out(q_hb1)); wire [8:0] cpi_hb = enable_hb1 ? {cic_decim_rate,1'b0} : {1'b0,cic_decim_rate}; hb_dec #(.IWIDTH(18), .OWIDTH(18), .CWIDTH(18), .ACCWIDTH(24)) hb_i - (.clk(clk),.rst(rst),.bypass(~enable_hb2),.cpi(cpi_hb), + (.clk(clk),.rst(rst),.bypass(~enable_hb2),.run(run),.cpi(cpi_hb), .stb_in(strobe_hb1),.data_in(i_hb1),.stb_out(strobe_hb2),.data_out(i_hb2)); hb_dec #(.IWIDTH(18), .OWIDTH(18), .CWIDTH(18), .ACCWIDTH(24)) hb_q - (.clk(clk),.rst(rst),.bypass(~enable_hb2),.cpi(cpi_hb), + (.clk(clk),.rst(rst),.bypass(~enable_hb2),.run(run),.cpi(cpi_hb), .stb_in(strobe_hb1),.data_in(q_hb1),.stb_out(),.data_out(q_hb2)); round #(.bits_in(18),.bits_out(16)) round_iout (.in(i_hb2),.out(i_out)); |