diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-14 14:05:19 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-14 14:05:19 -0500 |
| commit | 2f760ac0f883e1de9adca48449498deab72a9359 (patch) | |
| tree | ffe52eeabe9f265dd0471b20d670091091f8dcc8 /host/lib/usrp/b200 | |
| parent | 2f48c9bb979c8777cc8a3d3a0de03e9cf2958b14 (diff) | |
| parent | 19716045c60f00296f24e115580da154e5ddef8d (diff) | |
| download | uhd-2f760ac0f883e1de9adca48449498deab72a9359.tar.gz uhd-2f760ac0f883e1de9adca48449498deab72a9359.tar.bz2 uhd-2f760ac0f883e1de9adca48449498deab72a9359.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_io_impl.cpp
host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
host/lib/usrp/common/ad9361_driver/ad9361_device.h
Diffstat (limited to 'host/lib/usrp/b200')
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index e423285ce..d6df726af 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -175,7 +175,6 @@ void b200_impl::update_tick_rate(const double new_tick_rate) } } - double b200_impl::coerce_rx_samp_rate(rx_dsp_core_3000::sptr ddc, size_t dspno, const double rx_rate) { // Have to set tick rate first, or the ddc will change the requested rate based on default tick rate @@ -186,6 +185,14 @@ double b200_impl::coerce_rx_samp_rate(rx_dsp_core_3000::sptr ddc, size_t dspno, return ddc->set_host_rate(rx_rate); } +#define CHECK_BANDWIDTH(dir) \ + if (rate > _codec_ctrl->get_bw_filter_range(dir).stop()) { \ + UHD_MSG(warning) \ + << "Selected " << dir << " bandwidth (" << (rate/1e6) << " MHz) exceeds\n" \ + << "analog frontend filter bandwidth (" << (_codec_ctrl->get_bw_filter_range(dir).stop()/1e6) << " MHz)." \ + << std::endl; \ + } + void b200_impl::update_rx_samp_rate(const size_t dspno, const double rate) { boost::shared_ptr<sph::recv_packet_streamer> my_streamer = @@ -194,6 +201,7 @@ void b200_impl::update_rx_samp_rate(const size_t dspno, const double rate) my_streamer->set_samp_rate(rate); const double adj = _radio_perifs[dspno].ddc->get_scaling_adjustment(); my_streamer->set_scale_factor(adj); + CHECK_BANDWIDTH("Rx"); } double b200_impl::coerce_tx_samp_rate(tx_dsp_core_3000::sptr duc, size_t dspno, const double tx_rate) @@ -214,6 +222,7 @@ void b200_impl::update_tx_samp_rate(const size_t dspno, const double rate) my_streamer->set_samp_rate(rate); const double adj = _radio_perifs[dspno].duc->get_scaling_adjustment(); my_streamer->set_scale_factor(adj); + CHECK_BANDWIDTH("Tx"); } /*********************************************************************** |