From 1526889803f2fc909d97c16b59323107db184381 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 24 Feb 2011 17:28:10 -0800 Subject: uhd: switch algorithm namespace to uhd --- host/lib/usrp/dboard/db_tvrx.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'host/lib/usrp/dboard/db_tvrx.cpp') diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp index 4d7cb22f8..dc38ef45e 100644 --- a/host/lib/usrp/dboard/db_tvrx.cpp +++ b/host/lib/usrp/dboard/db_tvrx.cpp @@ -241,7 +241,7 @@ static std::string get_band(double freq) { static double gain_interp(double gain, boost::array db_vector, boost::array volts_vector) { double volts; - gain = std::clip(gain, db_vector.front(), db_vector.back()); //let's not get carried away here + gain = uhd::clip(gain, db_vector.front(), db_vector.back()); //let's not get carried away here boost::uint8_t gain_step = 0; //find which bin we're in @@ -288,7 +288,7 @@ static double rf_gain_to_voltage(double gain, double lo_freq){ //this is the voltage at the USRP DAC output double dac_volts = gain_volts / opamp_gain; - dac_volts = std::clip(dac_volts, 0.0, 3.3); + dac_volts = uhd::clip(dac_volts, 0.0, 3.3); if (tvrx_debug) std::cerr << boost::format( "tvrx RF AGC gain: %f dB, dac_volts: %f V" @@ -311,7 +311,7 @@ static double if_gain_to_voltage(double gain){ double gain_volts = gain_interp(gain, tvrx_if_gains_db, tvrx_gains_volts); double dac_volts = gain_volts / opamp_gain; - dac_volts = std::clip(dac_volts, 0.0, 3.3); + dac_volts = uhd::clip(dac_volts, 0.0, 3.3); if (tvrx_debug) std::cerr << boost::format( "tvrx IF AGC gain: %f dB, dac_volts: %f V" -- cgit v1.2.3