From e390bcd9a69e13add9ffe3da430ba8ce19e88819 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 1 Apr 2010 16:01:08 -0700
Subject: Use simple usrp from uhd.

---
 gr-uhd/lib/uhd_simple_sink.cc   | 2 +-
 gr-uhd/lib/uhd_simple_sink.h    | 4 ++--
 gr-uhd/lib/uhd_simple_source.cc | 2 +-
 gr-uhd/lib/uhd_simple_source.h  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gr-uhd/lib/uhd_simple_sink.cc b/gr-uhd/lib/uhd_simple_sink.cc
index a22b52421..107a4ef6c 100644
--- a/gr-uhd/lib/uhd_simple_sink.cc
+++ b/gr-uhd/lib/uhd_simple_sink.cc
@@ -49,7 +49,7 @@ uhd_simple_sink::uhd_simple_sink(
     gr_make_io_signature(1, 1, type.size),
     gr_make_io_signature(0, 0, 0)
 ), _type(type){
-    _dev = uhd::simple_device::make(args);
+    _dev = uhd::usrp::simple_usrp::make(args);
 }
 
 uhd_simple_sink::~uhd_simple_sink(void){
diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h
index aa8d1144c..735f72bdd 100644
--- a/gr-uhd/lib/uhd_simple_sink.h
+++ b/gr-uhd/lib/uhd_simple_sink.h
@@ -24,7 +24,7 @@
 #define INCLUDED_UHD_SIMPLE_SINK_H
 
 #include <gr_sync_block.h>
-#include <uhd/simple_device.hpp>
+#include <uhd/usrp/simple_usrp.hpp>
 
 class uhd_simple_sink;
 
@@ -48,7 +48,7 @@ public:
     );
 
 protected:
-    uhd::simple_device::sptr _dev;
+    uhd::usrp::simple_usrp::sptr _dev;
     const uhd::io_type_t _type;
 };
 
diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc
index 677099f11..4a40c2cfc 100644
--- a/gr-uhd/lib/uhd_simple_source.cc
+++ b/gr-uhd/lib/uhd_simple_source.cc
@@ -48,7 +48,7 @@ uhd_simple_source::uhd_simple_source(
     gr_make_io_signature(0, 0, 0),
     gr_make_io_signature(1, 1, type.size)
 ), _type(type){
-    _dev = uhd::simple_device::make(args);
+    _dev = uhd::usrp::simple_usrp::make(args);
 
     set_streaming(false);
 }
diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h
index 50b1c9518..c498c5715 100644
--- a/gr-uhd/lib/uhd_simple_source.h
+++ b/gr-uhd/lib/uhd_simple_source.h
@@ -24,7 +24,7 @@
 #define INCLUDED_UHD_SIMPLE_SOURCE_H
 
 #include <gr_sync_block.h>
-#include <uhd/simple_device.hpp>
+#include <uhd/usrp/simple_usrp.hpp>
 
 class uhd_simple_source;
 
@@ -48,7 +48,7 @@ public:
     );
 
 protected:
-    uhd::simple_device::sptr _dev;
+    uhd::usrp::simple_usrp::sptr _dev;
     const uhd::io_type_t _type;
     bool _is_streaming;
     void set_streaming(bool enb);
-- 
cgit