diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-07-09 16:56:34 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-07-29 16:50:34 -0700 |
commit | 9813505968e3c9beb1c8f16116cd8665524992b6 (patch) | |
tree | f9b66313c6a138dbabeb7f113e1e6ce802a1a22d /host/lib/usrp/e300/e300_io_impl.cpp | |
parent | e94223d4b5db34b407a72f9aed56fe3ef4eeec75 (diff) | |
download | uhd-9813505968e3c9beb1c8f16116cd8665524992b6.tar.gz uhd-9813505968e3c9beb1c8f16116cd8665524992b6.tar.bz2 uhd-9813505968e3c9beb1c8f16116cd8665524992b6.zip |
ad9361/b200/e300: Refactored AD936x + perifs management
- Created AD936x manager class
- Moved functionality from B2x0 and E310 into manager
- Separated property tree + perifs initialization in both device classes
Diffstat (limited to 'host/lib/usrp/e300/e300_io_impl.cpp')
-rw-r--r-- | host/lib/usrp/e300/e300_io_impl.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/host/lib/usrp/e300/e300_io_impl.cpp b/host/lib/usrp/e300/e300_io_impl.cpp index dadfb71e9..29d250c8f 100644 --- a/host/lib/usrp/e300/e300_io_impl.cpp +++ b/host/lib/usrp/e300/e300_io_impl.cpp @@ -91,21 +91,13 @@ void e300_impl::_update_tick_rate(const double 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 e300_impl::_update_rx_samp_rate(const size_t dspno, const double rate) { boost::shared_ptr<sph::recv_packet_streamer> my_streamer = boost::dynamic_pointer_cast<sph::recv_packet_streamer>(_radio_perifs[dspno].rx_streamer.lock()); if (my_streamer) my_streamer->set_samp_rate(rate); - CHECK_BANDWIDTH("Rx"); + _codec_mgr->check_bandwidth(rate, "Rx"); } void e300_impl::_update_tx_samp_rate(const size_t dspno, const double rate) @@ -114,7 +106,7 @@ void e300_impl::_update_tx_samp_rate(const size_t dspno, const double rate) boost::dynamic_pointer_cast<sph::send_packet_streamer>(_radio_perifs[dspno].tx_streamer.lock()); if (my_streamer) my_streamer->set_samp_rate(rate); - CHECK_BANDWIDTH("Tx"); + _codec_mgr->check_bandwidth(rate, "Tx"); } /*********************************************************************** |