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/usrp1/usrp1_ctrl.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/usrp1/usrp1_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_ctrl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_ctrl.cpp b/host/lib/usrp/usrp1/usrp1_ctrl.cpp index c6be28f5f..96dc5d80c 100644 --- a/host/lib/usrp/usrp1/usrp1_ctrl.cpp +++ b/host/lib/usrp/usrp1/usrp1_ctrl.cpp @@ -17,11 +17,11 @@ #include "usrp1_ctrl.hpp" #include "usrp_commands.h" +#include <uhd/utils/msg.hpp> #include <uhd/exception.hpp> #include <uhd/transport/usb_control.hpp> #include <boost/functional/hash.hpp> #include <boost/thread/thread.hpp> -#include <iostream> #include <fstream> #include <sstream> #include <string> @@ -162,7 +162,7 @@ public: unsigned char reset_n = 0; //hit the reset line - if (load_img_msg) std::cout << "Loading firmware image: " << filestring << "..." << std::flush; + if (load_img_msg) UHD_MSG(status) << "Loading firmware image: " << filestring << "..." << std::flush; usrp_control_write(FX2_FIRMWARE_LOAD, 0xe600, 0, &reset_y, 1); while (!file.eof()) { @@ -187,7 +187,7 @@ public: //wait for things to settle boost::this_thread::sleep(boost::posix_time::milliseconds(1000)); - if (load_img_msg) std::cout << " done" << std::endl; + if (load_img_msg) UHD_MSG(status) << " done" << std::endl; return; } //type anything else is unhandled @@ -228,7 +228,7 @@ public: const int ep0_size = 64; unsigned char buf[ep0_size]; - if (load_img_msg) std::cout << "Loading FPGA image: " << filestring << "..." << std::flush; + if (load_img_msg) UHD_MSG(status) << "Loading FPGA image: " << filestring << "..." << std::flush; std::ifstream file; file.open(filename, std::ios::in | std::ios::binary); if (not file.good()) { @@ -259,7 +259,7 @@ public: usrp_fpga_reset(false); //done loading, take fpga out of reset file.close(); - if (load_img_msg) std::cout << " done" << std::endl; + if (load_img_msg) UHD_MSG(status) << " done" << std::endl; } void usrp_load_eeprom(std::string filestring) |