summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-10-11 19:54:11 -0700
committerJosh Blum <josh@joshknows.com>2010-10-11 19:54:11 -0700
commit80469eedb76994b39a40ff94e31c4de924fc33e2 (patch)
tree891f33b987d28ce7c937f8efad599a9d83721518
parent02b25d347e9b4cf23be2b84fb43db01471ad6ec3 (diff)
parent3b36c206e56b415974ed83a52a652b65f9de1add (diff)
downloaduhd-80469eedb76994b39a40ff94e31c4de924fc33e2.tar.gz
uhd-80469eedb76994b39a40ff94e31c4de924fc33e2.tar.bz2
uhd-80469eedb76994b39a40ff94e31c4de924fc33e2.zip
Merge branch 'set_bandwidth'
-rw-r--r--host/include/uhd/usrp/mimo_usrp.hpp2
-rw-r--r--host/include/uhd/usrp/simple_usrp.hpp2
-rw-r--r--host/include/uhd/usrp/single_usrp.hpp2
-rw-r--r--host/lib/usrp/mimo_usrp.cpp4
-rw-r--r--host/lib/usrp/simple_usrp.cpp4
-rw-r--r--host/lib/usrp/single_usrp.cpp4
6 files changed, 18 insertions, 0 deletions
diff --git a/host/include/uhd/usrp/mimo_usrp.hpp b/host/include/uhd/usrp/mimo_usrp.hpp
index 10a404059..bdd84a148 100644
--- a/host/include/uhd/usrp/mimo_usrp.hpp
+++ b/host/include/uhd/usrp/mimo_usrp.hpp
@@ -148,6 +148,8 @@ public:
* \return the rssi in dB
*/
virtual float read_rssi(size_t chan) = 0;
+
+ virtual void set_rx_bandwidth(size_t chan, float bandwidth) = 0;
/*******************************************************************
* TX methods
diff --git a/host/include/uhd/usrp/simple_usrp.hpp b/host/include/uhd/usrp/simple_usrp.hpp
index 6149f739c..6f3597ed7 100644
--- a/host/include/uhd/usrp/simple_usrp.hpp
+++ b/host/include/uhd/usrp/simple_usrp.hpp
@@ -139,6 +139,8 @@ public:
virtual float read_rssi(void) = 0;
virtual dboard_iface::sptr get_rx_dboard_iface(void) = 0;
+
+ virtual void set_rx_bandwidth(float) = 0;
/*******************************************************************
* TX methods
diff --git a/host/include/uhd/usrp/single_usrp.hpp b/host/include/uhd/usrp/single_usrp.hpp
index 3cd263bce..fa6498d13 100644
--- a/host/include/uhd/usrp/single_usrp.hpp
+++ b/host/include/uhd/usrp/single_usrp.hpp
@@ -152,6 +152,8 @@ public:
virtual float read_rssi(size_t chan = 0) = 0;
virtual dboard_iface::sptr get_rx_dboard_iface(size_t chan = 0) = 0;
+
+ virtual void set_rx_bandwidth(float bandwidth, size_t chan = 0) = 0;
/*******************************************************************
* TX methods
diff --git a/host/lib/usrp/mimo_usrp.cpp b/host/lib/usrp/mimo_usrp.cpp
index 9331c7fbb..08618c288 100644
--- a/host/lib/usrp/mimo_usrp.cpp
+++ b/host/lib/usrp/mimo_usrp.cpp
@@ -225,6 +225,10 @@ public:
float read_rssi(size_t chan){
return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<float>();
}
+
+ void set_rx_bandwidth(size_t chan, float bandwidth){
+ _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+ }
/*******************************************************************
* TX methods
diff --git a/host/lib/usrp/simple_usrp.cpp b/host/lib/usrp/simple_usrp.cpp
index b89b76eed..b4f34287b 100644
--- a/host/lib/usrp/simple_usrp.cpp
+++ b/host/lib/usrp/simple_usrp.cpp
@@ -136,6 +136,10 @@ public:
dboard_iface::sptr get_rx_dboard_iface(void){
return _sdev->get_rx_dboard_iface();
}
+
+ void set_rx_bandwidth(float bandwidth) {
+ return _sdev->set_rx_bandwidth(bandwidth);
+ }
/*******************************************************************
* TX methods
diff --git a/host/lib/usrp/single_usrp.cpp b/host/lib/usrp/single_usrp.cpp
index 08dc3bb1d..7d053535e 100644
--- a/host/lib/usrp/single_usrp.cpp
+++ b/host/lib/usrp/single_usrp.cpp
@@ -202,6 +202,10 @@ public:
dboard_iface::sptr get_rx_dboard_iface(size_t chan){
return _rx_dboard(chan)[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
}
+
+ void set_rx_bandwidth(float bandwidth, size_t chan) {
+ _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+ }
/*******************************************************************
* TX methods