aboutsummaryrefslogtreecommitdiffstats
path: root/host/apps
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-02-25 18:32:32 -0800
committerJosh Blum <josh@joshknows.com>2010-02-25 18:32:32 -0800
commit5715b2c4937ca094ca8f1d9d9b55c4edcc959981 (patch)
tree5584017d251a4103a6ebb3d0b504039728d4ddf3 /host/apps
parent3571f65a1184dd65be39bc19708cc316fd017497 (diff)
downloaduhd-5715b2c4937ca094ca8f1d9d9b55c4edcc959981.tar.gz
uhd-5715b2c4937ca094ca8f1d9d9b55c4edcc959981.tar.bz2
uhd-5715b2c4937ca094ca8f1d9d9b55c4edcc959981.zip
Created empty usrp1e cpp file for the case when headers are not found.
Worked on the device make and discovery to fix certain problems. Added node param to discover usrps for usrp1e, made addr optional.
Diffstat (limited to 'host/apps')
-rw-r--r--host/apps/discover_usrps.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/host/apps/discover_usrps.cpp b/host/apps/discover_usrps.cpp
index 08135a27c..7e8c21673 100644
--- a/host/apps/discover_usrps.cpp
+++ b/host/apps/discover_usrps.cpp
@@ -28,6 +28,7 @@ int main(int argc, char *argv[]){
desc.add_options()
("help", "help message")
("addr", po::value<std::string>(), "resolvable network address")
+ ("node", po::value<std::string>(), "path to linux device node")
;
po::variables_map vm;
@@ -35,22 +36,28 @@ int main(int argc, char *argv[]){
po::notify(vm);
//print the help message
- if (vm.count("help")) {
+ if (vm.count("help")){
std::cout << boost::format("Discover USRPs %s") % desc << std::endl;
return ~0;
}
- //extract the address (not optional for now)
+ //load the options into the address
uhd::device_addr_t device_addr;
- if (vm.count("addr")) {
+ if (vm.count("addr")){
device_addr["addr"] = vm["addr"].as<std::string>();
- } else {
- std::cout << "The address was not set" << std::endl;
+ }
+ if (vm.count("node")){
+ device_addr["node"] = vm["node"].as<std::string>();
+ }
+
+ //discover the usrps and print the results
+ uhd::device_addrs_t device_addrs = uhd::device::discover(device_addr);
+
+ if (device_addrs.size() == 0){
+ std::cerr << "No USRP Devices Found" << std::endl;
return ~0;
}
- //discover the usrps
- std::vector<uhd::device_addr_t> 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;