diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
| commit | 450abc5b213fc477ae0f2d648405a8b6a55a7b03 (patch) | |
| tree | 01820d898ecd6541f988378413b4c55f16ebad6d /host/lib/usrp/usrp1/codec_ctrl.cpp | |
| parent | 7cb95203f8d7173e3d7070d24f68358be67d0b29 (diff) | |
| parent | b70d4430d4a898fe99b54740a1c4821ed9a1077b (diff) | |
| download | uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.gz uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.bz2 uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into tvrx_uhd
Diffstat (limited to 'host/lib/usrp/usrp1/codec_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/codec_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/codec_ctrl.cpp b/host/lib/usrp/usrp1/codec_ctrl.cpp index 3ab02eeeb..33b18b196 100644 --- a/host/lib/usrp/usrp1/codec_ctrl.cpp +++ b/host/lib/usrp/usrp1/codec_ctrl.cpp @@ -129,7 +129,7 @@ usrp1_codec_ctrl_impl::usrp1_codec_ctrl_impl(usrp1_iface::sptr iface, _ad9862_regs.clkout2_div_factor = ad9862_regs_t::CLKOUT2_DIV_FACTOR_2; //write the register settings to the codec - for (uint8_t addr = 0; addr <= 25; addr++) { + for (boost::uint8_t addr = 0; addr <= 25; addr++) { this->send_reg(addr); } @@ -202,7 +202,7 @@ float usrp1_codec_ctrl_impl::get_rx_pga_gain(char which){ **********************************************************************/ static float aux_adc_to_volts(boost::uint8_t high, boost::uint8_t low) { - return float((boost::uint16_t(high) << 2) | low)*3.3/0x3ff; + return float(((boost::uint16_t(high) << 2) | low)*3.3)/0x3ff; } float usrp1_codec_ctrl_impl::read_aux_adc(aux_adc_t which) |