diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:58:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:58:21 -0700 |
| commit | 8d61a99ff722a707e2807b6a9a6ff84b30a09bf8 (patch) | |
| tree | 8ea8c1ff8eb9d6a3e970ae083abaa06e06210b13 /gr-uhd/lib/usrp_block_impl.h | |
| parent | 5c910950a0c872a52c8dc875b0c108c0f2609c30 (diff) | |
| parent | cc02c4b22a2e17eddfc05863a9f17fb9a5778361 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib/usrp_block_impl.h')
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h index cb07fb356d..a1bbf97826 100644 --- a/gr-uhd/lib/usrp_block_impl.h +++ b/gr-uhd/lib/usrp_block_impl.h @@ -40,6 +40,14 @@ namespace gr { namespace uhd { + static const size_t ALL_MBOARDS = ::uhd::usrp::multi_usrp::ALL_MBOARDS; + static const size_t ALL_CHANS = ::uhd::usrp::multi_usrp::ALL_CHANS; + static const std::string ALL_GAINS = ::uhd::usrp::multi_usrp::ALL_GAINS; +#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API + static const std::string ALL_LOS = ::uhd::usrp::multi_usrp::ALL_LOS; +#else + static const std::string ALL_LOS; +#endif class usrp_block_impl : virtual public usrp_block { public: |