diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-16 00:09:47 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-16 00:09:47 -0700 |
commit | 564bfee0389d0274e7cd128d61dcbe50ca6a6cdd (patch) | |
tree | 5f06ae5b63a0c52f0b52562d2c12c70a1faed17d /host/lib/usrp/usrp1/dsp_impl.cpp | |
parent | 963f60c69c25a1295b5ed4dee07df5d91567deb7 (diff) | |
download | uhd-564bfee0389d0274e7cd128d61dcbe50ca6a6cdd.tar.gz uhd-564bfee0389d0274e7cd128d61dcbe50ca6a6cdd.tar.bz2 uhd-564bfee0389d0274e7cd128d61dcbe50ca6a6cdd.zip |
usrp1: compiling with the latest next
Diffstat (limited to 'host/lib/usrp/usrp1/dsp_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp1/dsp_impl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp1/dsp_impl.cpp b/host/lib/usrp/usrp1/dsp_impl.cpp index 1a8993a01..260c01ea8 100644 --- a/host/lib/usrp/usrp1/dsp_impl.cpp +++ b/host/lib/usrp/usrp1/dsp_impl.cpp @@ -17,11 +17,12 @@ #include "usrp1_impl.hpp" #include "fpga_regs_standard.h" -#include "../dsp_utils.hpp" +#include <uhd/usrp/dsp_utils.hpp> #include <uhd/usrp/dsp_props.hpp> #include <boost/bind.hpp> +#include <boost/format.hpp> #include <iostream> -#include <cstdio> +#include <cmath> using namespace uhd; using namespace uhd::usrp; @@ -82,10 +83,9 @@ unsigned int compute_freq_word(double master, double target) double actual_freq = v * master / pow(2.0, 32.0); - if (0) - fprintf (stderr, - "compute_freq_control_word_fpga: target = %g actual = %g delta = %g\n", - target, actual_freq, actual_freq - target); + if (0) std::cerr << boost::format( + "compute_freq_control_word_fpga: target = %g actual = %g delta = %g\n" + ) % target % actual_freq % (actual_freq - target); return (unsigned int) v; } |