Minimal framework in place to handle udp discovery.

Added usrp2 stuff, udp wrapper, discovery function.
Added app called discover usrps (usrp2 only for now).

3 files changed, 96 insertions, 0 deletions

diff --git a/apps/.gitignore b/apps/.gitignore
new file mode 100644
index 000000000..e24022663
--- /dev/null
+++ b/apps/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+discover_usrps
diff --git a/apps/Makefile.am b/apps/Makefile.am
new file mode 100644
index 000000000..c18b8c8f5
--- /dev/null
+++ b/apps/Makefile.am
@@ -0,0 +1,31 @@
+#
+# 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 $(top_srcdir)/Makefile.common
+
+SUBDIRS =
+
+AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
+
+LDADD = \
+	$(GENERAL_LDDFLAGS) \
+	$(USRP_UHD_LA)
+
+noinst_PROGRAMS = discover_usrps
+
+discover_usrps_SOURCES = discover_usrps.cpp
+
diff --git a/apps/discover_usrps.cpp b/apps/discover_usrps.cpp
new file mode 100644
index 000000000..a8d82e015
--- /dev/null
+++ b/apps/discover_usrps.cpp
@@ -0,0 +1,62 @@
+//
+// 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 <usrp_uhd.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+
+namespace po = boost::program_options;
+using namespace usrp_uhd;
+
+int main(int argc, char *argv[]){
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("ip-addr", po::value<std::string>(), "usrp2 ip address")
+    ;
+
+    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")) {
+        std::cout << boost::format("Discover USRPs %s") % desc << std::endl;
+        return ~0;
+    }
+
+    //extract the ip address (not optional for now)
+    usrp_uhd::device_addr_t device_addr(usrp_uhd::DEVICE_ADDR_TYPE_UDP);
+    if (vm.count("ip-addr")) {
+        device_addr.udp_args.addr = vm["ip-addr"].as<std::string>();
+    } else {
+        std::cout << "IP Addess was not set" << std::endl;
+        return ~0;
+    }
+
+    //discover the usrps
+    std::vector<usrp_uhd::device_addr_t> device_addrs = usrp_uhd::device::discover(device_addr);
+    for (size_t i = 0; i < device_addrs.size(); i++){
+        std::cout << "--------------------------------------------------" << std::endl;
+        std::cout << "-- USRP Device " << i << std::endl;
+        std::cout << "--------------------------------------------------" << std::endl;
+        std::cout << device_addrs[i] << std::endl << std::endl;
+    }
+
+    return 0;
+}