diff options
author | Josh Blum <josh@joshknows.com> | 2011-02-17 15:54:04 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-02-17 15:54:04 -0800 |
commit | 11bf23d994fab2a01a27541db959dcc6991b5dd0 (patch) | |
tree | fd52f4ebe39134f3c1a02580ddef8df1f14b8dc2 /host/lib/usrp/usrp2/dsp_impl.cpp | |
parent | c73165bb1d6ec6c714426584e3b1ef15e2e87cb4 (diff) | |
download | uhd-11bf23d994fab2a01a27541db959dcc6991b5dd0.tar.gz uhd-11bf23d994fab2a01a27541db959dcc6991b5dd0.tar.bz2 uhd-11bf23d994fab2a01a27541db959dcc6991b5dd0.zip |
usrp2: prefix the dsp and ctrl registers with 0 in preparation for 2nd dsp
Diffstat (limited to 'host/lib/usrp/usrp2/dsp_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/dsp_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp index 8340f7cdd..5cf48fe96 100644 --- a/host/lib/usrp/usrp2/dsp_impl.cpp +++ b/host/lib/usrp/usrp2/dsp_impl.cpp @@ -98,7 +98,7 @@ void usrp2_mboard_impl::ddc_set(const wax::obj &key_, const wax::obj &val){ case DSP_PROP_FREQ_SHIFT:{ double new_freq = val.as<double>(); - _iface->poke32(_iface->regs.dsp_rx_freq, + _iface->poke32(_iface->regs.dsp0_rx_freq, dsp_type1::calc_cordic_word_and_update(new_freq, get_master_clock_freq()) ); _ddc_freq = new_freq; //shadow @@ -110,11 +110,11 @@ void usrp2_mboard_impl::ddc_set(const wax::obj &key_, const wax::obj &val){ _ddc_decim = pick_closest_rate(extact_rate, _allowed_decim_and_interp_rates); //set the decimation - _iface->poke32(_iface->regs.dsp_rx_decim_rate, dsp_type1::calc_cic_filter_word(_ddc_decim)); + _iface->poke32(_iface->regs.dsp0_rx_decim_rate, dsp_type1::calc_cic_filter_word(_ddc_decim)); //set the scaling static const boost::int16_t default_rx_scale_iq = 1024; - _iface->poke32(_iface->regs.dsp_rx_scale_iq, + _iface->poke32(_iface->regs.dsp0_rx_scale_iq, dsp_type1::calc_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq) ); } |