aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils/uhd_find_devices.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/uhd_find_devices.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/uhd_find_devices.cpp')
-rw-r--r--host/utils/uhd_find_devices.cpp56
1 files changed, 26 insertions, 30 deletions
diff --git a/host/utils/uhd_find_devices.cpp b/host/utils/uhd_find_devices.cpp
index 504fafcf7..ad30b168c 100644
--- a/host/utils/uhd_find_devices.cpp
+++ b/host/utils/uhd_find_devices.cpp
@@ -5,29 +5,30 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
-#include <uhd/utils/safe_main.hpp>
#include <uhd/device.hpp>
-#include <boost/program_options.hpp>
+#include <uhd/utils/safe_main.hpp>
#include <boost/format.hpp>
-#include <iostream>
+#include <boost/program_options.hpp>
#include <cstdlib>
+#include <iostream>
namespace {
- //! Conditionally append find_all=1 if the key isn't there yet
- uhd::device_addr_t append_findall(const uhd::device_addr_t& device_args)
- {
- uhd::device_addr_t new_device_args(device_args);
- if (!new_device_args.has_key("find_all")) {
- new_device_args["find_all"] = "1";
- }
-
- return new_device_args;
+//! Conditionally append find_all=1 if the key isn't there yet
+uhd::device_addr_t append_findall(const uhd::device_addr_t& device_args)
+{
+ uhd::device_addr_t new_device_args(device_args);
+ if (!new_device_args.has_key("find_all")) {
+ new_device_args["find_all"] = "1";
}
+
+ return new_device_args;
}
+} // namespace
namespace po = boost::program_options;
-int UHD_SAFE_MAIN(int argc, char *argv[]){
+int UHD_SAFE_MAIN(int argc, char* argv[])
+{
po::options_description desc("Allowed options");
// clang-format off
desc.add_options()
@@ -40,35 +41,34 @@ 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("UHD Find Devices %s") % desc << std::endl;
return EXIT_SUCCESS;
}
- //discover the usrps and print the results
+ // discover the usrps and print the results
const uhd::device_addr_t args(vm["args"].as<std::string>());
- uhd::device_addrs_t device_addrs =
- uhd::device::find(append_findall(args));
+ uhd::device_addrs_t device_addrs = uhd::device::find(append_findall(args));
if (device_addrs.empty()) {
std::cerr << "No UHD Devices Found" << std::endl;
return EXIT_FAILURE;
}
- typedef std::map<std::string, std::set<std::string> > device_multi_addrs_t;
+ typedef std::map<std::string, std::set<std::string>> device_multi_addrs_t;
typedef std::map<std::string, device_multi_addrs_t> device_addrs_filtered_t;
device_addrs_filtered_t found_devices;
for (auto it = device_addrs.begin(); it != device_addrs.end(); ++it) {
- std::string serial = (*it)["serial"];
+ std::string serial = (*it)["serial"];
found_devices[serial] = device_multi_addrs_t();
- for(std::string key: it->keys()) {
+ for (std::string key : it->keys()) {
if (key != "serial") {
found_devices[serial][key].insert(it->get(key));
}
}
for (auto sit = it + 1; sit != device_addrs.end();) {
if ((*sit)["serial"] == serial) {
- for(std::string key: sit->keys()) {
+ for (std::string key : sit->keys()) {
if (key != "serial") {
found_devices[serial][key].insert(sit->get(key));
}
@@ -82,19 +82,15 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
int i = 0;
for (auto dit = found_devices.begin(); dit != found_devices.end(); ++dit) {
- std::cout << "--------------------------------------------------"
- << std::endl;
+ std::cout << "--------------------------------------------------" << std::endl;
std::cout << "-- UHD Device " << i << std::endl;
- std::cout << "--------------------------------------------------"
- << std::endl;
+ std::cout << "--------------------------------------------------" << std::endl;
std::stringstream ss;
ss << "Device Address:" << std::endl;
ss << boost::format(" serial: %s") % dit->first << std::endl;
for (auto mit = dit->second.begin(); mit != dit->second.end(); ++mit) {
- for (auto vit = mit->second.begin(); vit != mit->second.end();
- ++vit) {
- ss << boost::format(" %s: %s") % mit->first % *vit
- << std::endl;
+ for (auto vit = mit->second.begin(); vit != mit->second.end(); ++vit) {
+ ss << boost::format(" %s: %s") % mit->first % *vit << std::endl;
}
}
std::cout << ss.str() << std::endl << std::endl;