diff options
| author | Josh Blum <josh@joshknows.com> | 2012-05-14 11:52:29 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-05-14 11:52:29 -0700 |
| commit | db6ba7d474d248c753ceee47f33db51504a8fd74 (patch) | |
| tree | 5b8d5e287d5b99a18ccc712d591682ad3185a415 | |
| parent | 2d5d41f2135d84e3c57a5636d79a8079f9f1bf48 (diff) | |
| parent | d8d749422b26f5a8161306fe74dbd37b0c560f97 (diff) | |
| download | uhd-db6ba7d474d248c753ceee47f33db51504a8fd74.tar.gz uhd-db6ba7d474d248c753ceee47f33db51504a8fd74.tar.bz2 uhd-db6ba7d474d248c753ceee47f33db51504a8fd74.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 33b40dd2f..dfac8e1d7 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -279,8 +279,10 @@ usrp1_impl::usrp1_impl(const device_addr_t &device_addr){ // create frontend control objects //////////////////////////////////////////////////////////////////// _tree->create<subdev_spec_t>(mb_path / "rx_subdev_spec") + .set(subdev_spec_t()) .subscribe(boost::bind(&usrp1_impl::update_rx_subdev_spec, this, _1)); _tree->create<subdev_spec_t>(mb_path / "tx_subdev_spec") + .set(subdev_spec_t()) .subscribe(boost::bind(&usrp1_impl::update_tx_subdev_spec, this, _1)); BOOST_FOREACH(const std::string &db, _dbc.keys()){ diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp index 769795aad..0ae3b0bd8 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.cpp +++ b/host/lib/usrp/usrp2/clock_ctrl.cpp @@ -204,7 +204,7 @@ public: break; default: - throw uhd::not_implemented_error("enable_tx_dboard_clock: unknown hardware version"); + //throw uhd::not_implemented_error("enable_tx_dboard_clock: unknown hardware version"); break; } |