logging: Demoted a number of DEBUG messages to TRACE

30 files changed, 49 insertions, 54 deletions

diff --git a/host/lib/image_loader.cpp b/host/lib/image_loader.cpp
index b7c3fda4d..b05664dd0 100644
--- a/host/lib/image_loader.cpp
+++ b/host/lib/image_loader.cpp
@@ -46,7 +46,7 @@ UHD_SINGLETON_FCN(string_map_t,     get_recovery_strings);
 void uhd::image_loader::register_image_loader(const std::string &device_type,
                                               const loader_fcn_t &loader_fcn,
                                               const std::string &recovery_instructions){
-    UHD_LOGGER_DEBUG("UHD") << "Registering image loader and recovery instructions for "
+    UHD_LOGGER_TRACE("UHD") << "Registering image loader and recovery instructions for "
                                      << device_type;
 
     get_image_loaders().insert(loader_fcn_pair_t(device_type, loader_fcn));
diff --git a/host/lib/transport/libusb1_base.cpp b/host/lib/transport/libusb1_base.cpp
index 2a6fc2b8a..24c9e3471 100644
--- a/host/lib/transport/libusb1_base.cpp
+++ b/host/lib/transport/libusb1_base.cpp
@@ -275,15 +275,15 @@ public:
     {
         int ret;
         ret = libusb_clear_halt(this->get(), recv_endpoint  | 0x80);
-        UHD_LOGGER_DEBUG("USB") << "usb device handle: recv endpoint clear: " << libusb_error_name(ret) ;
+        UHD_LOGGER_TRACE("USB") << "usb device handle: recv endpoint clear: " << libusb_error_name(ret) ;
         ret = libusb_clear_halt(this->get(), send_endpoint | 0x00);
-        UHD_LOGGER_DEBUG("USB") << "usb device handle: send endpoint clear: " << libusb_error_name(ret) ;
+        UHD_LOGGER_TRACE("USB") << "usb device handle: send endpoint clear: " << libusb_error_name(ret) ;
     }
 
     void reset_device(void)
     {
         int ret = libusb_reset_device(this->get());
-        UHD_LOGGER_DEBUG("USB") << "usb device handle: dev Reset: " << libusb_error_name(ret) ;
+        UHD_LOGGER_TRACE("USB") << "usb device handle: dev Reset: " << libusb_error_name(ret) ;
     }
 
 private:
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index 4dfcd29e0..96f98ec20 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -57,7 +57,7 @@ rpc_client::rpc_client (
         tcp::resolver::iterator iterator = resolver.resolve(query);
         boost::asio::connect(_socket, iterator);
 
-        UHD_LOGGER_DEBUG("NIRIO") << "rpc_client connected to server." ;
+        UHD_LOGGER_TRACE("NIRIO") << "rpc_client connected to server." ;
 
         try {
             //Perform handshake
@@ -75,7 +75,7 @@ rpc_client::rpc_client (
                 _hshake_args_client.version >= _hshake_args_server.oldest_comp_version &&
                 status)
             {
-                UHD_LOGGER_DEBUG("NIRIO") << "rpc_client bound to server." ;
+                UHD_LOGGER_TRACE("NIRIO") << "rpc_client bound to server." ;
                 _wait_for_next_response_header();
 
                 //Spawn a thread for the io_service callback handler. This thread will run until rpc_client is destroyed.
@@ -84,7 +84,7 @@ rpc_client::rpc_client (
                 UHD_LOGGER_DEBUG("NIRIO") << "rpc_client handshake failed." ;
                 _exec_err.assign(boost::asio::error::connection_refused, boost::asio::error::get_system_category());
             }
-            UHD_LOGGER_DEBUG("NIRIO") << boost::format("rpc_client archive = %d, rpc_server archive = %d\n.") %
+            UHD_LOGGER_TRACE("NIRIO") << boost::format("rpc_client archive = %d, rpc_server archive = %d\n.") %
                 _hshake_args_client.boost_archive_version %
                 _hshake_args_server.boost_archive_version;
         } catch (boost::exception&) {
diff --git a/host/lib/transport/nirio_zero_copy.cpp b/host/lib/transport/nirio_zero_copy.cpp
index 81ba2a20e..3c52e5080 100644
--- a/host/lib/transport/nirio_zero_copy.cpp
+++ b/host/lib/transport/nirio_zero_copy.cpp
@@ -131,11 +131,11 @@ public:
         _xport_params(xport_params),
         _next_recv_buff_index(0), _next_send_buff_index(0)
     {
-        UHD_LOGGER_DEBUG("NIRIO") << boost::format("Creating PCIe transport for channel %d") % instance ;
-        UHD_LOGGER_DEBUG("NIRIO") << boost::format("nirio zero-copy RX transport configured with frame size = %u, #frames = %u, buffer size = %u\n")
+        UHD_LOGGER_TRACE("NIRIO") << boost::format("Creating PCIe transport for channel %d") % instance ;
+        UHD_LOGGER_TRACE("NIRIO") << boost::format("nirio zero-copy RX transport configured with frame size = %u, #frames = %u, buffer size = %u\n")
                     % _xport_params.recv_frame_size % _xport_params.num_recv_frames %
                     (_xport_params.recv_frame_size * _xport_params.num_recv_frames);
-        UHD_LOGGER_DEBUG("NIRIO") << boost::format("nirio zero-copy TX transport configured with frame size = %u, #frames = %u, buffer size = %u\n")
+        UHD_LOGGER_TRACE("NIRIO") << boost::format("nirio zero-copy TX transport configured with frame size = %u, #frames = %u, buffer size = %u\n")
                     % _xport_params.send_frame_size % _xport_params.num_send_frames % (_xport_params.send_frame_size * _xport_params.num_send_frames);
 
         _recv_buffer_pool = buffer_pool::make(_xport_params.num_recv_frames, _xport_params.recv_frame_size);
diff --git a/host/lib/transport/tcp_zero_copy.cpp b/host/lib/transport/tcp_zero_copy.cpp
index 6cb5906de..dc1848b00 100644
--- a/host/lib/transport/tcp_zero_copy.cpp
+++ b/host/lib/transport/tcp_zero_copy.cpp
@@ -144,7 +144,7 @@ public:
         _send_buffer_pool(buffer_pool::make(_num_send_frames, _send_frame_size)),
         _next_recv_buff_index(0), _next_send_buff_index(0)
     {
-        UHD_LOGGER_DEBUG("TCP") << boost::format("Creating tcp transport for %s %s") % addr % port ;
+        UHD_LOGGER_TRACE("TCP") << boost::format("Creating tcp transport for %s %s") % addr % port ;
 
         //resolve the address
         asio::ip::tcp::resolver resolver(_io_service);
diff --git a/host/lib/transport/udp_simple.cpp b/host/lib/transport/udp_simple.cpp
index 735c199a2..9fe285376 100644
--- a/host/lib/transport/udp_simple.cpp
+++ b/host/lib/transport/udp_simple.cpp
@@ -31,7 +31,7 @@ public:
     udp_simple_impl(
         const std::string &addr, const std::string &port, bool bcast, bool connect
     ):_connected(connect){
-        UHD_LOGGER_DEBUG("UDP") << boost::format("Creating udp transport for %s %s") % addr % port ;
+        UHD_LOGGER_TRACE("UDP") << boost::format("Creating udp transport for %s %s") % addr % port ;
 
         //resolve the address
         asio::ip::udp::resolver resolver(_io_service);
diff --git a/host/lib/transport/udp_zero_copy.cpp b/host/lib/transport/udp_zero_copy.cpp
index 68970f332..f89cfc92e 100644
--- a/host/lib/transport/udp_zero_copy.cpp
+++ b/host/lib/transport/udp_zero_copy.cpp
@@ -175,7 +175,7 @@ public:
         _send_buffer_pool(buffer_pool::make(xport_params.num_send_frames, xport_params.send_frame_size)),
         _next_recv_buff_index(0), _next_send_buff_index(0)
     {
-        UHD_LOGGER_DEBUG("UDP") << boost::format("Creating udp transport for %s %s") % addr % port ;
+        UHD_LOGGER_TRACE("UDP") << boost::format("Creating udp transport for %s %s") % addr % port ;
 
         #ifdef CHECK_REG_SEND_THRESH
         check_registry_for_fast_send_threshold(this->get_send_frame_size());
diff --git a/host/lib/transport/zero_copy_recv_offload.cpp b/host/lib/transport/zero_copy_recv_offload.cpp
index d2c4d2991..5de2cd44d 100644
--- a/host/lib/transport/zero_copy_recv_offload.cpp
+++ b/host/lib/transport/zero_copy_recv_offload.cpp
@@ -47,7 +47,7 @@ public:
         _inbox(transport->get_num_recv_frames()),
         _recv_done(false)
     {
-        UHD_LOGGER_DEBUG("XPORT") << "Created threaded transport" ;
+        UHD_LOGGER_TRACE("XPORT") << "Created threaded transport" ;
 
         // Create the receive and send threads to offload
         // the system calls onto other threads
diff --git a/host/lib/usrp/b100/clock_ctrl.cpp b/host/lib/usrp/b100/clock_ctrl.cpp
index cc20e4a0f..010a0a6f8 100644
--- a/host/lib/usrp/b100/clock_ctrl.cpp
+++ b/host/lib/usrp/b100/clock_ctrl.cpp
@@ -465,7 +465,7 @@ private:
 
     void send_reg(uint16_t addr){
         uint32_t reg = _ad9522_regs.get_write_reg(addr);
-        UHD_LOGGER_DEBUG("B100") << "clock control write reg: " << std::hex << reg ;
+        UHD_LOGGER_TRACE("B100") << "clock control write reg: " << std::hex << reg ;
         byte_vector_t buf;
         buf.push_back(uint8_t(reg >> 16));
         buf.push_back(uint8_t(reg >> 8));
diff --git a/host/lib/usrp/b100/codec_ctrl.cpp b/host/lib/usrp/b100/codec_ctrl.cpp
index 26ee877dc..01fd51f52 100644
--- a/host/lib/usrp/b100/codec_ctrl.cpp
+++ b/host/lib/usrp/b100/codec_ctrl.cpp
@@ -259,7 +259,7 @@ void b100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){
  **********************************************************************/
 void b100_codec_ctrl_impl::send_reg(uint8_t addr){
     uint32_t reg = _ad9862_regs.get_write_reg(addr);
-    UHD_LOGGER_DEBUG("B100") << "codec control write reg: " << std::hex << reg ;
+    UHD_LOGGER_TRACE("B100") << "codec control write reg: " << std::hex << reg ;
     _iface->transact_spi(
         B100_SPI_SS_AD9862,
         spi_config_t::EDGE_RISE,
@@ -269,13 +269,13 @@ void b100_codec_ctrl_impl::send_reg(uint8_t addr){
 
 void b100_codec_ctrl_impl::recv_reg(uint8_t addr){
     uint32_t reg = _ad9862_regs.get_read_reg(addr);
-    UHD_LOGGER_DEBUG("B100") << "codec control read reg: " << std::hex << reg ;
+    UHD_LOGGER_TRACE("B100") << "codec control read reg: " << std::hex << reg ;
     uint32_t ret = _iface->transact_spi(
         B100_SPI_SS_AD9862,
         spi_config_t::EDGE_RISE,
         reg, 16, true /*rb*/
     );
-    UHD_LOGGER_DEBUG("B100") << "codec control read ret: " << std::hex << uint16_t(ret & 0xFF) ;
+    UHD_LOGGER_TRACE("B100") << "codec control read ret: " << std::hex << uint16_t(ret & 0xFF) ;
     _ad9862_regs.set_reg(addr, uint8_t(ret&0xff));
 }
 
diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp
index 11cb092b8..cc98205e9 100644
--- a/host/lib/usrp/dboard/db_cbx.cpp
+++ b/host/lib/usrp/dboard/db_cbx.cpp
@@ -51,7 +51,7 @@ void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const std::vector<u
  * Tuning
  **********************************************************************/
 double sbx_xcvr::cbx::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
-    UHD_LOGGER_DEBUG("CBX") << boost::format(
+    UHD_LOGGER_TRACE("CBX") << boost::format(
         "CBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index 80faba5d2..a725db4a1 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -147,7 +147,7 @@ private:
         //mask and return lock detect
         bool locked = 5 >= _max2118_read_regs.adc and _max2118_read_regs.adc >= 2;
 
-        UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+        UHD_LOGGER_TRACE("DBSRX") << boost::format(
             "DBSRX: locked %d"
         ) % locked ;
 
diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp
index 1efc6efd7..72e180a6f 100644
--- a/host/lib/usrp/dboard/db_dbsrx2.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx2.cpp
@@ -132,11 +132,6 @@ private:
             for(uint8_t i=0; i < num_bytes; i++){
                 if (i + start_addr >= status_addr){
                     _max2112_read_regs.set_reg(i + start_addr, regs_vector[i]);
-                    /*
-                    UHD_LOGGER_DEBUG("DBSRX") << boost::format(
-                        "DBSRX2: set reg 0x%02x, value 0x%04x"
-                    ) % int(i + start_addr) % int(_max2112_read_regs.get_reg(i + start_addr));
-                    */
                 }
                 UHD_LOGGER_DEBUG("DBSRX") << boost::format(
                     "DBSRX2: read reg 0x%02x, value 0x%04x, start_addr = 0x%04x, num_bytes %d"
@@ -155,7 +150,7 @@ private:
         //mask and return lock detect
         bool locked = (_max2112_read_regs.ld & _max2112_read_regs.vasa & _max2112_read_regs.vase) != 0;
 
-        UHD_LOGGER_DEBUG("DBSRX") << boost::format(
+        UHD_LOGGER_TRACE("DBSRX") << boost::format(
             "DBSRX2 locked: %d"
         ) % locked ;
 
@@ -307,7 +302,7 @@ static int gain_to_bbg_vga_reg(double &gain){
     UHD_LOGGER_DEBUG("DBSRX")
         << boost::format("DBSRX2 BBG Gain:\n")
         << boost::format("    %f dB, bbg: %d") % gain % reg
-        ;
+    ;
 
     return reg;
 }
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index 0a2729320..205ec7d79 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -339,7 +339,7 @@ double rfx_xcvr::set_lo_freq(
     dboard_iface::unit_t unit,
     double target_freq
 ){
-    UHD_LOGGER_DEBUG("RFX") << boost::format(
+    UHD_LOGGER_TRACE("RFX") << boost::format(
         "RFX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
@@ -442,7 +442,7 @@ double rfx_xcvr::set_lo_freq(
 
     //return the actual frequency
     if (_div2[unit]) actual_freq /= 2;
-    UHD_LOGGER_DEBUG("RFX") << boost::format(
+    UHD_LOGGER_TRACE("RFX") << boost::format(
         "RFX tune: actual frequency %f MHz"
     ) % (actual_freq/1e6) ;
     return actual_freq;
diff --git a/host/lib/usrp/dboard/db_sbx_version3.cpp b/host/lib/usrp/dboard/db_sbx_version3.cpp
index 9f762a7f2..f35c09946 100644
--- a/host/lib/usrp/dboard/db_sbx_version3.cpp
+++ b/host/lib/usrp/dboard/db_sbx_version3.cpp
@@ -50,7 +50,7 @@ void sbx_xcvr::sbx_version3::write_lo_regs(dboard_iface::unit_t unit, const std:
  * Tuning
  **********************************************************************/
 double sbx_xcvr::sbx_version3::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
-    UHD_LOGGER_DEBUG("SBX") << boost::format(
+    UHD_LOGGER_TRACE("SBX") << boost::format(
         "SBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
diff --git a/host/lib/usrp/dboard/db_sbx_version4.cpp b/host/lib/usrp/dboard/db_sbx_version4.cpp
index effe0b5eb..746de780b 100644
--- a/host/lib/usrp/dboard/db_sbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_sbx_version4.cpp
@@ -52,7 +52,7 @@ void sbx_xcvr::sbx_version4::write_lo_regs(dboard_iface::unit_t unit, const std:
  * Tuning
  **********************************************************************/
 double sbx_xcvr::sbx_version4::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
-    UHD_LOGGER_DEBUG("SBX") << boost::format(
+    UHD_LOGGER_TRACE("SBX") << boost::format(
         "SBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
diff --git a/host/lib/usrp/dboard/db_wbx_version2.cpp b/host/lib/usrp/dboard/db_wbx_version2.cpp
index 134626928..b8f024592 100644
--- a/host/lib/usrp/dboard/db_wbx_version2.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version2.cpp
@@ -165,7 +165,7 @@ double wbx_base::wbx_version2::set_lo_freq(dboard_iface::unit_t unit, double tar
     //clip to tuning range
     target_freq = wbx_v2_freq_range.clip(target_freq);
 
-    UHD_LOGGER_DEBUG("WBX") << boost::format(
+    UHD_LOGGER_TRACE("WBX") << boost::format(
         "WBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
diff --git a/host/lib/usrp/dboard/db_wbx_version3.cpp b/host/lib/usrp/dboard/db_wbx_version3.cpp
index 5365a55e5..98f4b5a39 100644
--- a/host/lib/usrp/dboard/db_wbx_version3.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version3.cpp
@@ -196,7 +196,7 @@ double wbx_base::wbx_version3::set_lo_freq(dboard_iface::unit_t unit, double tar
     //clip to tuning range
     target_freq = wbx_v3_freq_range.clip(target_freq);
 
-    UHD_LOGGER_DEBUG("WBX") << boost::format(
+    UHD_LOGGER_TRACE("WBX") << boost::format(
         "WBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp
index f08504f09..f848df764 100644
--- a/host/lib/usrp/dboard/db_wbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp
@@ -204,7 +204,7 @@ double wbx_base::wbx_version4::set_lo_freq(dboard_iface::unit_t unit, double tar
     //clip to tuning range
     target_freq = wbx_v4_freq_range.clip(target_freq);
 
-    UHD_LOGGER_DEBUG("WBX") << boost::format(
+    UHD_LOGGER_TRACE("WBX") << boost::format(
         "WBX tune: target frequency %f MHz"
     ) % (target_freq/1e6) ;
 
diff --git a/host/lib/usrp/e100/clock_ctrl.cpp b/host/lib/usrp/e100/clock_ctrl.cpp
index 567a4b8fb..a3f630462 100644
--- a/host/lib/usrp/e100/clock_ctrl.cpp
+++ b/host/lib/usrp/e100/clock_ctrl.cpp
@@ -459,7 +459,7 @@ private:
 
     void send_reg(uint16_t addr){
         uint32_t reg = _ad9522_regs.get_write_reg(addr);
-        UHD_LOGGER_DEBUG("E100") << "clock control write reg: " << std::hex << reg ;
+        UHD_LOGGER_TRACE("E100") << "clock control write reg: " << std::hex << reg ;
         _iface->write_spi(
             UE_SPI_SS_AD9522,
             spi_config_t::EDGE_RISE,
diff --git a/host/lib/usrp/e100/codec_ctrl.cpp b/host/lib/usrp/e100/codec_ctrl.cpp
index ee26c1990..5bd394fb1 100644
--- a/host/lib/usrp/e100/codec_ctrl.cpp
+++ b/host/lib/usrp/e100/codec_ctrl.cpp
@@ -260,7 +260,7 @@ void e100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){
  **********************************************************************/
 void e100_codec_ctrl_impl::send_reg(uint8_t addr){
     uint32_t reg = _ad9862_regs.get_write_reg(addr);
-    UHD_LOGGER_DEBUG("E100") << "codec control write reg: " << std::hex << reg ;
+    UHD_LOGGER_TRACE("E100") << "codec control write reg: " << std::hex << reg ;
     _iface->write_spi(
         UE_SPI_SS_AD9862,
         spi_config_t::EDGE_RISE,
@@ -270,13 +270,13 @@ void e100_codec_ctrl_impl::send_reg(uint8_t addr){
 
 void e100_codec_ctrl_impl::recv_reg(uint8_t addr){
     uint32_t reg = _ad9862_regs.get_read_reg(addr);
-    UHD_LOGGER_DEBUG("E100") << "codec control read reg: " << std::hex << reg ;
+    UHD_LOGGER_TRACE("E100") << "codec control read reg: " << std::hex << reg ;
     uint32_t ret = _iface->read_spi(
         UE_SPI_SS_AD9862,
         spi_config_t::EDGE_RISE,
         reg, 16
     );
-    UHD_LOGGER_DEBUG("E100") << "codec control read ret: " << std::hex << ret ;
+    UHD_LOGGER_TRACE("E100") << "codec control read ret: " << std::hex << ret ;
     _ad9862_regs.set_reg(addr, uint16_t(ret));
 }
 
diff --git a/host/lib/usrp/e300/e300_fifo_config.cpp b/host/lib/usrp/e300/e300_fifo_config.cpp
index b51896d82..3d0f0d497 100644
--- a/host/lib/usrp/e300/e300_fifo_config.cpp
+++ b/host/lib/usrp/e300/e300_fifo_config.cpp
@@ -341,7 +341,7 @@ public:
     virtual ~e300_fifo_interface_impl(void)
     {
         delete _waiter;
-        UHD_LOGGER_DEBUG("E300")<< "cleanup: munmap" ;
+        UHD_LOGGER_TRACE("E300")<< "cleanup: munmap" ;
         ::munmap(_buff, _config.ctrl_length + _config.buff_length);
         ::close(_fd);
     }
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp
index 20dd89dd1..4b73ceac7 100644
--- a/host/lib/usrp/e300/e300_impl.cpp
+++ b/host/lib/usrp/e300/e300_impl.cpp
@@ -776,7 +776,7 @@ uint32_t e300_impl::_allocate_sid(const sid_config_t &config)
     _global_regs->poke32(XB_ADDR(E300_DEVICE_HERE),
                          config.router_dst_here);
 
-    UHD_LOGGER_DEBUG("E300") << std::hex
+    UHD_LOGGER_TRACE("E300") << std::hex
         << "done router config for sid 0x" << sid
         << std::dec ;
 
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
index 9ae628eb7..1abbb9b0c 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -1949,6 +1949,6 @@ multi_usrp::~multi_usrp(void){
  * The Make Function
  **********************************************************************/
 multi_usrp::sptr multi_usrp::make(const device_addr_t &dev_addr){
-    UHD_LOGGER_DEBUG("MULTI_USRP") << "multi_usrp::make with args " << dev_addr.to_pp_string() ;
+    UHD_LOGGER_TRACE("MULTI_USRP") << "multi_usrp::make with args " << dev_addr.to_pp_string() ;
     return sptr(new multi_usrp_impl(dev_addr));
 }
diff --git a/host/lib/usrp/usrp1/codec_ctrl.cpp b/host/lib/usrp/usrp1/codec_ctrl.cpp
index 73b97aa13..bb81ec3e7 100644
--- a/host/lib/usrp/usrp1/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp1/codec_ctrl.cpp
@@ -277,7 +277,7 @@ void usrp1_codec_ctrl_impl::send_reg(uint8_t addr)
 {
     uint32_t reg = _ad9862_regs.get_write_reg(addr);
 
-    UHD_LOGGER_DEBUG("USRP1")
+    UHD_LOGGER_TRACE("USRP1")
         << "codec control write reg: 0x"
         << std::setw(8) << std::hex << reg 
     ;
@@ -289,7 +289,7 @@ void usrp1_codec_ctrl_impl::recv_reg(uint8_t addr)
 {
     uint32_t reg = _ad9862_regs.get_read_reg(addr);
 
-    UHD_LOGGER_DEBUG("USRP1")
+    UHD_LOGGER_TRACE("USRP1")
         << "codec control read reg: 0x"
         << std::setw(8) << std::hex << reg 
     ;
@@ -297,7 +297,7 @@ void usrp1_codec_ctrl_impl::recv_reg(uint8_t addr)
     uint32_t ret = _iface->read_spi(_spi_slave,
                                         spi_config_t::EDGE_RISE, reg, 16);
 
-    UHD_LOGGER_DEBUG("USRP1")
+    UHD_LOGGER_TRACE("USRP1")
         << "codec control read ret: 0x"
         << std::setw(8) << std::hex << ret 
     ;
diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp
index 2d28ad542..9390714ae 100644
--- a/host/lib/usrp/usrp1/usrp1_iface.cpp
+++ b/host/lib/usrp/usrp1/usrp1_iface.cpp
@@ -49,7 +49,7 @@ public:
     {
         uint32_t swapped = uhd::htonx(value);
 
-        UHD_LOGGER_DEBUG("USRP1")
+        UHD_LOGGER_TRACE("USRP1")
             << "poke32("
             << std::dec << std::setw(2) << addr << ", 0x"
             << std::hex << std::setw(8) << value << ")"
@@ -70,7 +70,7 @@ public:
 
     uint32_t peek32(const uint32_t addr)
     {
-        UHD_LOGGER_DEBUG("USRP1")
+        UHD_LOGGER_TRACE("USRP1")
             << "peek32("
             << std::dec << std::setw(2) << addr << ")"
         ;
@@ -129,7 +129,7 @@ public:
                                  size_t num_bits,
                                  bool readback)
     {
-        UHD_LOGGER_DEBUG("USRP1")
+        UHD_LOGGER_TRACE("USRP1")
             << "transact_spi: "
             << "  slave: " << which_slave
             << "  bits: " << bits
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index 15bcce4bf..ec8bcf919 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -197,7 +197,7 @@ private:
 
     void send_ad9777_reg(uint8_t addr){
         uint16_t reg = _ad9777_regs.get_write_reg(addr);
-        UHD_LOGGER_DEBUG("USRP2") << "send_ad9777_reg: " << std::hex << reg;
+        UHD_LOGGER_TRACE("USRP2") << "send_ad9777_reg: " << std::hex << reg;
         _spiface->write_spi(
             SPI_SS_AD9777, spi_config_t::EDGE_RISE,
             reg, 16
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 7d8f59fb8..78a9acb72 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -432,19 +432,19 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr) :
         ////////////////////////////////////////////////////////////////
         // construct transports for RX and TX DSPs
         ////////////////////////////////////////////////////////////////
-        UHD_LOGGER_DEBUG("USRP2") << "Making transport for RX DSP0..." ;
+        UHD_LOGGER_TRACE("USRP2") << "Making transport for RX DSP0..." ;
         _mbc[mb].rx_dsp_xports.push_back(make_xport(
             addr, BOOST_STRINGIZE(USRP2_UDP_RX_DSP0_PORT), device_args_i, "recv"
         ));
-        UHD_LOGGER_DEBUG("USRP2") << "Making transport for RX DSP1..." ;
+        UHD_LOGGER_TRACE("USRP2") << "Making transport for RX DSP1..." ;
         _mbc[mb].rx_dsp_xports.push_back(make_xport(
             addr, BOOST_STRINGIZE(USRP2_UDP_RX_DSP1_PORT), device_args_i, "recv"
         ));
-        UHD_LOGGER_DEBUG("USRP2") << "Making transport for TX DSP0..." ;
+        UHD_LOGGER_TRACE("USRP2") << "Making transport for TX DSP0..." ;
         _mbc[mb].tx_dsp_xport = make_xport(
             addr, BOOST_STRINGIZE(USRP2_UDP_TX_DSP0_PORT), device_args_i, "send"
         );
-        UHD_LOGGER_DEBUG("USRP2") << "Making transport for Control..." ;
+        UHD_LOGGER_TRACE("USRP2") << "Making transport for Control..." ;
         _mbc[mb].fifo_ctrl_xport = make_xport(
             addr, BOOST_STRINGIZE(USRP2_UDP_FIFO_CRTL_PORT), device_addr_t(), ""
         );
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index 8e48c606a..785f7b4a3 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1319,7 +1319,7 @@ uhd::sid_t x300_impl::allocate_sid(
     // This type of packet does not match the XB_LOCAL address and is looked up in the lower half of the CAM
     mb.zpu_ctrl->poke32(SR_ADDR(SETXB_BASE, 0 + src_addr), src_dst);
 
-    UHD_LOGGER_DEBUG("X300") << "done router config for sid " << sid ;
+    UHD_LOGGER_TRACE("X300") << "done router config for sid " << sid ;
 
     return sid;
 }
diff --git a/host/lib/usrp_clock/multi_usrp_clock.cpp b/host/lib/usrp_clock/multi_usrp_clock.cpp
index cc11e9f83..bcc0b57d6 100644
--- a/host/lib/usrp_clock/multi_usrp_clock.cpp
+++ b/host/lib/usrp_clock/multi_usrp_clock.cpp
@@ -91,6 +91,6 @@ multi_usrp_clock::~multi_usrp_clock(void){
  * Multi USRP Clock factory function
  **********************************************************************/
 multi_usrp_clock::sptr multi_usrp_clock::make(const device_addr_t &dev_addr){
-    UHD_LOGGER_DEBUG("OCTOCLOCK") << "multi_usrp_clock::make with args " << dev_addr.to_pp_string() ;
+    UHD_LOGGER_TRACE("OCTOCLOCK") << "multi_usrp_clock::make with args " << dev_addr.to_pp_string() ;
     return sptr(new multi_usrp_clock_impl(dev_addr));
 }