diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-22 01:19:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-22 13:59:47 -0700 |
| commit | da40a1aebc16ca05219883c18b2cf96989c470fd (patch) | |
| tree | 24d3c902b2d5795755be3171388fef81a0da3a7a /host/lib/usrp/b100 | |
| parent | 833b5369378d5788dd430451803bf36a96dc3901 (diff) | |
| download | uhd-da40a1aebc16ca05219883c18b2cf96989c470fd.tar.gz uhd-da40a1aebc16ca05219883c18b2cf96989c470fd.tar.bz2 uhd-da40a1aebc16ca05219883c18b2cf96989c470fd.zip | |
uhd: replaced boost filesystem path with fs_path in property tree
Diffstat (limited to 'host/lib/usrp/b100')
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/b100/io_impl.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index 2e2421ed3..ea9c91c50 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -209,7 +209,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ //////////////////////////////////////////////////////////////////// _tree = property_tree::make(); _tree->create<std::string>("/name").set("B-Series Device"); - const property_tree::path_type mb_path = "/mboards/0"; + const fs_path mb_path = "/mboards/0"; _tree->create<std::string>(mb_path / "name").set("B100 (B-Hundo)"); _tree->create<std::string>(mb_path / "load_eeprom") .subscribe(boost::bind(&fx2_ctrl::usrp_load_eeprom, _fx2_ctrl, _1)); @@ -234,8 +234,8 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ // create codec control objects //////////////////////////////////////////////////////////////////// _codec_ctrl = b100_codec_ctrl::make(_fpga_spi_ctrl); - const property_tree::path_type rx_codec_path = mb_path / "rx_codecs/A"; - const property_tree::path_type tx_codec_path = mb_path / "tx_codecs/A"; + const fs_path rx_codec_path = mb_path / "rx_codecs/A"; + const fs_path tx_codec_path = mb_path / "tx_codecs/A"; _tree->create<std::string>(rx_codec_path / "name").set("ad9522"); _tree->create<meta_range_t>(rx_codec_path / "gains/pga/range").set(b100_codec_ctrl::rx_pga_gain_range); _tree->create<double>(rx_codec_path / "gains/pga/value") @@ -276,7 +276,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ _rx_dsps[dspno]->set_link_rate(B100_LINK_RATE_BPS); _tree->access<double>(mb_path / "tick_rate") .subscribe(boost::bind(&rx_dsp_core_200::set_tick_rate, _rx_dsps[dspno], _1)); - property_tree::path_type rx_dsp_path = mb_path / str(boost::format("rx_dsps/%u") % dspno); + fs_path rx_dsp_path = mb_path / str(boost::format("rx_dsps/%u") % dspno); _tree->create<double>(rx_dsp_path / "rate/value") .coerce(boost::bind(&rx_dsp_core_200::set_host_rate, _rx_dsps[dspno], _1)) .subscribe(boost::bind(&b100_impl::update_rx_samp_rate, this, _1)); diff --git a/host/lib/usrp/b100/io_impl.cpp b/host/lib/usrp/b100/io_impl.cpp index d841188c0..34535217a 100644 --- a/host/lib/usrp/b100/io_impl.cpp +++ b/host/lib/usrp/b100/io_impl.cpp @@ -140,7 +140,7 @@ void b100_impl::update_tx_samp_rate(const double rate){ void b100_impl::update_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec){ boost::mutex::scoped_lock recv_lock = _io_impl->recv_handler.get_scoped_lock(); - property_tree::path_type root = "/mboards/0/dboards"; + fs_path root = "/mboards/0/dboards"; //sanity checking validate_subdev_spec(_tree, spec, "rx"); @@ -169,7 +169,7 @@ void b100_impl::update_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec){ void b100_impl::update_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec){ boost::mutex::scoped_lock send_lock = _io_impl->send_handler.get_scoped_lock(); - property_tree::path_type root = "/mboards/0/dboards"; + fs_path root = "/mboards/0/dboards"; //sanity checking validate_subdev_spec(_tree, spec, "tx"); |