diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-07-27 16:53:05 -0700 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-27 16:53:05 -0700 |
commit | 92e7a28de3f022f52da3fb9232a8287f6fa07d46 (patch) | |
tree | 02c37b732049e50872bd18b764dcfb8041e341e1 /host/lib/usrp/usrp2/dboard_impl.cpp | |
parent | aeedd5a53e017e2c14a86dff521353ff6016a849 (diff) | |
download | uhd-92e7a28de3f022f52da3fb9232a8287f6fa07d46.tar.gz uhd-92e7a28de3f022f52da3fb9232a8287f6fa07d46.tar.bz2 uhd-92e7a28de3f022f52da3fb9232a8287f6fa07d46.zip |
This is a manual merge of codec_gains2 into usrp2py.
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/dboard_impl.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp index 07e36a21b..3a2a53674 100644 --- a/host/lib/usrp/usrp2/dboard_impl.cpp +++ b/host/lib/usrp/usrp2/dboard_impl.cpp @@ -15,10 +15,10 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // - #include "usrp2_impl.hpp" #include "usrp2_regs.hpp" #include "../dsp_utils.hpp" +#include "../misc_utils.hpp" #include <uhd/usrp/subdev_props.hpp> #include <uhd/usrp/dboard_props.hpp> #include <uhd/utils/assert.hpp> @@ -92,6 +92,16 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){ val = _dboard_iface; return; + case DBOARD_PROP_CODEC: + val = _rx_codec_proxy->get_link(); + return; + + case DBOARD_PROP_GAIN_GROUP: + val = make_gain_group( + _dboard_manager->get_rx_subdev(name), _rx_codec_proxy->get_link() + ); + return; + default: UHD_THROW_PROP_GET_ERROR(); } } @@ -151,6 +161,16 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){ val = _dboard_iface; return; + case DBOARD_PROP_CODEC: + val = _tx_codec_proxy->get_link(); + return; + + case DBOARD_PROP_GAIN_GROUP: + val = make_gain_group( + _dboard_manager->get_tx_subdev(name), _tx_codec_proxy->get_link() + ); + return; + default: UHD_THROW_PROP_GET_ERROR(); } } |