diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-02 09:32:00 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-02 09:32:00 -0700 |
| commit | 4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c (patch) | |
| tree | a4a88f09a864e97dadddbfd4231e52eee77c1f02 /host/lib/usrp/b100 | |
| parent | 0e3240ec5680fff7597d209b795dd0bc603f9919 (diff) | |
| download | uhd-4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c.tar.gz uhd-4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c.tar.bz2 uhd-4bcab9c56aad7e08bd392b82cc52ae2f4f5a830c.zip | |
usrp: renamed ref_source to clock_source (terminology)
Diffstat (limited to 'host/lib/usrp/b100')
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.cpp | 12 | ||||
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.hpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index 93e26f047..5410f57e5 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -328,10 +328,10 @@ b100_impl::b100_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, _time64)); //setup reference source props - _tree->create<std::string>(mb_path / "ref_source/value") - .subscribe(boost::bind(&b100_impl::update_ref_source, this, _1)); - static const std::vector<std::string> ref_sources = boost::assign::list_of("internal")("external")("auto"); - _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(&b100_impl::update_clock_source, this, _1)); + static const std::vector<std::string> clock_sources = boost::assign::list_of("internal")("external")("auto"); + _tree->create<std::vector<std::string> >(mb_path / "clock_source/options").set(clock_sources); //////////////////////////////////////////////////////////////////// // create dboard control objects @@ -394,7 +394,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ _tree->access<subdev_spec_t>(mb_path / "rx_subdev_spec").set(subdev_spec_t("A:"+_dboard_manager->get_rx_subdev_names()[0])); _tree->access<subdev_spec_t>(mb_path / "tx_subdev_spec").set(subdev_spec_t("A:"+_dboard_manager->get_tx_subdev_names()[0])); - _tree->access<std::string>(mb_path / "ref_source/value").set("internal"); + _tree->access<std::string>(mb_path / "clock_source/value").set("internal"); _tree->access<std::string>(mb_path / "time_source/value").set("none"); } @@ -444,7 +444,7 @@ void b100_impl::set_db_eeprom(const std::string &type, const uhd::usrp::dboard_e if (type == "gdb") db_eeprom.store(*_fpga_i2c_ctrl, I2C_ADDR_TX_A ^ 5); } -void b100_impl::update_ref_source(const std::string &source){ +void b100_impl::update_clock_source(const std::string &source){ if (source == "auto") _clock_ctrl->use_auto_ref(); else if (source == "internal") _clock_ctrl->use_internal_ref(); else if (source == "external") _clock_ctrl->use_external_ref(); diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp index 904c846e0..115fba985 100644 --- a/host/lib/usrp/b100/b100_impl.hpp +++ b/host/lib/usrp/b100/b100_impl.hpp @@ -123,7 +123,7 @@ private: void update_tx_samp_rate(const double rate); void update_rx_subdev_spec(const uhd::usrp::subdev_spec_t &); void update_tx_subdev_spec(const uhd::usrp::subdev_spec_t &); - void update_ref_source(const std::string &); + void update_clock_source(const std::string &); void reset_gpif(const boost::uint16_t); void enable_gpif(const bool); void clear_fpga_fifo(void); |