diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-06-09 16:17:53 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-06-09 16:17:53 -0700 |
| commit | 533548a681f0045f1194c4b47f857fa16314784d (patch) | |
| tree | d5dbc598b17605d5c4be85fad08f1c766025bb6c /host/lib/usrp/e300/e300_remote_codec_ctrl.hpp | |
| parent | 13f9f07c42c4928ef3adcb1bbee3343198c9ecae (diff) | |
| parent | 4d0dadb3cc0106c9026bc41d7d74d55918d13b43 (diff) | |
| download | uhd-533548a681f0045f1194c4b47f857fa16314784d.tar.gz uhd-533548a681f0045f1194c4b47f857fa16314784d.tar.bz2 uhd-533548a681f0045f1194c4b47f857fa16314784d.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/common/ad9361_ctrl.hpp
host/lib/usrp/common/ad9361_driver/ad9361_device.h
host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
Diffstat (limited to 'host/lib/usrp/e300/e300_remote_codec_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_remote_codec_ctrl.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp index 065c5e7a0..43723e0d5 100644 --- a/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp +++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp @@ -56,7 +56,7 @@ public: static const boost::uint32_t ACTION_SET_AGC = 19; static const boost::uint32_t ACTION_SET_AGC_MODE = 20; static const boost::uint32_t ACTION_SET_BW = 21; - + static const boost::uint32_t ACTION_GET_FREQ = 22; //Values for "which" static const boost::uint32_t CHAIN_NONE = 0; |