Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/ham/uhd Fix boost::placeholders fallout
details: https://anonhg.NetBSD.org/pkgsrc/rev/c3db121f6b92
branches: trunk
changeset: 431586:c3db121f6b92
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu May 14 19:21:04 2020 +0000
description:
Fix boost::placeholders fallout
diffstat:
ham/uhd/distinfo | 26 +-
ham/uhd/patches/patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp | 22 +
ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__impl.cpp | 13 +
ham/uhd/patches/patch-lib_usrp_b100_b100__impl.cpp | 211 ++++++++++
ham/uhd/patches/patch-lib_usrp_cores_rx__dsp__core__3000.cpp | 17 +
ham/uhd/patches/patch-lib_usrp_cores_tx__dsp__core__3000.cpp | 17 +
ham/uhd/patches/patch-lib_usrp_dboard_db__cbx.cpp | 15 +
ham/uhd/patches/patch-lib_usrp_dboard_db__dbsrx.cpp | 29 +
ham/uhd/patches/patch-lib_usrp_dboard_db__dbsrx2.cpp | 29 +
ham/uhd/patches/patch-lib_usrp_dboard_db__rfx.cpp | 39 +
ham/uhd/patches/patch-lib_usrp_dboard_db__sbx__common.cpp | 46 ++
ham/uhd/patches/patch-lib_usrp_dboard_db__sbx__version3.cpp | 15 +
ham/uhd/patches/patch-lib_usrp_dboard_db__sbx__version4.cpp | 15 +
ham/uhd/patches/patch-lib_usrp_dboard_db__tvrx.cpp | 19 +
ham/uhd/patches/patch-lib_usrp_dboard_db__tvrx2.cpp | 34 +
ham/uhd/patches/patch-lib_usrp_dboard_db__ubx.cpp | 127 ++++++
ham/uhd/patches/patch-lib_usrp_dboard_db__wbx__common.cpp | 21 +
ham/uhd/patches/patch-lib_usrp_dboard_db__wbx__simple.cpp | 22 +
ham/uhd/patches/patch-lib_usrp_dboard_db__wbx__version2.cpp | 44 ++
ham/uhd/patches/patch-lib_usrp_dboard_db__wbx__version3.cpp | 44 ++
ham/uhd/patches/patch-lib_usrp_dboard_db__wbx__version4.cpp | 45 ++
ham/uhd/patches/patch-lib_usrp_dboard_db__xcvr2450.cpp | 66 +++
ham/uhd/patches/patch-lib_usrp_dboard_eiscat_eiscat__radio__ctrl__impl.cpp | 13 +
ham/uhd/patches/patch-lib_usrp_multi__usrp.cpp | 13 +
ham/uhd/patches/patch-lib_usrp_x300_x300__radio__ctrl__impl.cpp | 58 ++
25 files changed, 999 insertions(+), 1 deletions(-)
diffs (truncated from 1107 to 300 lines):
diff -r 83e2265e43c3 -r c3db121f6b92 ham/uhd/distinfo
--- a/ham/uhd/distinfo Thu May 14 19:20:32 2020 +0000
+++ b/ham/uhd/distinfo Thu May 14 19:21:04 2020 +0000
@@ -1,8 +1,32 @@
-$NetBSD: distinfo,v 1.24 2020/04/08 08:07:17 adam Exp $
+$NetBSD: distinfo,v 1.25 2020/05/14 19:21:04 joerg Exp $
SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f
RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae
SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes
SHA1 (patch-CMakeLists.txt) = 5691ddd6a98f92e649a184cfc092a4eb721c6fe7
+SHA1 (patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp) = 0dcc0ddc231f3f1c2a6a3a57ef88df5467170fc6
SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7
+SHA1 (patch-lib_usrp__clock_octoclock_octoclock__impl.cpp) = b77c91c7a202e3c93707dba67bedc9704f77ab56
+SHA1 (patch-lib_usrp_b100_b100__impl.cpp) = 9a53e41b45fdebaf0b56e3030f1c8f9790185046
+SHA1 (patch-lib_usrp_cores_rx__dsp__core__3000.cpp) = d63fd1ab1d48da7e9eb8a7deb33a3803fb6c219d
+SHA1 (patch-lib_usrp_cores_tx__dsp__core__3000.cpp) = 3812d190f830128046ab39b21ba63b6775f8c764
+SHA1 (patch-lib_usrp_dboard_db__cbx.cpp) = 3b8864f060acaeb262c91433f0dc0fd229f8c458
+SHA1 (patch-lib_usrp_dboard_db__dbsrx.cpp) = 55de5be387fbe59015c4e1c0861313740b9b3088
+SHA1 (patch-lib_usrp_dboard_db__dbsrx2.cpp) = a7b905d154ecfcfa72df8561b6ae98cd3f97fb08
+SHA1 (patch-lib_usrp_dboard_db__rfx.cpp) = c01c17ee5ba2ad877c1bdf4c940af529adeab8d6
+SHA1 (patch-lib_usrp_dboard_db__sbx__common.cpp) = 35345e22a714b67a35055f303aaa074ff3b637fa
+SHA1 (patch-lib_usrp_dboard_db__sbx__version3.cpp) = 8e243093fae46256dde8f8c531715dd2d88f2c9d
+SHA1 (patch-lib_usrp_dboard_db__sbx__version4.cpp) = 8ed4d05a98438a852f352c6db003d20b5886bd49
+SHA1 (patch-lib_usrp_dboard_db__tvrx.cpp) = 6b94d0a89558198340b75cd2d9b77c1fe0f04c5d
+SHA1 (patch-lib_usrp_dboard_db__tvrx2.cpp) = 5d3618a80d5ece89c2a4488b12613ca824ba7a19
+SHA1 (patch-lib_usrp_dboard_db__ubx.cpp) = c8bdfbe6b4494fc50f6b8229a5ee796cd9d85af5
+SHA1 (patch-lib_usrp_dboard_db__wbx__common.cpp) = 190619aaf7a93314e4d13cac28497b9af0011bf4
+SHA1 (patch-lib_usrp_dboard_db__wbx__simple.cpp) = e889a9fd77f610bf672b0e95ab6ab9178c14d7da
+SHA1 (patch-lib_usrp_dboard_db__wbx__version2.cpp) = 4285b334b32e246d54c53715da7a07f126ef6533
+SHA1 (patch-lib_usrp_dboard_db__wbx__version3.cpp) = e1d69f09f9f134a0c5aa2bbf772d8dd995cda681
+SHA1 (patch-lib_usrp_dboard_db__wbx__version4.cpp) = dbbe24a2a755031c06ff74045e2502d2ee646f59
+SHA1 (patch-lib_usrp_dboard_db__xcvr2450.cpp) = 90d2e4bfe072e84e20c35c256af036da696425c1
+SHA1 (patch-lib_usrp_dboard_eiscat_eiscat__radio__ctrl__impl.cpp) = 54e9e06fd37dd7cc5a9767519148266dd915f4a0
+SHA1 (patch-lib_usrp_multi__usrp.cpp) = ff711af0232cbe92dfe822411ab228b35fa63389
+SHA1 (patch-lib_usrp_x300_x300__radio__ctrl__impl.cpp) = 2f0c10f2443b6d2f361ee8a9f339b39c9498d2bb
diff -r 83e2265e43c3 -r c3db121f6b92 ham/uhd/patches/patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/uhd/patches/patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp Thu May 14 19:21:04 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
+
+--- lib/rfnoc/dma_fifo_block_ctrl_impl.cpp.orig 2020-05-09 17:48:24.246248533 +0000
++++ lib/rfnoc/dma_fifo_block_ctrl_impl.cpp
+@@ -58,7 +58,7 @@ public:
+ _tree->access<int>(get_arg_path("base_addr/value", i))
+ .add_coerced_subscriber(boost::bind(&dma_fifo_block_ctrl_impl::resize,
+ this,
+- _1,
++ boost::placeholders::_1,
+ boost::ref(_perifs[i].depth),
+ i))
+ .set(_perifs[i].base_addr);
+@@ -66,7 +66,7 @@ public:
+ .add_coerced_subscriber(boost::bind(&dma_fifo_block_ctrl_impl::resize,
+ this,
+ boost::ref(_perifs[i].base_addr),
+- _1,
++ boost::placeholders::_1,
+ i))
+ .set(_perifs[i].depth);
+ }
diff -r 83e2265e43c3 -r c3db121f6b92 ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__impl.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__impl.cpp Thu May 14 19:21:04 2020 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_usrp__clock_octoclock_octoclock__impl.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
+
+--- lib/usrp_clock/octoclock/octoclock_impl.cpp.orig 2020-05-09 17:03:32.128126677 +0000
++++ lib/usrp_clock/octoclock/octoclock_impl.cpp
+@@ -232,7 +232,7 @@ octoclock_impl::octoclock_impl(const dev
+ _oc_dict[oc].eeprom = octoclock_eeprom_t(_oc_dict[oc].ctrl_xport, _proto_ver);
+ _tree->create<octoclock_eeprom_t>(oc_path / "eeprom")
+ .set(_oc_dict[oc].eeprom)
+- .add_coerced_subscriber(boost::bind(&octoclock_impl::_set_eeprom, this, oc, _1));
++ .add_coerced_subscriber(boost::bind(&octoclock_impl::_set_eeprom, this, oc, boost::placeholders::_1));
+
+ ////////////////////////////////////////////////////////////////////
+ // Initialize non-GPSDO sensors
diff -r 83e2265e43c3 -r c3db121f6b92 ham/uhd/patches/patch-lib_usrp_b100_b100__impl.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/uhd/patches/patch-lib_usrp_b100_b100__impl.cpp Thu May 14 19:21:04 2020 +0000
@@ -0,0 +1,211 @@
+$NetBSD: patch-lib_usrp_b100_b100__impl.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
+
+--- lib/usrp/b100/b100_impl.cpp.orig 2020-05-09 16:46:31.268190497 +0000
++++ lib/usrp/b100/b100_impl.cpp
+@@ -274,7 +274,7 @@ b100_impl::b100_impl(const device_addr_t
+ _tree->create<std::string>(mb_path / "name").set("B100");
+ _tree->create<std::string>(mb_path / "codename").set("B-Hundo");
+ _tree->create<std::string>(mb_path / "load_eeprom")
+- .add_coerced_subscriber(boost::bind(&fx2_ctrl::usrp_load_eeprom, _fx2_ctrl, _1));
++ .add_coerced_subscriber(boost::bind(&fx2_ctrl::usrp_load_eeprom, _fx2_ctrl, boost::placeholders::_1));
+
+ ////////////////////////////////////////////////////////////////////
+ // setup the mboard eeprom
+@@ -282,7 +282,7 @@ b100_impl::b100_impl(const device_addr_t
+ const mboard_eeprom_t mb_eeprom = this->get_mb_eeprom(_fx2_ctrl);
+ _tree->create<mboard_eeprom_t>(mb_path / "eeprom")
+ .set(mb_eeprom)
+- .add_coerced_subscriber(boost::bind(&b100_impl::set_mb_eeprom, this, _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::set_mb_eeprom, this, boost::placeholders::_1));
+
+ ////////////////////////////////////////////////////////////////////
+ // create clock control objects
+@@ -290,12 +290,12 @@ b100_impl::b100_impl(const device_addr_t
+ //^^^ clock created up top, just reg props here... ^^^
+ _tree->create<double>(mb_path / "tick_rate")
+ .set_publisher(boost::bind(&b100_clock_ctrl::get_fpga_clock_rate, _clock_ctrl))
+- .add_coerced_subscriber(boost::bind(&fifo_ctrl_excelsior::set_tick_rate, _fifo_ctrl, _1))
+- .add_coerced_subscriber(boost::bind(&b100_impl::update_tick_rate, this, _1));
++ .add_coerced_subscriber(boost::bind(&fifo_ctrl_excelsior::set_tick_rate, _fifo_ctrl, boost::placeholders::_1))
++ .add_coerced_subscriber(boost::bind(&b100_impl::update_tick_rate, this, boost::placeholders::_1));
+
+ //add_coerced_subscriber the command time while we are at it
+ _tree->create<time_spec_t>(mb_path / "time/cmd")
+- .add_coerced_subscriber(boost::bind(&fifo_ctrl_excelsior::set_time, _fifo_ctrl, _1));
++ .add_coerced_subscriber(boost::bind(&fifo_ctrl_excelsior::set_time, _fifo_ctrl, boost::placeholders::_1));
+
+ ////////////////////////////////////////////////////////////////////
+ // create codec control objects
+@@ -306,12 +306,12 @@ b100_impl::b100_impl(const device_addr_t
+ _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")
+- .set_coercer(boost::bind(&b100_impl::update_rx_codec_gain, this, _1))
++ .set_coercer(boost::bind(&b100_impl::update_rx_codec_gain, this, boost::placeholders::_1))
+ .set(0.0);
+ _tree->create<std::string>(tx_codec_path / "name").set("ad9522");
+ _tree->create<meta_range_t>(tx_codec_path / "gains/pga/range").set(b100_codec_ctrl::tx_pga_gain_range);
+ _tree->create<double>(tx_codec_path / "gains/pga/value")
+- .add_coerced_subscriber(boost::bind(&b100_codec_ctrl::set_tx_pga_gain, _codec_ctrl, _1))
++ .add_coerced_subscriber(boost::bind(&b100_codec_ctrl::set_tx_pga_gain, _codec_ctrl, boost::placeholders::_1))
+ .set_publisher(boost::bind(&b100_codec_ctrl::get_tx_pga_gain, _codec_ctrl))
+ .set(0.0);
+
+@@ -328,27 +328,27 @@ b100_impl::b100_impl(const device_addr_t
+ _tx_fe = tx_frontend_core_200::make(_fifo_ctrl, TOREG(SR_TX_FE));
+
+ _tree->create<subdev_spec_t>(mb_path / "rx_subdev_spec")
+- .add_coerced_subscriber(boost::bind(&b100_impl::update_rx_subdev_spec, this, _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::update_rx_subdev_spec, this, boost::placeholders::_1));
+ _tree->create<subdev_spec_t>(mb_path / "tx_subdev_spec")
+- .add_coerced_subscriber(boost::bind(&b100_impl::update_tx_subdev_spec, this, _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::update_tx_subdev_spec, this, boost::placeholders::_1));
+
+ const fs_path rx_fe_path = mb_path / "rx_frontends" / "A";
+ const fs_path tx_fe_path = mb_path / "tx_frontends" / "A";
+
+ _tree->create<std::complex<double> >(rx_fe_path / "dc_offset" / "value")
+- .set_coercer(boost::bind(&rx_frontend_core_200::set_dc_offset, _rx_fe, _1))
++ .set_coercer(boost::bind(&rx_frontend_core_200::set_dc_offset, _rx_fe, boost::placeholders::_1))
+ .set(std::complex<double>(0.0, 0.0));
+ _tree->create<bool>(rx_fe_path / "dc_offset" / "enable")
+- .add_coerced_subscriber(boost::bind(&rx_frontend_core_200::set_dc_offset_auto, _rx_fe, _1))
++ .add_coerced_subscriber(boost::bind(&rx_frontend_core_200::set_dc_offset_auto, _rx_fe, boost::placeholders::_1))
+ .set(true);
+ _tree->create<std::complex<double> >(rx_fe_path / "iq_balance" / "value")
+- .add_coerced_subscriber(boost::bind(&rx_frontend_core_200::set_iq_balance, _rx_fe, _1))
++ .add_coerced_subscriber(boost::bind(&rx_frontend_core_200::set_iq_balance, _rx_fe, boost::placeholders::_1))
+ .set(std::complex<double>(0.0, 0.0));
+ _tree->create<std::complex<double> >(tx_fe_path / "dc_offset" / "value")
+- .set_coercer(boost::bind(&tx_frontend_core_200::set_dc_offset, _tx_fe, _1))
++ .set_coercer(boost::bind(&tx_frontend_core_200::set_dc_offset, _tx_fe, boost::placeholders::_1))
+ .set(std::complex<double>(0.0, 0.0));
+ _tree->create<std::complex<double> >(tx_fe_path / "iq_balance" / "value")
+- .add_coerced_subscriber(boost::bind(&tx_frontend_core_200::set_iq_balance, _tx_fe, _1))
++ .add_coerced_subscriber(boost::bind(&tx_frontend_core_200::set_iq_balance, _tx_fe, boost::placeholders::_1))
+ .set(std::complex<double>(0.0, 0.0));
+
+ ////////////////////////////////////////////////////////////////////
+@@ -367,20 +367,20 @@ b100_impl::b100_impl(const device_addr_t
+
+ _rx_dsps[dspno]->set_link_rate(B100_LINK_RATE_BPS);
+ _tree->access<double>(mb_path / "tick_rate")
+- .add_coerced_subscriber(boost::bind(&rx_dsp_core_200::set_tick_rate, _rx_dsps[dspno], _1));
++ .add_coerced_subscriber(boost::bind(&rx_dsp_core_200::set_tick_rate, _rx_dsps[dspno], boost::placeholders::_1));
+ fs_path rx_dsp_path = mb_path / str(boost::format("rx_dsps/%u") % dspno);
+ _tree->create<meta_range_t>(rx_dsp_path / "rate/range")
+ .set_publisher(boost::bind(&rx_dsp_core_200::get_host_rates, _rx_dsps[dspno]));
+ _tree->create<double>(rx_dsp_path / "rate/value")
+ .set(1e6) //some default
+- .set_coercer(boost::bind(&rx_dsp_core_200::set_host_rate, _rx_dsps[dspno], _1))
+- .add_coerced_subscriber(boost::bind(&b100_impl::update_rx_samp_rate, this, dspno, _1));
++ .set_coercer(boost::bind(&rx_dsp_core_200::set_host_rate, _rx_dsps[dspno], boost::placeholders::_1))
++ .add_coerced_subscriber(boost::bind(&b100_impl::update_rx_samp_rate, this, dspno, boost::placeholders::_1));
+ _tree->create<double>(rx_dsp_path / "freq/value")
+- .set_coercer(boost::bind(&rx_dsp_core_200::set_freq, _rx_dsps[dspno], _1));
++ .set_coercer(boost::bind(&rx_dsp_core_200::set_freq, _rx_dsps[dspno], boost::placeholders::_1));
+ _tree->create<meta_range_t>(rx_dsp_path / "freq/range")
+ .set_publisher(boost::bind(&rx_dsp_core_200::get_freq_range, _rx_dsps[dspno]));
+ _tree->create<stream_cmd_t>(rx_dsp_path / "stream_cmd")
+- .add_coerced_subscriber(boost::bind(&rx_dsp_core_200::issue_stream_command, _rx_dsps[dspno], _1));
++ .add_coerced_subscriber(boost::bind(&rx_dsp_core_200::issue_stream_command, _rx_dsps[dspno], boost::placeholders::_1));
+ }
+
+ ////////////////////////////////////////////////////////////////////
+@@ -391,15 +391,15 @@ b100_impl::b100_impl(const device_addr_t
+ );
+ _tx_dsp->set_link_rate(B100_LINK_RATE_BPS);
+ _tree->access<double>(mb_path / "tick_rate")
+- .add_coerced_subscriber(boost::bind(&tx_dsp_core_200::set_tick_rate, _tx_dsp, _1));
++ .add_coerced_subscriber(boost::bind(&tx_dsp_core_200::set_tick_rate, _tx_dsp, boost::placeholders::_1));
+ _tree->create<meta_range_t>(mb_path / "tx_dsps/0/rate/range")
+ .set_publisher(boost::bind(&tx_dsp_core_200::get_host_rates, _tx_dsp));
+ _tree->create<double>(mb_path / "tx_dsps/0/rate/value")
+ .set(1e6) //some default
+- .set_coercer(boost::bind(&tx_dsp_core_200::set_host_rate, _tx_dsp, _1))
+- .add_coerced_subscriber(boost::bind(&b100_impl::update_tx_samp_rate, this, 0, _1));
++ .set_coercer(boost::bind(&tx_dsp_core_200::set_host_rate, _tx_dsp, boost::placeholders::_1))
++ .add_coerced_subscriber(boost::bind(&b100_impl::update_tx_samp_rate, this, 0, boost::placeholders::_1));
+ _tree->create<double>(mb_path / "tx_dsps/0/freq/value")
+- .set_coercer(boost::bind(&tx_dsp_core_200::set_freq, _tx_dsp, _1));
++ .set_coercer(boost::bind(&tx_dsp_core_200::set_freq, _tx_dsp, boost::placeholders::_1));
+ _tree->create<meta_range_t>(mb_path / "tx_dsps/0/freq/range")
+ .set_publisher(boost::bind(&tx_dsp_core_200::get_freq_range, _tx_dsp));
+
+@@ -415,21 +415,21 @@ b100_impl::b100_impl(const device_addr_t
+ _fifo_ctrl, TOREG(SR_TIME64), time64_rb_bases
+ );
+ _tree->access<double>(mb_path / "tick_rate")
+- .add_coerced_subscriber(boost::bind(&time64_core_200::set_tick_rate, _time64, _1));
++ .add_coerced_subscriber(boost::bind(&time64_core_200::set_tick_rate, _time64, boost::placeholders::_1));
+ _tree->create<time_spec_t>(mb_path / "time/now")
+ .set_publisher(boost::bind(&time64_core_200::get_time_now, _time64))
+- .add_coerced_subscriber(boost::bind(&time64_core_200::set_time_now, _time64, _1));
++ .add_coerced_subscriber(boost::bind(&time64_core_200::set_time_now, _time64, boost::placeholders::_1));
+ _tree->create<time_spec_t>(mb_path / "time/pps")
+ .set_publisher(boost::bind(&time64_core_200::get_time_last_pps, _time64))
+- .add_coerced_subscriber(boost::bind(&time64_core_200::set_time_next_pps, _time64, _1));
++ .add_coerced_subscriber(boost::bind(&time64_core_200::set_time_next_pps, _time64, boost::placeholders::_1));
+ //setup time source props
+ _tree->create<std::string>(mb_path / "time_source/value")
+- .add_coerced_subscriber(boost::bind(&time64_core_200::set_time_source, _time64, _1));
++ .add_coerced_subscriber(boost::bind(&time64_core_200::set_time_source, _time64, boost::placeholders::_1));
+ _tree->create<std::vector<std::string> >(mb_path / "time_source/options")
+ .set_publisher(boost::bind(&time64_core_200::get_time_sources, _time64));
+ //setup reference source props
+ _tree->create<std::string>(mb_path / "clock_source/value")
+- .add_coerced_subscriber(boost::bind(&b100_impl::update_clock_source, this, _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::update_clock_source, this, boost::placeholders::_1));
+ static const std::vector<std::string> clock_sources = {
+ "internal", "external", "auto"
+ };
+@@ -440,7 +440,7 @@ b100_impl::b100_impl(const device_addr_t
+ ////////////////////////////////////////////////////////////////////
+ _user = user_settings_core_200::make(_fifo_ctrl, TOREG(SR_USER_REGS));
+ _tree->create<user_settings_core_200::user_reg_t>(mb_path / "user/regs")
+- .add_coerced_subscriber(boost::bind(&user_settings_core_200::set_reg, _user, _1));
++ .add_coerced_subscriber(boost::bind(&user_settings_core_200::set_reg, _user, boost::placeholders::_1));
+
+ ////////////////////////////////////////////////////////////////////
+ // create dboard control objects
+@@ -458,13 +458,13 @@ b100_impl::b100_impl(const device_addr_t
+ //create the properties and register subscribers
+ _tree->create<dboard_eeprom_t>(mb_path / "dboards/A/rx_eeprom")
+ .set(rx_db_eeprom)
+- .add_coerced_subscriber(boost::bind(&b100_impl::set_db_eeprom, this, "rx", _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::set_db_eeprom, this, "rx", boost::placeholders::_1));
+ _tree->create<dboard_eeprom_t>(mb_path / "dboards/A/tx_eeprom")
+ .set(tx_db_eeprom)
+- .add_coerced_subscriber(boost::bind(&b100_impl::set_db_eeprom, this, "tx", _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::set_db_eeprom, this, "tx", boost::placeholders::_1));
+ _tree->create<dboard_eeprom_t>(mb_path / "dboards/A/gdb_eeprom")
+ .set(gdb_eeprom)
+- .add_coerced_subscriber(boost::bind(&b100_impl::set_db_eeprom, this, "gdb", _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::set_db_eeprom, this, "gdb", boost::placeholders::_1));
+
+ //create a new dboard interface and manager
+ _dboard_manager = dboard_manager::make(
+@@ -477,12 +477,12 @@ b100_impl::b100_impl(const device_addr_t
+ const fs_path db_tx_fe_path = mb_path / "dboards" / "A" / "tx_frontends";
+ for(const std::string &name: _tree->list(db_tx_fe_path)){
+ _tree->access<double>(db_tx_fe_path / name / "freq" / "value")
+- .add_coerced_subscriber(boost::bind(&b100_impl::set_tx_fe_corrections, this, _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::set_tx_fe_corrections, this, boost::placeholders::_1));
+ }
+ const fs_path db_rx_fe_path = mb_path / "dboards" / "A" / "rx_frontends";
+ for(const std::string &name: _tree->list(db_rx_fe_path)){
+ _tree->access<double>(db_rx_fe_path / name / "freq" / "value")
+- .add_coerced_subscriber(boost::bind(&b100_impl::set_rx_fe_corrections, this, _1));
++ .add_coerced_subscriber(boost::bind(&b100_impl::set_rx_fe_corrections, this, boost::placeholders::_1));
+ }
+
+ //initialize io handling
+@@ -498,7 +498,7 @@ b100_impl::b100_impl(const device_addr_t
+ this->update_rates();
+
+ _tree->access<double>(mb_path / "tick_rate") //now add_coerced_subscriber the clock rate setter
+- .add_coerced_subscriber(boost::bind(&b100_clock_ctrl::set_fpga_clock_rate, _clock_ctrl, _1));
++ .add_coerced_subscriber(boost::bind(&b100_clock_ctrl::set_fpga_clock_rate, _clock_ctrl, boost::placeholders::_1));
+
+ //reset cordic rates and their properties to zero
+ for(const std::string &name: _tree->list(mb_path / "rx_dsps")){
diff -r 83e2265e43c3 -r c3db121f6b92 ham/uhd/patches/patch-lib_usrp_cores_rx__dsp__core__3000.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/uhd/patches/patch-lib_usrp_cores_rx__dsp__core__3000.cpp Thu May 14 19:21:04 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_usrp_cores_rx__dsp__core__3000.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
Home |
Main Index |
Thread Index |
Old Index