diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-15 23:21:43 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-15 23:21:43 -0700 |
commit | 963f60c69c25a1295b5ed4dee07df5d91567deb7 (patch) | |
tree | 0fa0d0e281a8cf17f3b222e1b2226fb45c16fa27 /host/lib/usrp/usrp2/dboard_impl.cpp | |
parent | e7d4233a94571a2479b21bc081567214c38cc155 (diff) | |
parent | f75869e4f7ffb53ca7f348c3a1b6d6c8fb1499b7 (diff) | |
download | uhd-963f60c69c25a1295b5ed4dee07df5d91567deb7.tar.gz uhd-963f60c69c25a1295b5ed4dee07df5d91567deb7.tar.bz2 uhd-963f60c69c25a1295b5ed4dee07df5d91567deb7.zip |
Merge branch 'next' into usrp1_next
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/dboard_impl.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp index bafeb3f15..a462b93c2 100644 --- a/host/lib/usrp/usrp2/dboard_impl.cpp +++ b/host/lib/usrp/usrp2/dboard_impl.cpp @@ -17,8 +17,8 @@ #include "usrp2_impl.hpp" #include "usrp2_regs.hpp" -#include "../dsp_utils.hpp" -#include "../misc_utils.hpp" +#include <uhd/usrp/misc_utils.hpp> +#include <uhd/usrp/dsp_utils.hpp> #include <uhd/usrp/subdev_props.hpp> #include <uhd/usrp/dboard_props.hpp> #include <uhd/utils/assert.hpp> @@ -89,7 +89,9 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){ case DBOARD_PROP_GAIN_GROUP: val = make_gain_group( - _dboard_manager->get_rx_subdev(key.name), _rx_codec_proxy->get_link() + _dboard_manager->get_rx_subdev(key.name), + _rx_codec_proxy->get_link(), + GAIN_GROUP_POLICY_RX ); return; @@ -143,7 +145,9 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){ case DBOARD_PROP_GAIN_GROUP: val = make_gain_group( - _dboard_manager->get_tx_subdev(key.name), _tx_codec_proxy->get_link() + _dboard_manager->get_tx_subdev(key.name), + _tx_codec_proxy->get_link(), + GAIN_GROUP_POLICY_TX ); return; |