aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils/fx2_init_eeprom.cpp
diff options
context:
space:
mode:
authorBrent Stapleton <brent.stapleton@ettus.com>2019-01-14 10:35:25 -0800
committerBrent Stapleton <brent.stapleton@ettus.com>2019-01-16 11:40:23 -0800
commit967be2a4e82b1a125b26bb72a60318a4fb2b50c4 (patch)
tree8a24954b54d1546dc8049a17e485adb0a605f74f /host/utils/fx2_init_eeprom.cpp
parentaafe4e8b742a0e21d3818f21f34e3c8613132530 (diff)
downloaduhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.gz
uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.bz2
uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.zip
uhd: mpm: apply clang-format to all files
Applying formatting changes to all .cpp and .hpp files in the following directories: ``` find host/examples/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/tests/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/neon/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/magnesium/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/device3/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/mpmd/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/x300/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/utils/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find mpm/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Also formatted host/include/, except Cpp03 was used as a the language standard instead of Cpp11. ``` sed -i 's/ Cpp11/ Cpp03/g' .clang-format find host/include/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Formatting style was designated by the .clang-format file.
Diffstat (limited to 'host/utils/fx2_init_eeprom.cpp')
-rw-r--r--host/utils/fx2_init_eeprom.cpp136
1 files changed, 72 insertions, 64 deletions
diff --git a/host/utils/fx2_init_eeprom.cpp b/host/utils/fx2_init_eeprom.cpp
index 448652faf..e375b27f5 100644
--- a/host/utils/fx2_init_eeprom.cpp
+++ b/host/utils/fx2_init_eeprom.cpp
@@ -5,31 +5,32 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
-#include <uhd/utils/safe_main.hpp>
+#include "b100_eeprom.h"
+#include "usrp1_eeprom.h"
#include <uhd/device.hpp>
#include <uhd/property_tree.hpp>
-#include <boost/program_options.hpp>
-#include <boost/format.hpp>
-#include <boost/filesystem.hpp>
+#include <uhd/utils/safe_main.hpp>
#include <boost/algorithm/string/predicate.hpp>
-#include <iostream>
+#include <boost/filesystem.hpp>
+#include <boost/format.hpp>
+#include <boost/program_options.hpp>
#include <fstream>
-#include "usrp1_eeprom.h"
-#include "b100_eeprom.h"
+#include <iostream>
#ifdef UHD_PLATFORM_LINUX
-#include <unistd.h> // syscall constants
-#include <fcntl.h> // O_NONBLOCK
-#include <sys/syscall.h>
-#include <cerrno>
-#include <cstring> // for std::strerror
-#endif //UHD_PLATFORM_LINUX
+# include <fcntl.h> // O_NONBLOCK
+# include <sys/syscall.h>
+# include <unistd.h> // syscall constants
+# include <cerrno>
+# include <cstring> // for std::strerror
+#endif // UHD_PLATFORM_LINUX
const std::string FX2_VENDOR_ID("0x04b4");
const std::string FX2_PRODUCT_ID("0x8613");
namespace po = boost::program_options;
-int UHD_SAFE_MAIN(int argc, char *argv[]){
+int UHD_SAFE_MAIN(int argc, char* argv[])
+{
std::string type;
std::string image;
po::options_description desc("Allowed options");
@@ -47,97 +48,104 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
po::store(po::parse_command_line(argc, argv, desc), vm);
po::notify(vm);
- //print the help message
- if (vm.count("help")){
+ // print the help message
+ if (vm.count("help")) {
std::cout << boost::format("USRP EEPROM initialization %s") % desc << std::endl;
return EXIT_FAILURE;
}
#ifdef UHD_PLATFORM_LINUX
- //can't find an uninitialized usrp with this mystery usbtest in the way...
+ // can't find an uninitialized usrp with this mystery usbtest in the way...
std::string module("usbtest");
std::ifstream modules("/proc/modules");
bool module_found = false;
std::string module_line;
- while(std::getline(modules, module_line) && (!module_found)) {
+ while (std::getline(modules, module_line) && (!module_found)) {
module_found = boost::starts_with(module_line, module);
}
- if(module_found) {
- std::cout << boost::format("Found the '%s' module. Unloading it.\n" ) % module;
+ if (module_found) {
+ std::cout << boost::format("Found the '%s' module. Unloading it.\n") % module;
int fail = syscall(__NR_delete_module, module.c_str(), O_NONBLOCK);
- if(fail)
- std::cerr << ( boost::format("Removing the '%s' module failed with error '%s'.\n") % module % std::strerror(errno) );
+ if (fail)
+ std::cerr << (boost::format(
+ "Removing the '%s' module failed with error '%s'.\n")
+ % module % std::strerror(errno));
}
-#endif //UHD_PLATFORM_LINUX
+#endif // UHD_PLATFORM_LINUX
- //load the options into the address
+ // load the options into the address
uhd::device_addr_t device_addr;
device_addr["type"] = type;
- if(vm.count("vid") or vm.count("pid")) {
- if(not (vm.count("vid") and vm.count("pid") and vm.count("type"))) {
- std::cerr << "ERROR: Must specify vid, pid, and type if specifying any of the two former args" << std::endl;
+ if (vm.count("vid") or vm.count("pid")) {
+ if (not(vm.count("vid") and vm.count("pid") and vm.count("type"))) {
+ std::cerr << "ERROR: Must specify vid, pid, and type if specifying any of "
+ "the two former args"
+ << std::endl;
} else {
- device_addr["vid"] = vm["vid"].as<std::string>();
- device_addr["pid"] = vm["pid"].as<std::string>();
+ device_addr["vid"] = vm["vid"].as<std::string>();
+ device_addr["pid"] = vm["pid"].as<std::string>();
device_addr["type"] = vm["type"].as<std::string>();
}
} else {
device_addr["vid"] = FX2_VENDOR_ID;
device_addr["pid"] = FX2_PRODUCT_ID;
}
- if(vm.count("image")) {
- //if specified, use external image file
- image = vm["image"].as<std::string>();
+ if (vm.count("image")) {
+ // if specified, use external image file
+ image = vm["image"].as<std::string>();
} else {
- //if not specified, use built-ins; requires user to define type
- size_t image_len;
- unsigned const char* image_data;
+ // if not specified, use built-ins; requires user to define type
+ size_t image_len;
+ unsigned const char* image_data;
+
+ if (!vm.count("type")) {
+ std::cerr << boost::format("ERROR: Image file not specified and type of "
+ "device not given. Cannot use built-in images.\n");
+ return EXIT_FAILURE;
+ }
- if(!vm.count("type")) {
- std::cerr << boost::format("ERROR: Image file not specified and type of device not given. Cannot use built-in images.\n");
- return EXIT_FAILURE;
- }
-
- std::cout << boost::format("Using built-in image for \"%s\".\n") % type;
-
- if(vm["type"].as<std::string>() == "usrp1") {
- image_len = usrp1_eeprom_bin_len;
- image_data = usrp1_eeprom_bin;
- } else if(vm["type"].as<std::string>() == "b100") {
- image_len = b100_eeprom_bin_len;
- image_data = b100_eeprom_bin;
- } else {
- std::cerr << boost::format("ERROR: Unsupported device type \"%s\" specified and no EEPROM image file given.\n") % type;
- return EXIT_FAILURE;
- }
+ std::cout << boost::format("Using built-in image for \"%s\".\n") % type;
+
+ if (vm["type"].as<std::string>() == "usrp1") {
+ image_len = usrp1_eeprom_bin_len;
+ image_data = usrp1_eeprom_bin;
+ } else if (vm["type"].as<std::string>() == "b100") {
+ image_len = b100_eeprom_bin_len;
+ image_data = b100_eeprom_bin;
+ } else {
+ std::cerr << boost::format("ERROR: Unsupported device type \"%s\" specified "
+ "and no EEPROM image file given.\n")
+ % type;
+ return EXIT_FAILURE;
+ }
- //get temporary file name, and write image to that.
- image = boost::filesystem::unique_path().string();
- std::ofstream tmp_image(image, std::ofstream::binary);
- tmp_image.write((const char*)image_data, image_len);
- tmp_image.close();
+ // get temporary file name, and write image to that.
+ image = boost::filesystem::unique_path().string();
+ std::ofstream tmp_image(image, std::ofstream::binary);
+ tmp_image.write((const char*)image_data, image_len);
+ tmp_image.close();
}
- //find and create a control transport to do the writing.
+ // find and create a control transport to do the writing.
uhd::device_addrs_t found_addrs = uhd::device::find(device_addr, uhd::device::USRP);
- if (found_addrs.size() == 0){
+ if (found_addrs.size() == 0) {
std::cerr << "No USRP devices found" << std::endl;
return EXIT_FAILURE;
}
- for (size_t i = 0; i < found_addrs.size(); i++){
+ for (size_t i = 0; i < found_addrs.size(); i++) {
std::cout << "Writing EEPROM data..." << std::endl;
- //uhd::device_addrs_t devs = uhd::device::find(found_addrs[i]);
+ // uhd::device_addrs_t devs = uhd::device::find(found_addrs[i]);
uhd::device::sptr dev = uhd::device::make(found_addrs[i], uhd::device::USRP);
uhd::property_tree::sptr tree = dev->get_tree();
tree->access<std::string>("/mboards/0/load_eeprom").set(image);
}
- //delete temporary image file if we created one
- if(!vm.count("image")) {
- boost::filesystem::remove(image);
+ // delete temporary image file if we created one
+ if (!vm.count("image")) {
+ boost::filesystem::remove(image);
}
std::cout << "Power-cycle the usrp for the changes to take effect." << std::endl;