diff options
| author | Nicholas Corgan <n.corgan@gmail.com> | 2021-07-08 21:08:37 -0500 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-07-13 09:04:16 -0400 |
| commit | 188bf4d1ff87146bd8f24fa055fc531479705448 (patch) | |
| tree | 8d187676e9cbaf20796201413deb700c313473ca /gr-uhd/lib/usrp_block_impl.cc | |
| parent | a65cdb644622f738dcbb84f90274dfe5e00ced99 (diff) | |
usrp_block: fix using 0 as pmt::dict_ref "not_found" parameter
Before, a zero literal was being passed in for a pmt::pmt_t parameter.
This resulted in an implicit cast to a null shared_ptr, rather than
a PMT respresenting zero as intended.
Signed-off-by: Nicholas Corgan <n.corgan@gmail.com>
Diffstat (limited to 'gr-uhd/lib/usrp_block_impl.cc')
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc index 1f13591e2d..b24b1c817a 100644 --- a/gr-uhd/lib/usrp_block_impl.cc +++ b/gr-uhd/lib/usrp_block_impl.cc @@ -728,8 +728,9 @@ void usrp_block_impl::_cmd_handler_gpio(const pmt::pmt_t& gpio_attr, pmt::symbol_to_string(pmt::dict_ref(gpio_attr, pmt::mp("bank"), pmt::mp(""))); std::string attr = pmt::symbol_to_string(pmt::dict_ref(gpio_attr, pmt::mp("attr"), pmt::mp(""))); - uint32_t value = pmt::to_double(pmt::dict_ref(gpio_attr, pmt::mp("value"), 0)); - uint32_t mask = pmt::to_double(pmt::dict_ref(gpio_attr, pmt::mp("mask"), 0)); + uint32_t value = + pmt::to_double(pmt::dict_ref(gpio_attr, pmt::mp("value"), pmt::mp(0))); + uint32_t mask = pmt::to_double(pmt::dict_ref(gpio_attr, pmt::mp("mask"), pmt::mp(0))); set_gpio_attr(bank, attr, value, mask, mboard); } @@ -775,15 +776,15 @@ void usrp_block_impl::_cmd_handler_mtune(const pmt::pmt_t& tune, ::uhd::tune_request_t new_tune_request; if (pmt::dict_has_key(tune, pmt::mp("dsp_freq"))) { new_tune_request.dsp_freq = - pmt::to_double(pmt::dict_ref(tune, pmt::mp("dsp_freq"), 0)); + pmt::to_double(pmt::dict_ref(tune, pmt::mp("dsp_freq"), pmt::mp(0))); } if (pmt::dict_has_key(tune, pmt::mp("rf_freq"))) { new_tune_request.rf_freq = - pmt::to_double(pmt::dict_ref(tune, pmt::mp("rf_freq"), 0)); + pmt::to_double(pmt::dict_ref(tune, pmt::mp("rf_freq"), pmt::mp(0))); } if (pmt::dict_has_key(tune, pmt::mp("target_freq"))) { new_tune_request.target_freq = - pmt::to_double(pmt::dict_ref(tune, pmt::mp("target_freq"), 0)); + pmt::to_double(pmt::dict_ref(tune, pmt::mp("target_freq"), pmt::mp(0))); } if (pmt::dict_has_key(tune, pmt::mp("dsp_freq_policy"))) { std::string policy = pmt::symbol_to_string( |