diff options
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 11 | 
1 files changed, 5 insertions, 6 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 22e68c4ed..f07b7fc6f 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -17,6 +17,7 @@  #include "b200_impl.hpp"  #include "b200_regs.hpp" +#include <uhd/config.hpp>  #include <uhd/transport/usb_control.hpp>  #include <uhd/utils/msg.hpp>  #include <uhd/utils/cast.hpp> @@ -112,13 +113,11 @@ static device_addrs_t b200_find(const device_addr_t &hint)          //extract the firmware path for the b200          std::string b200_fw_image;          try{ -            b200_fw_image = find_image_path(hint.get("fw", B200_FW_FILE_NAME)); +            b200_fw_image = hint.get("fw", B200_FW_FILE_NAME); +            b200_fw_image = uhd::find_image_path(b200_fw_image, STR(UHD_IMAGES_DIR)); // FIXME          } -        catch(...){ -            UHD_MSG(warning) << boost::format( -                "Could not locate B200 firmware.\n" -                "Please install the images package. %s\n" -            ) % print_utility_error("uhd_images_downloader.py"); +        catch(uhd::exception &e){ +            UHD_MSG(warning) << e.what();              return b200_addrs;          }          UHD_LOG << "the firmware image: " << b200_fw_image << std::endl;  | 
