summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-07-02 09:32:00 -0700
committerJosh Blum <josh@joshknows.com>2011-07-02 09:32:00 -0700
commit4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c (patch)
treea4a88f09a864e97dadddbfd4231e52eee77c1f02 /host/lib/usrp/usrp2
parent0e3240ec5680fff7597d209b795dd0bc603f9919 (diff)
downloaduhd-4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c.tar.gz
uhd-4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c.tar.bz2
uhd-4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c.zip
usrp: renamed ref_source to clock_source (terminology)
Diffstat (limited to 'host/lib/usrp/usrp2')
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.cpp14
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.hpp2
2 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 129470b59..079506c70 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -493,10 +493,10 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){
_tree->create<std::vector<std::string> >(mb_path / "time_source/options")
.publish(boost::bind(&time64_core_200::get_time_sources, _mbc[mb].time64));
//setup reference source props
- _tree->create<std::string>(mb_path / "ref_source/value")
- .subscribe(boost::bind(&usrp2_impl::update_ref_source, this, mb, _1));
- static const std::vector<std::string> ref_sources = boost::assign::list_of("internal")("external")("mimo");
- _tree->create<std::vector<std::string> >(mb_path / "ref_source/options").set(ref_sources);
+ _tree->create<std::string>(mb_path / "clock_source/value")
+ .subscribe(boost::bind(&usrp2_impl::update_clock_source, this, mb, _1));
+ static const std::vector<std::string> clock_sources = boost::assign::list_of("internal")("external")("mimo");
+ _tree->create<std::vector<std::string> >(mb_path / "clock_source/options").set(clock_sources);
////////////////////////////////////////////////////////////////
// create dboard control objects
@@ -559,13 +559,13 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){
_tree->access<subdev_spec_t>(root / "rx_subdev_spec").set(subdev_spec_t("A:"+_mbc[mb].dboard_manager->get_rx_subdev_names()[0]));
_tree->access<subdev_spec_t>(root / "tx_subdev_spec").set(subdev_spec_t("A:"+_mbc[mb].dboard_manager->get_tx_subdev_names()[0]));
- _tree->access<std::string>(root / "ref_source/value").set("internal");
+ _tree->access<std::string>(root / "clock_source/value").set("internal");
_tree->access<std::string>(root / "time_source/value").set("none");
//GPS installed: use external ref, time, and init time spec
if (_mbc[mb].gps.get() != NULL){
_tree->access<std::string>(root / "time_source/value").set("external");
- _tree->access<std::string>(root / "ref_source/value").set("external");
+ _tree->access<std::string>(root / "clock_source/value").set("external");
_mbc[mb].time64->set_time_next_pps(time_spec_t(time_t(_mbc[mb].gps->get_sensor("gps_time").to_int()+1)));
}
}
@@ -624,7 +624,7 @@ meta_range_t usrp2_impl::get_tx_dsp_freq_range(const std::string &mb){
return meta_range_t(dsp_range.start() - tick_rate*2, dsp_range.stop() + tick_rate*2, dsp_range.step());
}
-void usrp2_impl::update_ref_source(const std::string &mb, const std::string &source){
+void usrp2_impl::update_clock_source(const std::string &mb, const std::string &source){
//clock source ref 10mhz
switch(_mbc[mb].iface->get_rev()){
case usrp2_iface::USRP_N200:
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index ad203079b..e0ff4b241 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -128,7 +128,7 @@ private:
void update_tx_subdev_spec(const std::string &, const uhd::usrp::subdev_spec_t &);
double set_tx_dsp_freq(const std::string &, const double);
uhd::meta_range_t get_tx_dsp_freq_range(const std::string &);
- void update_ref_source(const std::string &, const std::string &);
+ void update_clock_source(const std::string &, const std::string &);
};
#endif /* INCLUDED_USRP2_IMPL_HPP */