made app to load usrp1e fpga images, and tested it to be working

3 files changed, 53 insertions, 4 deletions

diff --git a/host/apps/CMakeLists.txt b/host/apps/CMakeLists.txt
index f4428f958..a7068e5a4 100644
--- a/host/apps/CMakeLists.txt
+++ b/host/apps/CMakeLists.txt
@@ -16,7 +16,9 @@
 #
 
 ADD_EXECUTABLE(discover_usrps discover_usrps.cpp)
-
 TARGET_LINK_LIBRARIES(discover_usrps uhd)
 
+ADD_EXECUTABLE(usrp1e_load_fpga usrp1e_load_fpga.cpp)
+TARGET_LINK_LIBRARIES(usrp1e_load_fpga uhd)
+
 INSTALL(TARGETS discover_usrps RUNTIME DESTINATION ${RUNTIME_DIR})
diff --git a/host/apps/usrp1e_load_fpga.cpp b/host/apps/usrp1e_load_fpga.cpp
new file mode 100644
index 000000000..d5960b391
--- /dev/null
+++ b/host/apps/usrp1e_load_fpga.cpp
@@ -0,0 +1,47 @@
+//
+// Copyright 2010 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// 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/usrp/usrp1e.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+
+namespace po = boost::program_options;
+
+int main(int argc, char *argv[]){
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("file", po::value<std::string>(), "path to fpga bin file")
+    ;
+
+    po::variables_map vm;
+    po::store(po::parse_command_line(argc, argv, desc), vm);
+    po::notify(vm); 
+
+    //print the help message
+    if (vm.count("help") or vm.count("file") == 0){
+        std::cout << boost::format("USRP1E Load FPGA %s") % desc << std::endl;
+        return ~0;
+    }
+
+    //load the fpga
+    std::string file = vm["file"].as<std::string>();
+    uhd::usrp::usrp1e::load_fpga(file);
+
+    return 0;
+}
diff --git a/host/lib/usrp/usrp1e/fpga-downloader.cc b/host/lib/usrp/usrp1e/fpga-downloader.cc
index 15023d945..f7c78b875 100644
--- a/host/lib/usrp/usrp1e/fpga-downloader.cc
+++ b/host/lib/usrp/usrp1e/fpga-downloader.cc
@@ -43,7 +43,7 @@ const unsigned int PROG_B = 175;
 const unsigned int DONE   = 173;
 const unsigned int INIT_B = 114;
 
-static std::string bit_file = "safe_u1e.bin";
+//static std::string bit_file = "safe_u1e.bin";
 
 const int BUF_SIZE = 4096;
 
@@ -198,7 +198,7 @@ void spidev::send(char *buf, char *rbuf, unsigned int nbytes)
 
 }
 
-static void send_file_to_fpga(std::string &file_name, gpio &error, gpio &done)
+static void send_file_to_fpga(const std::string &file_name, gpio &error, gpio &done)
 {
 	std::ifstream bitstream;
 
@@ -258,5 +258,5 @@ void uhd::usrp::usrp1e::load_fpga(const std::string &bin_file){
 
 	std::cout << "Done = " << gpio_done.get_value() << std::endl;
 
-	send_file_to_fpga(bit_file, gpio_init_b, gpio_done);
+	send_file_to_fpga(bin_file, gpio_init_b, gpio_done);
 }