diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2018-01-08 11:01:31 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-01-08 11:52:49 -0800 |
| commit | ca5054248fc5eb58c04b81f43dd7215e1c325b18 (patch) | |
| tree | 6321ae5aa6198c8a35d6630493928327883bbb47 | |
| parent | 5514917583be687414ceb28a2fb9cb6bbb7c67c6 (diff) | |
| download | uhd-ca5054248fc5eb58c04b81f43dd7215e1c325b18.tar.gz uhd-ca5054248fc5eb58c04b81f43dd7215e1c325b18.tar.bz2 uhd-ca5054248fc5eb58c04b81f43dd7215e1c325b18.zip | |
rfnoc: dma_fifo: Minor: Cleaned up log prints
| -rw-r--r-- | host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/cores/dma_fifo_core_3000.cpp | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp index 438937430..82781995e 100644 --- a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp +++ b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp @@ -51,20 +51,20 @@ public: _perifs[i].depth = DEFAULT_SIZE; _perifs[i].core = dma_fifo_core_3000::make(_perifs[i].ctrl, USER_SR_BASE, USER_RB_BASE); _perifs[i].core->resize(_perifs[i].base_addr, _perifs[i].depth); - UHD_LOGGER_INFO("RFNOC") << boost::format("[DMA FIFO] Running BIST for FIFO %d... ") % i; + UHD_LOGGER_INFO("RFNOC DMA FIFO") << boost::format("Running BIST for FIFO %d... ") % i; if (_perifs[i].core->ext_bist_supported()) { uint32_t bisterr = _perifs[i].core->run_bist(); if (bisterr != 0) { throw uhd::runtime_error(str(boost::format("BIST failed! (code: %d)\n") % bisterr)); } else { double throughput = _perifs[i].core->get_bist_throughput(); - UHD_LOGGER_INFO("RFNOC") << (boost::format("pass (Throughput: %.1fMB/s)") % (throughput/1e6)) ; + UHD_LOGGER_INFO("RFNOC DMA FIFO") << (boost::format("BIST passed (Throughput: %.0f MB/s)") % (throughput/1e6)) ; } } else { if (_perifs[i].core->run_bist() == 0) { - UHD_LOGGER_INFO("RFNOC") << "pass\n"; + UHD_LOGGER_INFO("RFNOC DMA FIFO") << "BIST passed"; } else { - throw uhd::runtime_error("BIST failed!\n"); + throw uhd::runtime_error("BIST failed!"); } } _tree->access<int>(get_arg_path("base_addr/value", i)) diff --git a/host/lib/usrp/cores/dma_fifo_core_3000.cpp b/host/lib/usrp/cores/dma_fifo_core_3000.cpp index 6558271fa..683e6027f 100644 --- a/host/lib/usrp/cores/dma_fifo_core_3000.cpp +++ b/host/lib/usrp/cores/dma_fifo_core_3000.cpp @@ -329,7 +329,6 @@ public: _wait_for_bist_done(1000); static const double BYTES_PER_CYC = 8; double bus_clk_rate = _fifo_readback.get_bus_clk_rate(); - UHD_LOGGER_INFO("DEBUG") << boost::format("[DMA FIFO] Clock rate for BIST calculation: %d ") % bus_clk_rate; return _fifo_readback.get_xfer_ratio() * bus_clk_rate * BYTES_PER_CYC; } else { throw uhd::not_implemented_error( |