summaryrefslogtreecommitdiff
path: root/gr-uhd/lib
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2016-04-27 07:25:30 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2016-04-27 07:25:30 -0700
commitd241c13acb5d53f60e4f39b2b99aae83a53afaab (patch)
tree30ab73ae70bf65e5a696881a5b2c7be8b5ecbb87 /gr-uhd/lib
parentefbb415e5abeefe0cedf36f44e13362514fd4521 (diff)
parent26de50e62da7116754c0175c32c4179de2d13672 (diff)
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
-rw-r--r--gr-uhd/lib/usrp_block_impl.h5
-rw-r--r--gr-uhd/lib/usrp_sink_impl.cc2
-rw-r--r--gr-uhd/lib/usrp_source_impl.cc98
-rw-r--r--gr-uhd/lib/usrp_source_impl.h9
4 files changed, 2 insertions, 112 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h
index 37c1de1e56..cb07fb356d 100644
--- a/gr-uhd/lib/usrp_block_impl.h
+++ b/gr-uhd/lib/usrp_block_impl.h
@@ -40,11 +40,6 @@
namespace gr {
namespace uhd {
- static const size_t ALL_MBOARDS = ::uhd::usrp::multi_usrp::ALL_MBOARDS;
- static const size_t ALL_CHANS = ::uhd::usrp::multi_usrp::ALL_CHANS;
- static const std::string ALL_GAINS = ::uhd::usrp::multi_usrp::ALL_GAINS;
- static const std::string ALL_LOS = ::uhd::usrp::multi_usrp::ALL_LOS;
-
class usrp_block_impl : virtual public usrp_block
{
public:
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc
index d8f98fdd80..e2e4d334b6 100644
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@ -29,6 +29,8 @@
namespace gr {
namespace uhd {
+ static const size_t ALL_CHANS = ::uhd::usrp::multi_usrp::ALL_CHANS;
+
usrp_sink::sptr
usrp_sink::make(const ::uhd::device_addr_t &device_addr,
const ::uhd::io_type_t &io_type,
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
index 33b96f8a02..7ce8633597 100644
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@ -278,104 +278,6 @@ namespace gr {
return _dev->get_rx_bandwidth_range(chan);
}
- std::vector<std::string>
- usrp_source_impl::get_lo_names(size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->get_rx_lo_names(chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- const std::string
- usrp_source_impl::get_lo_source(const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->get_rx_lo_source(name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- std::vector<std::string>
- usrp_source_impl::get_lo_sources(const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->get_rx_lo_sources(name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- void
- usrp_source_impl::set_lo_source(const std::string &src, const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->set_rx_lo_source(src, name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- bool
- usrp_source_impl::get_lo_export_enabled(const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->get_rx_lo_export_enabled(name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- void
- usrp_source_impl::set_lo_export_enabled(bool enabled, const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->set_rx_lo_export_enabled(enabled, name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- ::uhd::freq_range_t
- usrp_source_impl::get_lo_freq_range(const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->get_rx_lo_freq_range(name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- double
- usrp_source_impl::get_lo_freq(const std::string &name, size_t chan)
- {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->get_rx_lo_freq(name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
- double
- usrp_source_impl::set_lo_freq(double freq, const std::string &name, size_t chan) {
-#ifdef UHD_USRP_MULTI_USRP_LO_CONFIG_API
- chan = _stream_args.channels[chan];
- return _dev->set_rx_lo_freq(freq, name, chan);
-#else
- throw std::runtime_error("not implemented in this version");
-#endif
- }
-
void
usrp_source_impl::set_auto_dc_offset(const bool enable, size_t chan)
{
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h
index 8f03101965..b43df4dab3 100644
--- a/gr-uhd/lib/usrp_source_impl.h
+++ b/gr-uhd/lib/usrp_source_impl.h
@@ -77,12 +77,6 @@ namespace gr {
::uhd::sensor_value_t get_sensor(const std::string &name, size_t chan);
std::vector<std::string> get_sensor_names(size_t chan);
::uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan);
- std::vector<std::string> get_lo_names(size_t chan);
- const std::string get_lo_source(const std::string &name, size_t chan);
- std::vector<std::string> get_lo_sources(const std::string &name, size_t chan);
- bool get_lo_export_enabled(const std::string &name, size_t chan);
- double get_lo_freq(const std::string &name, size_t chan);
- ::uhd::freq_range_t get_lo_freq_range(const std::string &name, size_t chan);
// Set Commands
void set_subdev_spec(const std::string &spec, size_t mboard);
@@ -102,9 +96,6 @@ namespace gr {
void set_iq_balance(const std::complex<double> &correction, size_t chan);
void set_stream_args(const ::uhd::stream_args_t &stream_args);
void set_start_time(const ::uhd::time_spec_t &time);
- void set_lo_source(const std::string &src, const std::string &name = ALL_LOS, size_t chan = 0);
- void set_lo_export_enabled(bool enabled, const std::string &name = ALL_LOS, size_t chan = 0);
- double set_lo_freq(double freq, const std::string &name, size_t chan);
void issue_stream_cmd(const ::uhd::stream_cmd_t &cmd);
void flush(void);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 20:05:51 +0000