utils: uhd_find_devices display one device for each unique serial found

Note: This also is the first precedent for the usage of the 'auto' keyword in UHD.
Commits past this one will also be able to use 'auto'.

Reviewed-By: Martin Braun <martin.braun@ettus.com>

1 files changed, 44 insertions, 6 deletions

diff --git a/host/utils/uhd_find_devices.cpp b/host/utils/uhd_find_devices.cpp
index c258c580e..0ef1055cf 100644
--- a/host/utils/uhd_find_devices.cpp
+++ b/host/utils/uhd_find_devices.cpp
@@ -17,11 +17,11 @@
 
 #include <uhd/utils/safe_main.hpp>
 #include <uhd/device.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
 #include <iostream>
 #include <cstdlib>
-
 namespace po = boost::program_options;
 
 int UHD_SAFE_MAIN(int argc, char *argv[]){
@@ -49,12 +49,50 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         return EXIT_FAILURE;
     }
 
-    for (size_t i = 0; i < device_addrs.size(); i++){
-        std::cout << "--------------------------------------------------" << std::endl;
+    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"];
+        found_devices[serial] = device_multi_addrs_t();
+        BOOST_FOREACH (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) {
+                BOOST_FOREACH (std::string key, sit->keys()) {
+                    if (key != "serial") {
+                        found_devices[serial][key].insert(sit->get(key));
+                    }
+                }
+                sit = device_addrs.erase(sit);
+            } else {
+                sit++;
+            }
+        }
+    }
+
+    int i = 0;
+    for (auto dit = found_devices.begin(); dit != found_devices.end(); ++dit) {
+        std::cout << "--------------------------------------------------"
+                  << std::endl;
         std::cout << "-- UHD Device " << i << std::endl;
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << device_addrs[i].to_pp_string() << std::endl << std::endl;
-        //uhd::device::make(device_addrs[i]); //test make
+        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;
+            }
+        }
+        std::cout << ss.str() << std::endl << std::endl;
+        i++;
     }
 
     return EXIT_SUCCESS;