diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-29 09:51:41 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-29 09:51:41 -0700 |
| commit | 302078474312ad87db69a9c06b63e3f8a0c19cd5 (patch) | |
| tree | 5ad8103f3ab8f3d40d0d24d82b5fdc253a197a6a /host/lib/usrp | |
| parent | 83039bdc8b16ab6554e91bce2d0cdc7c89665062 (diff) | |
| download | uhd-302078474312ad87db69a9c06b63e3f8a0c19cd5.tar.gz uhd-302078474312ad87db69a9c06b63e3f8a0c19cd5.tar.bz2 uhd-302078474312ad87db69a9c06b63e3f8a0c19cd5.zip | |
usrp1: fixed compile time warning, tweaked fw load message
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_ctrl.cpp b/host/lib/usrp/usrp1/usrp1_ctrl.cpp index 5d73e6dd9..5043aed7d 100644 --- a/host/lib/usrp/usrp1/usrp1_ctrl.cpp +++ b/host/lib/usrp/usrp1/usrp1_ctrl.cpp @@ -180,7 +180,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) std::cout << "Loading firmware image: " << filestring << "..." << std::flush; usrp_control_write(FX2_FIRMWARE_LOAD, 0xe600, 0, &reset_y, 1); @@ -272,7 +272,7 @@ public: size_t n = file.gcount(); ret = usrp_control_write(VRQ_FPGA_LOAD, 0, FL_XFER, buf, n); - if (ret != n) { + if (ret < 0 or size_t(ret) != n) { std::cerr << "fpga load error " << ret << std::endl; file.close(); return -1; |