diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-09 16:56:53 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-09 16:56:53 -0700 |
| commit | 349d99c988b2eeb3d13d6229cbd4b80bc9f8153a (patch) | |
| tree | 1c902bf9199f9f131987e6dec42156c56f481eea /fpga/usrp2/sdr_lib | |
| parent | 55658336cf67810ab8cd7829b9a1fa86c8cd4539 (diff) | |
| parent | c174bf9acb2b2d142456f1186bd3e41e40d8a6d1 (diff) | |
| download | uhd-349d99c988b2eeb3d13d6229cbd4b80bc9f8153a.tar.gz uhd-349d99c988b2eeb3d13d6229cbd4b80bc9f8153a.tar.bz2 uhd-349d99c988b2eeb3d13d6229cbd4b80bc9f8153a.zip | |
Merge branch 'features' into uhd_fpga_features
Conflicts:
fpga/usrp2/vrt/vita_rx_control.v
Diffstat (limited to 'fpga/usrp2/sdr_lib')
| -rw-r--r-- | fpga/usrp2/sdr_lib/dsp_core_tx.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp2/sdr_lib/dsp_core_tx.v b/fpga/usrp2/sdr_lib/dsp_core_tx.v index 22d3d44a3..79d92c9b3 100644 --- a/fpga/usrp2/sdr_lib/dsp_core_tx.v +++ b/fpga/usrp2/sdr_lib/dsp_core_tx.v @@ -29,11 +29,11 @@ module dsp_core_tx (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), .in(set_data),.out({scale_i,scale_q}),.changed()); - setting_reg #(.my_addr(BASE+2)) sr_2 + setting_reg #(.my_addr(BASE+2), .width(10)) sr_2 (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), .in(set_data),.out({enable_hb1, enable_hb2, interp_rate}),.changed()); - setting_reg #(.my_addr(BASE+4)) sr_4 + setting_reg #(.my_addr(BASE+4), .width(8)) sr_4 (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), .in(set_data),.out({dacmux_b,dacmux_a}),.changed()); |