diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-04 19:53:01 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-04 19:53:01 -0700 |
| commit | 09be0518cee887878f3b070adea25eccc4c06e60 (patch) | |
| tree | d25df33a4860116d51fd5ac49753739397948353 /host/lib/usrp/usrp2/mboard_impl.cpp | |
| parent | 805da3ef3d5b04dfa39587c531a3415b09d2ea5b (diff) | |
| download | uhd-09be0518cee887878f3b070adea25eccc4c06e60.tar.gz uhd-09be0518cee887878f3b070adea25eccc4c06e60.tar.bz2 uhd-09be0518cee887878f3b070adea25eccc4c06e60.zip | |
uhd: removed more iostream stuff from usrp* implementations
Diffstat (limited to 'host/lib/usrp/usrp2/mboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/mboard_impl.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index d4ae27763..daccc0865 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -18,6 +18,8 @@ #include "usrp2_impl.hpp" #include "usrp2_regs.hpp" #include "fw_common.h" +#include <uhd/utils/log.hpp> +#include <uhd/utils/msg.hpp> #include <uhd/utils/safe_call.hpp> #include <uhd/exception.hpp> #include <uhd/usrp/gps_ctrl.hpp> @@ -29,7 +31,6 @@ #include <uhd/types/sensors.hpp> #include <boost/assign/list_of.hpp> #include <boost/bind.hpp> -#include <iostream> static const double mimo_clock_delay_usrp2_rev4 = 4.18e-9; static const double mimo_clock_delay_usrp_n2xx = 3.55e-9; @@ -81,19 +82,19 @@ usrp2_mboard_impl::usrp2_mboard_impl( } //construct transports for dsp and async errors - std::cout << "Making transport for DSP0..." << std::endl; + UHD_LOG << "Making transport for DSP0..." << std::endl; device.dsp_xports.push_back(udp_zero_copy::make( device_addr["addr"], BOOST_STRINGIZE(USRP2_UDP_DSP0_PORT), device_addr )); init_xport(device.dsp_xports.back()); - std::cout << "Making transport for DSP1..." << std::endl; + UHD_LOG << "Making transport for DSP1..." << std::endl; device.dsp_xports.push_back(udp_zero_copy::make( device_addr["addr"], BOOST_STRINGIZE(USRP2_UDP_DSP1_PORT), device_addr )); init_xport(device.dsp_xports.back()); - std::cout << "Making transport for ERR0..." << std::endl; + UHD_LOG << "Making transport for ERR0..." << std::endl; device.err_xports.push_back(udp_zero_copy::make( device_addr["addr"], BOOST_STRINGIZE(USRP2_UDP_ERR0_PORT), device_addr_t() )); @@ -141,7 +142,7 @@ usrp2_mboard_impl::usrp2_mboard_impl( else { _mimo_clocking_mode_is_master = (_iface->peek32(_iface->regs.status) & (1 << 8)) != 0; } - std::cout << boost::format("mboard%d MIMO %s") % _index % + UHD_MSG(status) << boost::format("mboard%d MIMO %s") % _index % (_mimo_clocking_mode_is_master?"master":"slave") << std::endl; //init the clock config |