diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:09:55 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:36:29 -0700 |
| commit | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (patch) | |
| tree | ac06cdb228d00e02fcab9a47852bfc57b5957d0c /gr-uhd/lib/usrp_block_impl.h | |
| parent | 8fe518ce740ae728f658c1854a7ffa074e800e9d (diff) | |
| parent | a0adcd3347c7ffd6ef3c42ce7705a23978774d3b (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/CMakeLists.txt
gr-uhd/lib/usrp_source_impl.cc
gr-uhd/lib/usrp_source_impl.h
Diffstat (limited to 'gr-uhd/lib/usrp_block_impl.h')
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h index 8285bda42c..b4618479e2 100644 --- a/gr-uhd/lib/usrp_block_impl.h +++ b/gr-uhd/lib/usrp_block_impl.h @@ -29,13 +29,6 @@ #include <boost/dynamic_bitset.hpp> #include <boost/bind.hpp> -#define SET_CENTER_FREQ_FROM_INTERNALS(usrp_class, tune_method) \ - ::uhd::tune_result_t \ - usrp_class::_set_center_freq_from_internals(size_t chan) \ - { \ - _chans_to_tune.reset(chan); \ - return _dev->tune_method(_curr_tune_req[chan], _stream_args.channels[chan]); \ - } namespace gr { namespace uhd { @@ -213,10 +206,10 @@ namespace gr { } //! Like set_center_freq(), but uses _curr_freq and _curr_lo_offset - virtual ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan) = 0; + virtual ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan, pmt::pmt_t direction) = 0; //! Calls _set_center_freq_from_internals() on all channels - void _set_center_freq_from_internals_allchans(); + void _set_center_freq_from_internals_allchans(pmt::pmt_t direction); /********************************************************************** * Members @@ -247,4 +240,3 @@ namespace gr { } /* namespace gr */ #endif /* INCLUDED_GR_UHD_BLOCK_IMPL_H */ - |