diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-08-06 13:51:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-08-06 18:30:11 -0700 |
| commit | 3a7420fc4ffc246616e53259a3c8d718f9fa7c54 (patch) | |
| tree | 316bdade8f017e8a10f7d6cec6d0d7e45f00080f | |
| parent | c2cf9c30f6b5091ba6ab4c5cad26e2ef649595af (diff) | |
| download | uhd-3a7420fc4ffc246616e53259a3c8d718f9fa7c54.tar.gz uhd-3a7420fc4ffc246616e53259a3c8d718f9fa7c54.tar.bz2 uhd-3a7420fc4ffc246616e53259a3c8d718f9fa7c54.zip | |
e300: Made network mode not crash when attempting to user filter API
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_remote_codec_ctrl.cpp | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index 45c00ffbb..e3c2e19c1 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -1078,12 +1078,6 @@ void e300_impl::_setup_radio(const size_t dspno) .subscribe(boost::bind(&e300_impl::_update_fe_lo_freq, this, key, _1)) ; - // Network mode currently doesn't support the filter API, so - // prevent it from using it: - if (_xport_path != AXI) { - _tree->remove(rf_fe_path / "filters"); - } - // Antenna Setup if (dir == RX_DIRECTION) { static const std::vector<std::string> ants = boost::assign::list_of("TX/RX")("RX2"); diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp index 9708634dd..1e0895393 100644 --- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp +++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp @@ -227,7 +227,7 @@ public: //! List all available filters by name std::vector<std::string> get_filter_names(const std::string &) { - UHD_THROW_INVALID_CODE_PATH(); + return std::vector<std::string>(); } //! Return a list of all filters @@ -239,7 +239,7 @@ public: //! Write back a filter void set_filter(const std::string &, const std::string &, const filter_info_base::sptr) { - UHD_THROW_INVALID_CODE_PATH(); + UHD_MSG(warning) << "Attempting to set filter on E300 in network mode." << std::endl; } private: |