From c5480830c6e8e8e862523b3ebf3117fda8a100df Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 9 Feb 2010 16:28:16 -0800
Subject: renamed usrp_uhd to uhd

---
 apps/Makefile.am        | 2 +-
 apps/discover_usrps.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'apps')

diff --git a/apps/Makefile.am b/apps/Makefile.am
index c18b8c8f5..67ab6b0ed 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
 
 LDADD = \
 	$(GENERAL_LDDFLAGS) \
-	$(USRP_UHD_LA)
+	$(UHD_LA)
 
 noinst_PROGRAMS = discover_usrps
 
diff --git a/apps/discover_usrps.cpp b/apps/discover_usrps.cpp
index a8d82e015..036d6378a 100644
--- a/apps/discover_usrps.cpp
+++ b/apps/discover_usrps.cpp
@@ -15,13 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd.hpp>
+#include <uhd.hpp>
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
 #include <iostream>
 
 namespace po = boost::program_options;
-using namespace usrp_uhd;
+using namespace uhd;
 
 int main(int argc, char *argv[]){
     po::options_description desc("Allowed options");
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]){
     }
 
     //extract the ip address (not optional for now)
-    usrp_uhd::device_addr_t device_addr(usrp_uhd::DEVICE_ADDR_TYPE_UDP);
+    uhd::device_addr_t device_addr(uhd::DEVICE_ADDR_TYPE_UDP);
     if (vm.count("ip-addr")) {
         device_addr.udp_args.addr = vm["ip-addr"].as<std::string>();
     } else {
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]){
     }
 
     //discover the usrps
-    std::vector<usrp_uhd::device_addr_t> device_addrs = usrp_uhd::device::discover(device_addr);
+    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;
-- 
cgit v1.2.3