diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-03-15 13:01:10 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-03-15 13:01:10 -0700 |
| commit | 255b04dd50f6aa4330be75c57c661f70f11e50cf (patch) | |
| tree | 14da61570929b8713cc84cf5eaa1da36366bbb65 /host/lib/usrp | |
| parent | 6364662f179522b1cccc00e5ce9f965170cd02be (diff) | |
| parent | d2a25056604cef5a84bc3d9c129ad2d31d838a0e (diff) | |
| download | uhd-255b04dd50f6aa4330be75c57c661f70f11e50cf.tar.gz uhd-255b04dd50f6aa4330be75c57c661f70f11e50cf.tar.bz2 uhd-255b04dd50f6aa4330be75c57c661f70f11e50cf.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 07b0582d0..2d6ce822e 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1686,10 +1686,7 @@ void x300_impl::check_fpga_compat(const fs_path &mb_path, const mboard_members_t : "resource") % members.get_pri_eth().addr); - std::cout << "=========================================================" << std::endl; - std::cout << "Warning:" << std::endl; - //throw uhd::runtime_error(str(boost::format( - std::cout << (str(boost::format( + throw uhd::runtime_error(str(boost::format( "Expected FPGA compatibility number %d, but got %d:\n" "The FPGA image on your device is not compatible with this host code build.\n" "Download the appropriate FPGA images for this version of UHD.\n" @@ -1701,7 +1698,6 @@ void x300_impl::check_fpga_compat(const fs_path &mb_path, const mboard_members_t ) % int(X300_FPGA_COMPAT_MAJOR) % compat_major % print_utility_error("uhd_images_downloader.py") % image_loader_cmd)); - std::cout << "=========================================================" << std::endl; } _tree->create<std::string>(mb_path / "fpga_version").set(str(boost::format("%u.%u") % compat_major % compat_minor)); |