diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-22 09:50:35 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-22 09:50:35 +0000 |
| commit | 6ba5135c96d81d23eafa4f0740ebbf113d8c798f (patch) | |
| tree | 50dbe1ac4d36c1a00374718d478617dbb18cd2ef /host/lib/usrp/usrp2/dsp_impl.cpp | |
| parent | 10ee8022dd22f13f942d8bfeeca3b380224fff52 (diff) | |
| parent | d66efda608db9f6a1c2ab64659556b53810d87b7 (diff) | |
| download | uhd-6ba5135c96d81d23eafa4f0740ebbf113d8c798f.tar.gz uhd-6ba5135c96d81d23eafa4f0740ebbf113d8c798f.tar.bz2 uhd-6ba5135c96d81d23eafa4f0740ebbf113d8c798f.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into u1e_uhd
Conflicts:
host/include/uhd/usrp/dboard_id.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/dsp_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/dsp_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp index 54ed45e41..34cce0afb 100644 --- a/host/lib/usrp/usrp2/dsp_impl.cpp +++ b/host/lib/usrp/usrp2/dsp_impl.cpp @@ -53,7 +53,7 @@ static boost::uint32_t calculate_iq_scale_word(boost::int16_t i, boost::int16_t void usrp2_impl::init_ddc_config(void){ //create the ddc in the rx dsp dict - _rx_dsps["ddc0"] = wax_obj_proxy( + _rx_dsps["ddc0"] = wax_obj_proxy::make( boost::bind(&usrp2_impl::ddc_get, this, _1, _2), boost::bind(&usrp2_impl::ddc_set, this, _1, _2) ); @@ -201,7 +201,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){ **********************************************************************/ void usrp2_impl::init_duc_config(void){ //create the duc in the tx dsp dict - _tx_dsps["duc0"] = wax_obj_proxy( + _tx_dsps["duc0"] = wax_obj_proxy::make( boost::bind(&usrp2_impl::duc_get, this, _1, _2), boost::bind(&usrp2_impl::duc_set, this, _1, _2) ); |