1 files changed, 34 insertions, 1 deletions
diff --git a/host/lib/usrp/e300/e300_common.cpp b/host/lib/usrp/e300/e300_common.cpp
index db5b37055..29117e21f 100644
--- a/host/lib/usrp/e300/e300_common.cpp
+++ b/host/lib/usrp/e300/e300_common.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2014 Ettus Research LLC
+// Copyright 2014-2015 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,8 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
+#include <uhd/image_loader.hpp>
 #include <uhd/utils/msg.hpp>
+#include <uhd/utils/paths.hpp>
+#include <uhd/utils/static.hpp>
 
+#include "e300_impl.hpp"
 #include "e300_fifo_config.hpp"
 #include "e300_fifo_config.hpp"
 
@@ -23,6 +27,7 @@
 
 #include <boost/filesystem.hpp>
 #include <fstream>
+#include <string>
 
 namespace uhd { namespace usrp { namespace e300 {
 
@@ -54,6 +59,34 @@ void load_fpga_image(const std::string &path)
     UHD_MSG(status) << " done" << std::endl;
 }
 
+static bool e300_image_loader(const image_loader::image_loader_args_t &image_loader_args) {
+    // Make sure this is an E3x0 and we don't want to use anything connected
+    uhd::device_addrs_t devs = e300_find(image_loader_args.args);
+    if(devs.size() == 0 or !image_loader_args.load_fpga) return false;
+
+    std::string fpga_filename, idle_image; // idle_image never used, just needed for function
+    if(image_loader_args.fpga_path == "") {
+        get_e3x0_fpga_images(devs[0], fpga_filename, idle_image);
+    }
+    else {
+        if(not boost::filesystem::exists(image_loader_args.fpga_path)) {
+            throw uhd::runtime_error(str(boost::format("The path \"%s\" does not exist.")
+                                         % image_loader_args.fpga_path));
+        }
+        else fpga_filename = image_loader_args.fpga_path;
+    }
+
+    load_fpga_image(fpga_filename);
+    return true;
+}
+
+UHD_STATIC_BLOCK(register_e300_image_loader) {
+    std::string recovery_instructions = "The default FPGA image will be loaded the next "
+                                        "time UHD uses this device.";
+
+    image_loader::register_image_loader("e3x0", e300_image_loader, recovery_instructions);
+}
+
 }
 
 }}}