aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard/db_xcvr2450.cpp
diff options
context:
space:
mode:
authorAndrej Rode <andrej.rode@ettus.com>2017-02-07 16:37:25 -0800
committerMartin Braun <martin.braun@ettus.com>2017-02-20 17:13:15 -0800
commit21aad77c9ca07f4271136b9241f5adb00a6bb908 (patch)
tree636ffe3ab2296e9afa661d3a12eb359224cd3254 /host/lib/usrp/dboard/db_xcvr2450.cpp
parent2b33f2bb4c01d4306fd46f78edf6e355a03e2ed7 (diff)
downloaduhd-21aad77c9ca07f4271136b9241f5adb00a6bb908.tar.gz
uhd-21aad77c9ca07f4271136b9241f5adb00a6bb908.tar.bz2
uhd-21aad77c9ca07f4271136b9241f5adb00a6bb908.zip
utils: introduce new logging API and remove msg API
Diffstat (limited to 'host/lib/usrp/dboard/db_xcvr2450.cpp')
-rw-r--r--host/lib/usrp/dboard/db_xcvr2450.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 63053e326..9d8ef63f2 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -135,9 +135,9 @@ private:
void spi_reset(void);
void send_reg(uint8_t addr){
uint32_t value = _max2829_regs.get_reg(addr);
- UHD_LOGV(often) << boost::format(
+ UHD_LOGGER_DEBUG("XCVR2450") << boost::format(
"XCVR2450: send reg 0x%02x, value 0x%05x"
- ) % int(addr) % value << std::endl;
+ ) % int(addr) % value ;
this->get_iface()->write_spi(
dboard_iface::UNIT_RX,
spi_config_t::EDGE_RISE,
@@ -391,20 +391,20 @@ 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_LOGV(often)
+ UHD_LOGGER_DEBUG("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)
<< boost::format(" Target Freq=%fMHz\n") % (target_freq/1e6)
<< boost::format(" Actual Freq=%fMHz\n") % (_lo_freq/1e6)
- << std::endl;
+ ;
//high-high band or low-high band?
if(_lo_freq > (5.35e9 + 5.47e9)/2.0){
- UHD_LOGV(often) << "XCVR2450 tune: Using high-high band" << std::endl;
+ UHD_LOGGER_DEBUG("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_LOGV(often) << "XCVR2450 tune: Using low-high band" << std::endl;
+ UHD_LOGGER_DEBUG("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,9 +655,9 @@ double xcvr2450::set_rx_bandwidth(double bandwidth){
//update register
send_reg(0x7);
- UHD_LOGV(often) << boost::format(
+ UHD_LOGGER_DEBUG("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)) << std::endl;
+ ) % _rx_bandwidth % (int(_max2829_regs.rx_lpf_coarse_adj)) % (int(_max2829_regs.rx_lpf_fine_adj)) ;
return 2.0*_rx_bandwidth;
}
@@ -675,9 +675,9 @@ double xcvr2450::set_tx_bandwidth(double bandwidth){
//update register
send_reg(0x7);
- UHD_LOGV(often) << boost::format(
+ UHD_LOGGER_DEBUG("XCVR2450") << boost::format(
"XCVR2450 TX Bandwidth (lp_fc): %f Hz, coarse reg: %d"
- ) % _tx_bandwidth % (int(_max2829_regs.tx_lpf_coarse_adj)) << std::endl;
+ ) % _tx_bandwidth % (int(_max2829_regs.tx_lpf_coarse_adj)) ;
//convert lowpass back to complex bandpass bandwidth
return 2.0*_tx_bandwidth;