aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--host/lib/device.cpp2
-rw-r--r--host/lib/usrp/common/ad9361_driver/ad9361_device.cpp20
-rw-r--r--host/lib/usrp/common/adf435x.hpp17
-rw-r--r--host/lib/usrp/common/max287x.hpp15
-rw-r--r--host/lib/usrp/dboard/db_dbsrx.cpp26
-rw-r--r--host/lib/usrp/dboard/db_dbsrx2.cpp14
-rw-r--r--host/lib/usrp/dboard/db_rfx.cpp2
-rw-r--r--host/lib/usrp/dboard/db_sbx_common.cpp6
-rw-r--r--host/lib/usrp/dboard/db_tvrx.cpp12
-rw-r--r--host/lib/usrp/dboard/db_tvrx2.cpp50
-rw-r--r--host/lib/usrp/dboard/db_ubx.cpp12
-rw-r--r--host/lib/usrp/dboard/db_wbx_common.cpp2
-rw-r--r--host/lib/usrp/dboard/db_wbx_version2.cpp2
-rw-r--r--host/lib/usrp/dboard/db_wbx_version3.cpp2
-rw-r--r--host/lib/usrp/dboard/db_wbx_version4.cpp2
-rw-r--r--host/lib/usrp/dboard/db_xcvr2450.cpp12
16 files changed, 99 insertions, 97 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 0cdfc14aa..ace0a0bd6 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -149,7 +149,7 @@ device::sptr device::make(const device_addr_t &hint, device_filter_t filter, siz
device_addr_t dev_addr; make_t maker;
boost::tie(dev_addr, maker) = dev_addr_makers.at(which);
size_t dev_hash = hash_device_addr(dev_addr);
- UHD_LOGGER_DEBUG("UHD") << boost::format("Device hash: %u") % dev_hash ;
+ UHD_LOGGER_TRACE("UHD") << boost::format("Device hash: %u") % dev_hash ;
//copy keys that were in hint but not in dev_addr
//this way, we can pass additional transport arguments
diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
index e11079ae3..da0ab0b9a 100644
--- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
+++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
@@ -1169,7 +1169,7 @@ void ad9361_device_t::_setup_synth(direction_t direction, double vcorate)
* fed to the public set_clock_rate function. */
double ad9361_device_t::_tune_bbvco(const double rate)
{
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] rate=%.10f\n") % rate;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] rate=%.10f\n") % rate;
/* Let's not re-tune to the same frequency over and over... */
if (freq_is_nearly_equal(rate, _req_coreclk)) {
@@ -1197,13 +1197,13 @@ double ad9361_device_t::_tune_bbvco(const double rate)
if (i == 7)
throw uhd::runtime_error("[ad9361_device_t] _tune_bbvco: wrong vcorate");
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] vcodiv=%d vcorate=%.10f\n") % vcodiv % vcorate;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] vcodiv=%d vcorate=%.10f\n") % vcodiv % vcorate;
/* Fo = Fref * (Nint + Nfrac / mod) */
int nint = static_cast<int>(vcorate / fref);
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] (nint)=%.10f\n") % (vcorate / fref);
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] (nint)=%.10f\n") % (vcorate / fref);
int nfrac = static_cast<int>(boost::math::round(((vcorate / fref) - (double) nint) * (double) modulus));
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] (nfrac)=%.10f\n") % (((vcorate / fref) - (double) nint) * (double) modulus);
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] nint=%d nfrac=%d\n") % nint % nfrac;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] (nfrac)=%.10f\n") % (((vcorate / fref) - (double) nint) * (double) modulus);
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_tune_bbvco] nint=%d nfrac=%d\n") % nint % nfrac;
double actual_vcorate = fref
* ((double) nint + ((double) nfrac / (double) modulus));
@@ -1381,7 +1381,7 @@ double ad9361_device_t::_setup_rates(const double rate)
/* If we make it into this function, then we are tuning to a new rate.
* Store the new rate. */
_req_clock_rate = rate;
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_setup_rates] rate=%.6d\n") % rate;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_setup_rates] rate=%.6d\n") % rate;
/* Set the decimation and interpolation values in the RX and TX chains.
* This also switches filters in / out. Note that all transmitters and
@@ -1467,7 +1467,7 @@ double ad9361_device_t::_setup_rates(const double rate)
throw uhd::runtime_error("[ad9361_device_t] [_setup_rates] INVALID_CODE_PATH");
}
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_setup_rates] divfactor=%d\n") % divfactor;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_setup_rates] divfactor=%d\n") % divfactor;
/* Tune the BBPLL to get the ADC and DAC clocks. */
const double adcclk = _tune_bbvco(rate * divfactor);
@@ -1489,7 +1489,7 @@ double ad9361_device_t::_setup_rates(const double rate)
_io_iface->poke8(0x004, _regs.inputsel);
_io_iface->poke8(0x00A, _regs.bbpll);
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::_setup_rates] adcclk=%f\n") % adcclk;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::_setup_rates] adcclk=%f\n") % adcclk;
_baseband_bw = (adcclk / divfactor);
/*
@@ -1798,7 +1798,7 @@ double ad9361_device_t::set_clock_rate(const double req_rate)
throw uhd::runtime_error("[ad9361_device_t] Requested master clock rate outside range");
}
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::set_clock_rate] req_rate=%.10f\n") % req_rate;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::set_clock_rate] req_rate=%.10f\n") % req_rate;
/* UHD has a habit of requesting the same rate like four times when it
* starts up. This prevents that, and any bugs in user code that request
@@ -1840,7 +1840,7 @@ double ad9361_device_t::set_clock_rate(const double req_rate)
* all the hard work gets done. */
double rate = _setup_rates(req_rate);
- UHD_LOGGER_DEBUG("AD936X")<< boost::format("[ad9361_device_t::set_clock_rate] rate=%.10f\n") % rate;
+ UHD_LOGGER_TRACE("AD936X")<< boost::format("[ad9361_device_t::set_clock_rate] rate=%.10f\n") % rate;
/* Transition to the ALERT state and calibrate everything. */
_io_iface->poke8(0x015, 0x04); //dual synth mode, synth en ctrl en
diff --git a/host/lib/usrp/common/adf435x.hpp b/host/lib/usrp/common/adf435x.hpp
index daa539982..18d5b70ba 100644
--- a/host/lib/usrp/common/adf435x.hpp
+++ b/host/lib/usrp/common/adf435x.hpp
@@ -268,14 +268,15 @@ public:
adf435x_regs_t::LDF_FRAC_N;
std::string tuning_str = (int_n_mode) ? "Integer-N" : "Fractional";
- UHD_LOGGER_DEBUG("ADF435X")
- << boost::format("ADF 435X Frequencies (MHz): REQUESTED=%0.9f, ACTUAL=%0.9f"
- ) % (target_freq/1e6) % (actual_freq/1e6)
- << boost::format("ADF 435X Intermediates (MHz): Feedback=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f, REF=%0.2f"
- ) % (feedback_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) % (_reference_freq/1e6)
- << boost::format("ADF 435X Tuning: %s") % tuning_str.c_str()
- << boost::format("ADF 435X Settings: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d"
- ) % R % BS % N % FRAC % MOD % T % D % RFdiv ;
+ UHD_LOGGER_TRACE("ADF435X")
+ << boost::format("ADF 435X Frequencies (MHz): REQUESTED=%0.9f, ACTUAL=%0.9f")
+ % (target_freq/1e6) % (actual_freq/1e6)
+ << boost::format("ADF 435X Intermediates (MHz): Feedback=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f, REF=%0.2f")
+ % (feedback_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) % (_reference_freq/1e6)
+ << boost::format("ADF 435X Tuning: %s") % tuning_str.c_str()
+ << boost::format("ADF 435X Settings: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d")
+ % R % BS % N % FRAC % MOD % T % D % RFdiv
+ ;
UHD_ASSERT_THROW((_regs.frac_12_bit & ((uint16_t)~0xFFF)) == 0);
UHD_ASSERT_THROW((_regs.mod_12_bit & ((uint16_t)~0xFFF)) == 0);
diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp
index a0400f651..c3c4bf18c 100644
--- a/host/lib/usrp/common/max287x.hpp
+++ b/host/lib/usrp/common/max287x.hpp
@@ -638,13 +638,14 @@ double max287x<max287x_regs_t>::set_frequency(
//actual frequency calculation
double actual_freq = double((N + (double(FRAC)/double(MOD)))*ref_freq*(1+int(D))/(R*(1+int(T)))) * fb_divisor / RFdiv;
- UHD_LOGGER_DEBUG("MAX287X")
- << boost::format("MAX287x: Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f"
- ) % ref_freq % double(RFdiv*2) % double(N + double(FRAC)/double(MOD))
- << boost::format("MAX287x: tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s"
- ) % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? "Integer-N" : "Fractional")
- << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f"
- ) % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) ;
+ UHD_LOGGER_TRACE("MAX287X")
+ << boost::format("MAX287x: Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f")
+ % ref_freq % double(RFdiv*2) % double(N + double(FRAC)/double(MOD))
+ << boost::format("MAX287x: tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s")
+ % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? "Integer-N" : "Fractional")
+ << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f")
+ % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6)
+ ;
//load the register values
_regs.rf_output_enable = max287x_regs_t::RF_OUTPUT_ENABLE_ENABLED;
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index a725db4a1..ecfeb5308 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -98,7 +98,7 @@ private:
//get the register data
for(int i=0; i<num_bytes; i++){
regs_vector[1+i] = _max2118_write_regs.get_reg(start_addr+i);
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: send reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
) % int(start_addr+i) % int(regs_vector[1+i]) % int(start_addr) % num_bytes ;
}
@@ -130,7 +130,7 @@ private:
if (i + start_addr >= status_addr){
_max2118_read_regs.set_reg(i + start_addr, regs_vector[i]);
}
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: read reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
) % int(start_addr+i) % int(regs_vector[i]) % int(start_addr) % num_bytes ;
}
@@ -279,7 +279,7 @@ double dbsrx::set_lo_freq(double target_freq){
m = 31;
while ((ref_clock/m < 1e6 or ref_clock/m > 2.5e6) and m > 0){ m--; }
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: trying ref_clock %f and m_divider %d"
) % (ref_clock) % m ;
@@ -289,7 +289,7 @@ double dbsrx::set_lo_freq(double target_freq){
for(auto r = 0; r <= 6; r += 1) {
//compute divider from setting
R = 1 << (r+1);
- UHD_LOGGER_DEBUG("DBSRX") << boost::format("DBSRX R:%d\n") % R ;
+ UHD_LOGGER_TRACE("DBSRX") << boost::format("DBSRX R:%d\n") % R ;
//compute PFD compare frequency = ref_clock/R
pfd_freq = ref_clock / R;
@@ -315,7 +315,7 @@ double dbsrx::set_lo_freq(double target_freq){
UHD_ASSERT_THROW((pfd_freq >= dbsrx_pfd_freq_range.start()) and (pfd_freq <= dbsrx_pfd_freq_range.stop()));
UHD_ASSERT_THROW((N >= 256) and (N <= 32768));
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: choose ref_clock (current: %f, new: %f) and m_divider %d"
) % (this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX)) % ref_clock % m ;
@@ -337,7 +337,7 @@ double dbsrx::set_lo_freq(double target_freq){
int scaler = actual_freq > 1125e6 ? 2 : 4;
_max2118_write_regs.div2 = scaler == 4 ? max2118_write_regs_t::DIV2_DIV4 : max2118_write_regs_t::DIV2_DIV2;
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: scaler %d, actual_freq %f MHz, register bit: %d"
) % scaler % (actual_freq/1e6) % int(_max2118_write_regs.div2) ;
@@ -366,7 +366,7 @@ double dbsrx::set_lo_freq(double target_freq){
//check vtune for lock condition
read_reg(0x0, 0x0);
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: initial guess for vco %d, vtune adc %d"
) % int(_max2118_write_regs.osc_band) % int(_max2118_read_regs.adc) ;
@@ -397,7 +397,7 @@ double dbsrx::set_lo_freq(double target_freq){
_max2118_write_regs.osc_band += 1;
}
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: trying vco %d, vtune adc %d"
) % int(_max2118_write_regs.osc_band) % int(_max2118_read_regs.adc) ;
@@ -409,7 +409,7 @@ double dbsrx::set_lo_freq(double target_freq){
boost::this_thread::sleep(boost::posix_time::milliseconds(10));
}
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX: final vco %d, vtune adc %d"
) % int(_max2118_write_regs.osc_band) % int(_max2118_read_regs.adc) ;
@@ -425,7 +425,7 @@ double dbsrx::set_lo_freq(double target_freq){
_lo_freq = this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX) / std::pow(2.0,(1 + _max2118_write_regs.r_divider)) * _max2118_write_regs.get_n_divider();
//debug output of calculated variables
- UHD_LOGGER_DEBUG("DBSRX")
+ UHD_LOGGER_TRACE("DBSRX")
<< boost::format("DBSRX tune:\n")
<< boost::format(" VCO=%d, CP=%d, PFD Freq=%fMHz\n") % int(_max2118_write_regs.osc_band) % _max2118_write_regs.cp_current % (pfd_freq/1e6)
<< boost::format(" R=%d, N=%f, scaler=%d, div2=%d\n") % R % N % scaler % int(_max2118_write_regs.div2)
@@ -463,7 +463,7 @@ static int gain_to_gc2_vga_reg(double &gain){
gain = double(boost::math::iround(gain));
}
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX GC2 Gain: %f dB, reg: %d"
) % gain % reg ;
@@ -487,7 +487,7 @@ static double gain_to_gc1_rfvga_dac(double &gain){
//calculate the voltage for the aux dac
double dac_volts = gain*slope + min_volts;
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX GC1 Gain: %f dB, dac_volts: %f V"
) % gain % dac_volts ;
@@ -533,7 +533,7 @@ double dbsrx::set_bandwidth(double bandwidth){
//determine actual bandwidth
_bandwidth = double((ref_clock/(_max2118_write_regs.m_divider))*(4+0.145*_max2118_write_regs.f_dac));
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX Filter Bandwidth: %f MHz, m: %d, f_dac: %d\n"
) % (_bandwidth/1e6) % int(_max2118_write_regs.m_divider) % int(_max2118_write_regs.f_dac) ;
diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp
index 72e180a6f..8cc209218 100644
--- a/host/lib/usrp/dboard/db_dbsrx2.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx2.cpp
@@ -92,7 +92,7 @@ private:
//get the register data
for(int i=0; i<num_bytes; i++){
regs_vector[1+i] = _max2112_write_regs.get_reg(start_addr+i);
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX2: send reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
) % int(start_addr+i) % int(regs_vector[1+i]) % int(start_addr) % num_bytes ;
}
@@ -133,7 +133,7 @@ private:
if (i + start_addr >= status_addr){
_max2112_read_regs.set_reg(i + start_addr, regs_vector[i]);
}
- UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+ UHD_LOGGER_TRACE("DBSRX") << boost::format(
"DBSRX2: read reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
) % int(start_addr+i) % int(regs_vector[i]) % int(start_addr) % num_bytes ;
}
@@ -265,7 +265,7 @@ double dbsrx2::set_lo_freq(double target_freq){
_max2112_write_regs.d24 = scaler == 4 ? max2112_write_regs_t::D24_DIV4 : max2112_write_regs_t::D24_DIV2;
//debug output of calculated variables
- UHD_LOGGER_DEBUG("DBSRX")
+ UHD_LOGGER_TRACE("DBSRX")
<< boost::format("DBSRX2 tune:\n")
<< boost::format(" R=%d, N=%f, scaler=%d, ext_div=%d\n") % R % N % scaler % ext_div
<< boost::format(" int=%d, frac=%d, d24=%d\n") % intdiv % fracdiv % int(_max2112_write_regs.d24)
@@ -299,7 +299,7 @@ static int gain_to_bbg_vga_reg(double &gain){
gain = double(reg);
- UHD_LOGGER_DEBUG("DBSRX")
+ UHD_LOGGER_TRACE("DBSRX")
<< boost::format("DBSRX2 BBG Gain:\n")
<< boost::format(" %f dB, bbg: %d") % gain % reg
;
@@ -324,7 +324,7 @@ static double gain_to_gc1_rfvga_dac(double &gain){
//calculate the voltage for the aux dac
double dac_volts = gain*slope + min_volts;
- UHD_LOGGER_DEBUG("DBSRX")
+ UHD_LOGGER_TRACE("DBSRX")
<< boost::format("DBSRX2 GC1 Gain:\n")
<< boost::format(" %f dB, dac_volts: %f V") % gain % dac_volts
;
@@ -364,10 +364,10 @@ double dbsrx2::set_bandwidth(double bandwidth){
_max2112_write_regs.lp = int((bandwidth/1e6 - 4)/0.29 + 12);
_bandwidth = double(4 + (_max2112_write_regs.lp - 12) * 0.29)*1e6;
- UHD_LOGGER_DEBUG("DBSRX")
+ UHD_LOGGER_TRACE("DBSRX")
<< boost::format("DBSRX2 Bandwidth:\n")
<< boost::format(" %f MHz, lp: %f V") % (_bandwidth/1e6) % int(_max2112_write_regs.lp)
- ;
+ ;
this->send_reg(0x8, 0x8);
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index 205ec7d79..e8ceb7d49 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -396,7 +396,7 @@ double rfx_xcvr::set_lo_freq(
}
} done_loop:
- UHD_LOGGER_DEBUG("RFX") << boost::format(
+ UHD_LOGGER_TRACE("RFX") << boost::format(
"RFX tune: R=%d, BS=%d, P=%d, B=%d, A=%d, DIV2=%d"
) % R % BS % P % B % A % int(_div2[unit] && (!is_rx_rfx400)) ;
diff --git a/host/lib/usrp/dboard/db_sbx_common.cpp b/host/lib/usrp/dboard/db_sbx_common.cpp
index fccad7cf7..8df4028e7 100644
--- a/host/lib/usrp/dboard/db_sbx_common.cpp
+++ b/host/lib/usrp/dboard/db_sbx_common.cpp
@@ -53,7 +53,7 @@ static int rx_pga0_gain_to_iobits(double &gain){
int attn_code = int(floor(attn*2));
int iobits = ((~attn_code) << RX_ATTN_SHIFT) & RX_ATTN_MASK;
- UHD_LOGGER_DEBUG("SBX") << boost::format(
+ UHD_LOGGER_TRACE("SBX") << boost::format(
"SBX RX Attenuation: %f dB, Code: %d, IO Bits %x, Mask: %x"
) % attn % attn_code % (iobits & RX_ATTN_MASK) % RX_ATTN_MASK ;
@@ -74,7 +74,7 @@ static int tx_pga0_gain_to_iobits(double &gain){
int attn_code = int(floor(attn*2));
int iobits = ((~attn_code) << TX_ATTN_SHIFT) & TX_ATTN_MASK;
- UHD_LOGGER_DEBUG("SBX") << boost::format(
+ UHD_LOGGER_TRACE("SBX") << boost::format(
"SBX TX Attenuation: %f dB, Code: %d, IO Bits %x, Mask: %x"
) % attn % attn_code % (iobits & TX_ATTN_MASK) % TX_ATTN_MASK ;
@@ -240,7 +240,7 @@ sbx_xcvr::sbx_xcvr(ctor_args_t args) : xcvr_dboard_base(args){
//Initialize ATR registers after direction and pin ctrl configuration
update_atr();
- UHD_LOGGER_DEBUG("SBX") << boost::format(
+ UHD_LOGGER_TRACE("SBX") << boost::format(
"SBX GPIO Direction: RX: 0x%08x, TX: 0x%08x"
) % RXIO_MASK % TXIO_MASK ;
}
diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp
index 41188ff77..bae047bbd 100644
--- a/host/lib/usrp/dboard/db_tvrx.cpp
+++ b/host/lib/usrp/dboard/db_tvrx.cpp
@@ -153,7 +153,7 @@ private:
//get the register data
for(int i=0; i<4; i++){
regs_vector[i] = _tuner_4937di5_regs.get_reg(i);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"tvrx: send reg 0x%02x, value 0x%04x"
) % int(i) % int(regs_vector[i]) ;
}
@@ -249,7 +249,7 @@ tvrx::~tvrx(void){
static std::string get_band(double freq) {
for(const std::string &band: tvrx_freq_ranges.keys()) {
if(freq >= tvrx_freq_ranges[band].start() && freq <= tvrx_freq_ranges[band].stop()){
- UHD_LOGGER_DEBUG("TVRX") << "Band: " << band ;
+ UHD_LOGGER_TRACE("TVRX") << "Band: " << band ;
return band;
}
}
@@ -291,7 +291,7 @@ static double gain_interp(double gain, const boost::array<double, 17>& db_vector
//use the volts per dB slope to find the final interpolated voltage
volts = volts_vector[gain_step] + (slope * (gain - db_vector[gain_step]));
- UHD_LOGGER_DEBUG("TVRX") << "Gain interp: gain: " << gain << ", gain_step: " << int(gain_step) << ", slope: " << slope << ", volts: " << volts ;
+ UHD_LOGGER_TRACE("TVRX") << "Gain interp: gain: " << gain << ", gain_step: " << int(gain_step) << ", slope: " << slope << ", volts: " << volts ;
return volts;
}
@@ -317,7 +317,7 @@ static double rf_gain_to_voltage(double gain, double lo_freq){
dac_volts = uhd::clip<double>(dac_volts, 0.0, 3.3);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"tvrx RF AGC gain: %f dB, dac_volts: %f V"
) % gain % dac_volts ;
@@ -340,7 +340,7 @@ static double if_gain_to_voltage(double gain){
dac_volts = uhd::clip<double>(dac_volts, 0.0, 3.3);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"tvrx IF AGC gain: %f dB, dac_volts: %f V"
) % gain % dac_volts ;
@@ -396,7 +396,7 @@ double tvrx::set_freq(double freq) {
//not FAR off, but we do this to be consistent
if(prev_band != new_band) set_gain(_gains["RF"], "RF");
- UHD_LOGGER_DEBUG("TVRX") << boost::format("set_freq: target LO: %f f_ref: %f divisor: %i actual LO: %f") % target_lo_freq % f_ref % divisor % actual_lo_freq ;
+ UHD_LOGGER_TRACE("TVRX") << boost::format("set_freq: target LO: %f f_ref: %f divisor: %i actual LO: %f") % target_lo_freq % f_ref % divisor % actual_lo_freq ;
_lo_freq = actual_lo_freq; //for rx props
diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp
index 6be3684d7..2b5524069 100644
--- a/host/lib/usrp/dboard/db_tvrx2.cpp
+++ b/host/lib/usrp/dboard/db_tvrx2.cpp
@@ -803,7 +803,7 @@ private:
//return irq status
bool irq = _tda18272hnm_regs.irq_status == tda18272hnm_regs_t::IRQ_STATUS_SET;
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): IRQ %d"
) % (get_subdev_name()) % irq ;
@@ -821,7 +821,7 @@ private:
//return POR state
bool por = _tda18272hnm_regs.por == tda18272hnm_regs_t::POR_RESET;
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): POR %d"
) % (get_subdev_name()) % int(_tda18272hnm_regs.por) ;
@@ -838,7 +838,7 @@ private:
//return lock detect
bool locked = _tda18272hnm_regs.lo_lock == tda18272hnm_regs_t::LO_LOCK_LOCKED;
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): locked %d"
) % (get_subdev_name()) % locked ;
@@ -881,7 +881,7 @@ private:
//read temp in degC
read_reg(0x3, 0x3);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): Temperature %f C"
) % (get_subdev_name()) % (double(_tda18272hnm_regs.tm_d)) ;
@@ -999,7 +999,7 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboard_base(args){
if (ref_clock == 64.0e6) {
this->get_iface()->set_gpio_out(dboard_iface::UNIT_RX, REFCLOCK_DIV4);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): Dividing Refclock by 4"
) % (get_subdev_name()) ;
@@ -1008,7 +1008,7 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboard_base(args){
this->get_iface()->set_gpio_out(dboard_iface::UNIT_RX, REFCLOCK_DIV6);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): Dividing Refclock by 6"
) % (get_subdev_name()) ;
@@ -1018,7 +1018,7 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboard_base(args){
this->get_iface()->set_clock_rate(dboard_iface::UNIT_RX, 100e6);
this->get_iface()->set_gpio_out(dboard_iface::UNIT_RX, REFCLOCK_DIV6);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): Dividing Refclock by 6"
) % (get_subdev_name()) ;
@@ -1032,7 +1032,7 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboard_base(args){
//enable only the clocks we need
this->get_iface()->set_clock_enabled(dboard_iface::UNIT_RX, true);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): Refclock %f Hz, scalar = %f"
) % (get_subdev_name()) % (this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX)) % _freq_scalar ;
@@ -1092,7 +1092,7 @@ bool tvrx2::set_enabled(bool enable){
}
tvrx2::~tvrx2(void){
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s): Called Destructor"
) % (get_subdev_name()) ;
UHD_SAFE_CALL(if (_enabled) set_enabled(false);)
@@ -1134,7 +1134,7 @@ void tvrx2::send_reg(uint8_t start_reg, uint8_t stop_reg){
//get the register data
for(int i=0; i<num_bytes; i++){
regs_vector[1+i] = _tda18272hnm_regs.get_reg(start_addr+i);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s, 0x%02x): send reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
) % (get_subdev_name()) % int(tvrx2_sd_name_to_i2c_addr[get_subdev_name()]) % int(start_addr+i) % int(regs_vector[1+i]) % int(start_addr) % num_bytes ;
}
@@ -1177,7 +1177,7 @@ void tvrx2::read_reg(uint8_t start_reg, uint8_t stop_reg){
if (i + start_addr >= status_addr){
_tda18272hnm_regs.set_reg(i + start_addr, regs_vector[i]);
}
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s, 0x%02x): read reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
) % (get_subdev_name()) % int(tvrx2_sd_name_to_i2c_addr[get_subdev_name()]) % int(start_addr+i) % int(regs_vector[i]) % int(start_addr) % num_bytes ;
}
@@ -1374,7 +1374,7 @@ void tvrx2::tvrx2_tda18272_tune_rf_filter(uint32_t uRF)
_tda18272hnm_regs.gain_taper = gain_taper;
_tda18272hnm_regs.rf_filter_band = RFBand;
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Software Calibration:\n"
"\tRF Filter Bypass = %d\n"
"\tRF Filter Cap = %d\n"
@@ -1391,7 +1391,7 @@ void tvrx2::tvrx2_tda18272_tune_rf_filter(uint32_t uRF)
}
void tvrx2::soft_calibration(void){
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Software Calibration: Initialize Tuner, Calibrate and Standby\n") % (get_subdev_name()) ;
_tda18272hnm_regs.sm = tda18272hnm_regs_t::SM_NORMAL;
@@ -1528,7 +1528,7 @@ void tvrx2::test_rf_filter_robustness(void){
**********************************************************************/
void tvrx2::transition_0(void){
//Transition 0: Initialize Tuner and place in standby
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Transition 0: Initialize Tuner, Calibrate and Standby\n") % (get_subdev_name()) ;
//Check for Power-On Reset, if reset, initialze tuner
@@ -1582,7 +1582,7 @@ void tvrx2::transition_0(void){
void tvrx2::transition_1(void){
//Transition 1: Select TV Standard
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Transition 1: Select TV Standard\n") % (get_subdev_name()) ;
//send magic xtal_cal_dac setting
@@ -1613,7 +1613,7 @@ void tvrx2::transition_1(void){
void tvrx2::transition_2(int rf_freq){
//Transition 2: Select RF Frequency after changing TV Standard
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Transition 2: Select RF Frequency after changing TV Standard\n") % (get_subdev_name()) ;
//send magic xtal_cal_dac setting
@@ -1651,7 +1651,7 @@ void tvrx2::transition_2(int rf_freq){
void tvrx2::transition_3(void){
//Transition 3: Standby Mode
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Transition 3: Standby Mode\n") % (get_subdev_name()) ;
//send magic xtal_cal_dac setting
@@ -1670,7 +1670,7 @@ void tvrx2::transition_3(void){
void tvrx2::transition_4(int rf_freq){
//Transition 4: Change RF Frequency without changing TV Standard
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Transition 4: Change RF Frequency without changing TV Standard\n") % (get_subdev_name()) ;
//send magic xtal_cal_dac setting
@@ -1699,7 +1699,7 @@ void tvrx2::wait_irq(void){
int timeout = 20; //irq waiting timeout in milliseconds
//int irq = (this->get_iface()->read_gpio(dboard_iface::UNIT_RX) & int(tvrx2_sd_name_to_irq_io[get_subdev_name()]));
bool irq = get_irq();
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Waiting on IRQ, subdev = %d, mask = 0x%x, Status: 0x%x\n") % (get_subdev_name()) % get_subdev_name() % (int(tvrx2_sd_name_to_irq_io[get_subdev_name()])) % irq ;
while (not irq and timeout > 0) {
@@ -1709,7 +1709,7 @@ void tvrx2::wait_irq(void){
timeout -= 1;
}
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): IRQ Raised, subdev = %d, mask = 0x%x, Status: 0x%x, Timeout: %d\n") % (get_subdev_name()) % get_subdev_name() % (int(tvrx2_sd_name_to_irq_io[get_subdev_name()])) % irq % timeout ;
read_reg(0xA, 0xB);
@@ -1723,7 +1723,7 @@ void tvrx2::wait_irq(void){
irq = (this->get_iface()->read_gpio(dboard_iface::UNIT_RX) & tvrx2_sd_name_to_irq_io[get_subdev_name()]) > 0;
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): Cleared IRQ, subdev = %d, mask = 0x%x, Status: 0x%x\n") % (get_subdev_name()) % get_subdev_name() % (int(tvrx2_sd_name_to_irq_io[get_subdev_name()])) % irq ;
}
@@ -1748,7 +1748,7 @@ double tvrx2::set_lo_freq(double target_freq){
_lo_freq = get_scaled_rf_freq() + get_scaled_if_freq(); // - _bandwidth/2;
//debug output of calculated variables
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): LO Frequency\n"
"\tRequested: \t%f\n"
"\tComputed: \t%f\n"
@@ -1759,7 +1759,7 @@ double tvrx2::set_lo_freq(double target_freq){
test_rf_filter_robustness();
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"\nTVRX2 (%s): RSSI = %f dBm\n"
) % (get_subdev_name()) % (get_rssi().to_real()) ;
@@ -1783,7 +1783,7 @@ static double gain_to_if_gain_dac(double &gain){
//calculate the voltage for the aux dac
double dac_volts = gain*slope + min_volts;
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 IF Gain: %f dB, dac_volts: %f V"
) % gain % dac_volts ;
@@ -1847,7 +1847,7 @@ double tvrx2::set_bandwidth(double bandwidth){
//update register
send_reg(0x13, 0x13);
- UHD_LOGGER_DEBUG("TVRX") << boost::format(
+ UHD_LOGGER_TRACE("TVRX") << boost::format(
"TVRX2 (%s) Bandwidth (lp_fc): %f Hz, reg: %d"
) % (get_subdev_name()) % _bandwidth % (int(_tda18272hnm_regs.lp_fc)) ;
diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp
index b52234947..d25aabe98 100644
--- a/host/lib/usrp/dboard/db_ubx.cpp
+++ b/host/lib/usrp/dboard/db_ubx.cpp
@@ -749,7 +749,7 @@ private:
_ubx_tx_atten_val = ((attn_code & 0x3F) << 10);
set_gpio_field(TX_GAIN, attn_code);
write_gpio();
- UHD_LOGGER_DEBUG("UBX") << boost::format("UBX TX Gain: %f dB, Code: %d, IO Bits 0x%04x") % gain % attn_code % _ubx_tx_atten_val ;
+ UHD_LOGGER_TRACE("UBX") << boost::format("UBX TX Gain: %f dB, Code: %d, IO Bits 0x%04x") % gain % attn_code % _ubx_tx_atten_val ;
_tx_gain = gain;
return gain;
}
@@ -762,7 +762,7 @@ private:
_ubx_rx_atten_val = ((attn_code & 0x3F) << 10);
set_gpio_field(RX_GAIN, attn_code);
write_gpio();
- UHD_LOGGER_DEBUG("UBX") << boost::format("UBX RX Gain: %f dB, Code: %d, IO Bits 0x%04x") % gain % attn_code % _ubx_rx_atten_val ;
+ UHD_LOGGER_TRACE("UBX") << boost::format("UBX RX Gain: %f dB, Code: %d, IO Bits 0x%04x") % gain % attn_code % _ubx_rx_atten_val ;
_rx_gain = gain;
return gain;
}
@@ -786,7 +786,7 @@ private:
property_tree::sptr subtree = this->get_tx_subtree();
device_addr_t tune_args = subtree->access<device_addr_t>("tune_args").get();
is_int_n = boost::iequals(tune_args.get("mode_n",""), "integer");
- UHD_LOGGER_DEBUG("UBX") << boost::format("UBX TX: the requested frequency is %f MHz") % (freq/1e6) ;
+ UHD_LOGGER_TRACE("UBX") << boost::format("UBX TX: the requested frequency is %f MHz") % (freq/1e6) ;
double target_pfd_freq = _tx_target_pfd_freq;
if (is_int_n and tune_args.has_key("int_n_step"))
{
@@ -925,7 +925,7 @@ private:
_txlo1_freq = freq_lo1;
_txlo2_freq = freq_lo2;
- UHD_LOGGER_DEBUG("UBX") << boost::format("UBX TX: the actual frequency is %f MHz") % (_tx_freq/1e6) ;
+ UHD_LOGGER_TRACE("UBX") << boost::format("UBX TX: the actual frequency is %f MHz") % (_tx_freq/1e6) ;
return _tx_freq;
}
@@ -938,7 +938,7 @@ private:
double ref_freq = _iface->get_clock_rate(dboard_iface::UNIT_RX);
bool is_int_n = false;
- UHD_LOGGER_DEBUG("UBX") << boost::format("UBX RX: the requested frequency is %f MHz") % (freq/1e6) ;
+ UHD_LOGGER_TRACE("UBX") << boost::format("UBX RX: the requested frequency is %f MHz") % (freq/1e6) ;
property_tree::sptr subtree = this->get_rx_subtree();
device_addr_t tune_args = subtree->access<device_addr_t>("tune_args").get();
@@ -1121,7 +1121,7 @@ private:
_rxlo1_freq = freq_lo1;
_rxlo2_freq = freq_lo2;
- UHD_LOGGER_DEBUG("UBX") << boost::format("UBX RX: the actual frequency is %f MHz") % (_rx_freq/1e6) ;
+ UHD_LOGGER_TRACE("UBX") << boost::format("UBX RX: the actual frequency is %f MHz") % (_rx_freq/1e6) ;
return _rx_freq;
}
diff --git a/host/lib/usrp/dboard/db_wbx_common.cpp b/host/lib/usrp/dboard/db_wbx_common.cpp
index 383daf15b..1f665b7e4 100644
--- a/host/lib/usrp/dboard/db_wbx_common.cpp
+++ b/host/lib/usrp/dboard/db_wbx_common.cpp
@@ -42,7 +42,7 @@ static int rx_pga0_gain_to_iobits(double &gain){
int attn_code = boost::math::iround(attn*2);
int iobits = ((~attn_code) << RX_ATTN_SHIFT) & RX_ATTN_MASK;
- UHD_LOGGER_DEBUG("WBX") << boost::format(
+ UHD_LOGGER_TRACE("WBX") << boost::format(
"WBX RX Attenuation: %f dB, Code: %d, IO Bits %x, Mask: %x"
) % attn % attn_code % (iobits & RX_ATTN_MASK) % RX_ATTN_MASK ;
diff --git a/host/lib/usrp/dboard/db_wbx_version2.cpp b/host/lib/usrp/dboard/db_wbx_version2.cpp
index b8f024592..d50ae481b 100644
--- a/host/lib/usrp/dboard/db_wbx_version2.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version2.cpp
@@ -58,7 +58,7 @@ static double tx_pga0_gain_to_dac_volts(double &gain){
//calculate the voltage for the aux dac
double dac_volts = gain*slope + min_volts;
- UHD_LOGGER_DEBUG("WBX") << boost::format(
+ UHD_LOGGER_TRACE("WBX") << boost::format(
"WBX TX Gain: %f dB, dac_volts: %f V"
) % gain % dac_volts ;
diff --git a/host/lib/usrp/dboard/db_wbx_version3.cpp b/host/lib/usrp/dboard/db_wbx_version3.cpp
index 98f4b5a39..1863dcb44 100644
--- a/host/lib/usrp/dboard/db_wbx_version3.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version3.cpp
@@ -63,7 +63,7 @@ static int tx_pga0_gain_to_iobits(double &gain){
(attn_code & 1 ? 0 : TX_ATTN_1)
) & TX_ATTN_MASK;
- UHD_LOGGER_DEBUG("WBX") << boost::format(
+ UHD_LOGGER_TRACE("WBX") << boost::format(
"WBX TX Attenuation: %f dB, Code: %d, IO Bits %x, Mask: %x"
) % attn % attn_code % (iobits & TX_ATTN_MASK) % TX_ATTN_MASK ;
diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp
index f848df764..9b31baf89 100644
--- a/host/lib/usrp/dboard/db_wbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp
@@ -64,7 +64,7 @@ static int tx_pga0_gain_to_iobits(double &gain){
(attn_code & 1 ? 0 : TX_ATTN_1)
) & TX_ATTN_MASK;
- UHD_LOGGER_DEBUG("WBX") << boost::format(
+ UHD_LOGGER_TRACE("WBX") << boost::format(
"WBX TX Attenuation: %f dB, Code: %d, IO Bits %x, Mask: %x"
) % attn % attn_code % (iobits & TX_ATTN_MASK) % TX_ATTN_MASK ;
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 9d8ef63f2..62c5c39fb 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -135,7 +135,7 @@ private:
void spi_reset(void);
void send_reg(uint8_t addr){
uint32_t value = _max2829_regs.get_reg(addr);
- UHD_LOGGER_DEBUG("XCVR2450") << boost::format(
+ UHD_LOGGER_TRACE("XCVR2450") << boost::format(
"XCVR2450: send reg 0x%02x, value 0x%05x"
) % int(addr) % value ;
this->get_iface()->write_spi(
@@ -391,7 +391,7 @@ double xcvr2450::set_lo_freq_core(double target_freq){
double N = double(intdiv) + double(fracdiv)/double(1 << 16);
_lo_freq = (N*ref_freq)/(scaler*R*_ad9515div);
- UHD_LOGGER_DEBUG("XCVR2450")
+ UHD_LOGGER_TRACE("XCVR2450")
<< boost::format("XCVR2450 tune:\n")
<< boost::format(" R=%d, N=%f, ad9515=%d, scaler=%f\n") % R % N % _ad9515div % scaler
<< boost::format(" Ref Freq=%fMHz\n") % (ref_freq/1e6)
@@ -401,10 +401,10 @@ double xcvr2450::set_lo_freq_core(double target_freq){
//high-high band or low-high band?
if(_lo_freq > (5.35e9 + 5.47e9)/2.0){
- UHD_LOGGER_DEBUG("XCVR2450") << "XCVR2450 tune: Using high-high band" ;
+ UHD_LOGGER_TRACE("XCVR2450") << "XCVR2450 tune: Using high-high band" ;
_max2829_regs.band_select_802_11a = max2829_regs_t::BAND_SELECT_802_11A_5_47GHZ_TO_5_875GHZ;
}else{
- UHD_LOGGER_DEBUG("XCVR2450") << "XCVR2450 tune: Using low-high band" ;
+ UHD_LOGGER_TRACE("XCVR2450") << "XCVR2450 tune: Using low-high band" ;
_max2829_regs.band_select_802_11a = max2829_regs_t::BAND_SELECT_802_11A_4_9GHZ_TO_5_35GHZ;
}
@@ -655,7 +655,7 @@ double xcvr2450::set_rx_bandwidth(double bandwidth){
//update register
send_reg(0x7);
- UHD_LOGGER_DEBUG("XCVR2450") << boost::format(
+ UHD_LOGGER_TRACE("XCVR2450") << boost::format(
"XCVR2450 RX Bandwidth (lp_fc): %f Hz, coarse reg: %d, fine reg: %d"
) % _rx_bandwidth % (int(_max2829_regs.rx_lpf_coarse_adj)) % (int(_max2829_regs.rx_lpf_fine_adj)) ;
@@ -675,7 +675,7 @@ double xcvr2450::set_tx_bandwidth(double bandwidth){
//update register
send_reg(0x7);
- UHD_LOGGER_DEBUG("XCVR2450") << boost::format(
+ UHD_LOGGER_TRACE("XCVR2450") << boost::format(
"XCVR2450 TX Bandwidth (lp_fc): %f Hz, coarse reg: %d"
) % _tx_bandwidth % (int(_max2829_regs.tx_lpf_coarse_adj)) ;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 17:36:48 +0000