From 698cfaef0c6dda64aa23793e5f32d3084c003ea5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 20 Apr 2010 13:41:17 -0700 Subject: windows warning fix --- host/lib/usrp/usrp2/dboard_iface.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'host/lib/usrp/usrp2/dboard_iface.cpp') diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index 591e958cb..e9acddee6 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -300,11 +300,10 @@ float usrp2_dboard_iface::read_aux_adc(unit_t unit, int which){ unit_to_spi_adc[unit], config, ad7922_regs.get_reg(), 16, false /*no rb*/ ); - boost::uint16_t reg = _iface->transact_spi( + ad7922_regs.set_reg(boost::uint16_t(_iface->transact_spi( unit_to_spi_adc[unit], config, ad7922_regs.get_reg(), 16, true /*rb*/ - ); - ad7922_regs.set_reg(reg); + ))); //convert to voltage and return return float(3.3*ad7922_regs.result/4095); -- cgit v1.2.3