diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-28 22:10:10 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-28 22:10:10 +0100 |
| commit | db3fac73beb30ceaaf6a275d9668a38af3b839f5 (patch) | |
| tree | d0713571a7a4d14d38c4d6c59337e6fbfca1f4a1 /host/lib/transport/nirio/lvbitx/template_lvbitx.cpp | |
| parent | 156c21206e8bccf4b5680a62c28a7dc7544aa9be (diff) | |
| parent | 75d519706b9b0956307a6a4bdc53c36376f19f03 (diff) | |
| download | uhd-db3fac73beb30ceaaf6a275d9668a38af3b839f5.tar.gz uhd-db3fac73beb30ceaaf6a275d9668a38af3b839f5.tar.bz2 uhd-db3fac73beb30ceaaf6a275d9668a38af3b839f5.zip | |
Merge paths-fix branch into maint.
Diffstat (limited to 'host/lib/transport/nirio/lvbitx/template_lvbitx.cpp')
| -rw-r--r-- | host/lib/transport/nirio/lvbitx/template_lvbitx.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/transport/nirio/lvbitx/template_lvbitx.cpp b/host/lib/transport/nirio/lvbitx/template_lvbitx.cpp index a1899c771..8f1fb6b36 100644 --- a/host/lib/transport/nirio/lvbitx/template_lvbitx.cpp +++ b/host/lib/transport/nirio/lvbitx/template_lvbitx.cpp @@ -8,6 +8,7 @@ #include <boost/filesystem/path.hpp> #include <boost/algorithm/string.hpp> #include <boost/regex.hpp> +#include <uhd/utils/paths.hpp> namespace uhd {{ namespace niusrprio {{ @@ -27,8 +28,9 @@ const char* {lvbitx_classname}_lvbitx::INPUT_FIFOS[] = {{{in_fifo_list} {lvbitx_classname}_lvbitx::{lvbitx_classname}_lvbitx(const std::string& option) {{ - boost::filesystem::path fpga_path(_get_fpga_images_dir(SEARCH_PATHS)); - fpga_path /= "usrp_{lvbitx_classname}_fpga_" + option + ".lvbitx"; + std::string fpga_file = "usrp_{lvbitx_classname}_fpga_" + option + ".lvbitx"; + boost::filesystem::path fpga_path(uhd::find_image_path(fpga_file, SEARCH_PATHS)); + _fpga_file_name = fpga_path.string(); _bitstream_checksum = _get_bitstream_checksum(_fpga_file_name); }} |