diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-23 18:07:31 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-23 18:07:31 -0700 |
| commit | f97c4338458a965502d73903983ae5a3ceeebd53 (patch) | |
| tree | 7f0434c764749868ef24e347bde6e9b7238434fc /host/lib/usrp/usrp1/codec_ctrl.cpp | |
| parent | 1826421cd428f795b4b8cd0acdad4fea92262f72 (diff) | |
| download | uhd-f97c4338458a965502d73903983ae5a3ceeebd53.tar.gz uhd-f97c4338458a965502d73903983ae5a3ceeebd53.tar.bz2 uhd-f97c4338458a965502d73903983ae5a3ceeebd53.zip | |
usrp1: fixes to remove warnings and errors for usrp1 + libusb windows
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 08f2d2a8e..ad16f6b3a 100644 --- a/host/lib/usrp/usrp1/codec_ctrl.cpp +++ b/host/lib/usrp/usrp1/codec_ctrl.cpp @@ -126,7 +126,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); } @@ -199,7 +199,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) |