From 91c10b31f94f95f1588571e0580b09a8b354a2a3 Mon Sep 17 00:00:00 2001
From: Michael West <michael.west@ettus.com>
Date: Mon, 18 Nov 2013 10:51:10 -0800
Subject: BUG #182: Cleaned up for proper dynamic linking of libuhd.

---
 host/utils/b2xx_fx3_utils.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'host/utils/b2xx_fx3_utils.cpp')

diff --git a/host/utils/b2xx_fx3_utils.cpp b/host/utils/b2xx_fx3_utils.cpp
index e910ffc6c..d4e3b0f9a 100644
--- a/host/utils/b2xx_fx3_utils.cpp
+++ b/host/utils/b2xx_fx3_utils.cpp
@@ -38,6 +38,7 @@
 #include <uhd/transport/usb_control.hpp>
 #include <uhd/transport/usb_device_handle.hpp>
 #include <uhd/exception.hpp>
+#include <uhd/utils/images.hpp>
 
 namespace po = boost::program_options;
 namespace fs = boost::filesystem;
@@ -182,6 +183,8 @@ boost::int32_t main(boost::int32_t argc, char *argv[]) {
 
         if (!(handles[0]->firmware_loaded()))
         {
+            if (fw_file.empty())
+                fw_file = uhd::find_image_path(B200_FW_FILE_NAME);
             b200->load_firmware(fw_file);
 
             // Now that the firmware is loaded, we need to re-open the device
@@ -229,6 +232,8 @@ boost::int32_t main(boost::int32_t argc, char *argv[]) {
         if (!(handles[0]->firmware_loaded()))
         {
             // load FW
+            if (fw_file.empty())
+                fw_file = uhd::find_image_path(B200_FW_FILE_NAME);
             b200->load_firmware(fw_file);
 
             // re-open device
@@ -309,6 +314,8 @@ boost::int32_t main(boost::int32_t argc, char *argv[]) {
 
         if (!(handles[0]->firmware_loaded()))
         {
+            if (fw_file.empty())
+                fw_file = uhd::find_image_path(B200_FW_FILE_NAME);
             b200->load_firmware(fw_file);
 
             // Now that the firmware is loaded, we need to re-open the device
@@ -384,6 +391,8 @@ boost::int32_t main(boost::int32_t argc, char *argv[]) {
         if (!(handles[0]->firmware_loaded()))
         {
             // load FW
+            if (fw_file.empty())
+                fw_file = uhd::find_image_path(B200_FW_FILE_NAME);
             b200->load_firmware(fw_file);
 
             // re-open device
-- 
cgit v1.2.3