diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-27 14:27:55 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-27 14:27:55 -0700 |
| commit | b71d0cbea9e1e107eeb1da51ef14fe6b9e983ee6 (patch) | |
| tree | f0b8e41990c2600cac35467b3dcfbfed097d86cc /host/lib/usrp/usrp2/dsp_impl.cpp | |
| parent | 52df9afd679fd0f42edeef29f0bbc0d7bd76559e (diff) | |
| download | uhd-b71d0cbea9e1e107eeb1da51ef14fe6b9e983ee6.tar.gz uhd-b71d0cbea9e1e107eeb1da51ef14fe6b9e983ee6.tar.bz2 uhd-b71d0cbea9e1e107eeb1da51ef14fe6b9e983ee6.zip | |
refactored types.hpp into types directory
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 654096d14..40ef06a8c 100644 --- a/host/lib/usrp/usrp2/dsp_impl.cpp +++ b/host/lib/usrp/usrp2/dsp_impl.cpp @@ -35,7 +35,7 @@ template <class T> T log2(T num){ /*********************************************************************** * DDC Helper Methods **********************************************************************/ -static boost::uint32_t calculate_freq_word_and_update_actual_freq(freq_t &freq, freq_t clock_freq){ +static boost::uint32_t calculate_freq_word_and_update_actual_freq(double &freq, double clock_freq){ double scale_factor = std::pow(2.0, 32); //calculate the freq register word @@ -163,7 +163,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){ return; } else if (key_name == "freq"){ - freq_t new_freq = val.as<freq_t>(); + double new_freq = val.as<double>(); ASSERT_THROW(new_freq <= get_master_clock_freq()/2.0); ASSERT_THROW(new_freq >= -get_master_clock_freq()/2.0); _ddc_freq = new_freq; //shadow @@ -283,7 +283,7 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){ return; } else if (key_name == "freq"){ - freq_t new_freq = val.as<freq_t>(); + double new_freq = val.as<double>(); ASSERT_THROW(new_freq <= get_master_clock_freq()/2.0); ASSERT_THROW(new_freq >= -get_master_clock_freq()/2.0); _duc_freq = new_freq; //shadow |