From eb7e709b7aff162cc7c8f9b8004089846839ffbe Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 17 Feb 2010 00:41:38 -0800 Subject: moved host code into host directory for clean (unambiguous) top level --- apps/CMakeLists.txt | 22 ----------------- apps/discover_usrps.cpp | 65 ------------------------------------------------- 2 files changed, 87 deletions(-) delete mode 100644 apps/CMakeLists.txt delete mode 100644 apps/discover_usrps.cpp (limited to 'apps') diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt deleted file mode 100644 index f4428f958..000000000 --- a/apps/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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 . -# - -ADD_EXECUTABLE(discover_usrps discover_usrps.cpp) - -TARGET_LINK_LIBRARIES(discover_usrps uhd) - -INSTALL(TARGETS discover_usrps RUNTIME DESTINATION ${RUNTIME_DIR}) diff --git a/apps/discover_usrps.cpp b/apps/discover_usrps.cpp deleted file mode 100644 index 92c90f89a..000000000 --- a/apps/discover_usrps.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// 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 . -// - -#include -#include -#include -#include - -namespace po = boost::program_options; -using namespace uhd; - -int main(int argc, char *argv[]){ - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "help message") - ("ip-addr", po::value(), "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) - uhd::device_addr_t device_addr; - device_addr["type"] = "udp"; - if (vm.count("ip-addr")) { - device_addr["addr"] = vm["ip-addr"].as(); - } else { - std::cout << "IP Addess was not set" << std::endl; - return ~0; - } - - //discover the usrps - std::vector device_addrs = 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; - //make each device just to test (TODO: remove this) - device::make(device_addrs[i]); - } - - return 0; -} -- cgit v1.2.3