uhd: update to 4.1.0.4
With UHD 4.0, RFNoC has undergone a major overhaul for improved usability, performance, and compatibility with tools like GNU Radio. Improved Radio Performance Increase channel bandwidth to 250 MSPS and beyond. Flexible bus width to increase throughput. Static routing for lower latency and higher throughput Updates to the NOC shell layer for improved latency and throughput. FPGA Design Flow Enhancements Ability to scale to a larger number of user-defined blocks. Reduced FPGA resource utilization in many instances. More Flexibility Architectural flexibility enables users to make more design tradeoffs. Allows the user to balance flexibility, resource utilization, and performance. Improved User Experience Improved documentation with a full RFNoC Specification Power calibration utility API (requires external calibration reference) Python API enhancements with full Python 3 support. Stability improvements from new automated testing infrastructure. Use embedded series radios without programming the ARM processing with "Network Mode" over the RJ45
This commit is contained in:
tnn
parent
93050cf10b
commit
1cd0c8c541
33 changed files with 823 additions and 1224 deletions
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.62 2021/09/29 19:00:51 adam Exp $
|
||||
# $NetBSD: Makefile,v 1.63 2021/12/11 17:39:56 tnn Exp $
|
||||
|
||||
DISTNAME= uhd-3.15.0.0
|
||||
PKGREVISION= 5
|
||||
DISTNAME= uhd-4.1.0.4
|
||||
CATEGORIES= ham
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/}
|
||||
GITHUB_TAG= v${PKGVERSION_NOREV}
|
||||
|
|
@ -9,7 +8,7 @@ GITHUB_TAG= v${PKGVERSION_NOREV}
|
|||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= https://github.com/EttusResearch/uhd
|
||||
COMMENT= USRP (Universal Software Radio Peripheral) Hardware Drivers
|
||||
LICENSE= gnu-gpl-v2
|
||||
LICENSE= gnu-gpl-v3
|
||||
|
||||
DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
|
||||
DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
|
||||
|
|
@ -43,10 +42,13 @@ EXTRACT_USING= gtar
|
|||
WRKSRC= ${WRKDIR}/${DISTNAME}/host
|
||||
|
||||
# The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
|
||||
REPLACE_PYTHON+= utils/convert_cal_data.py
|
||||
REPLACE_PYTHON+= utils/converter_benchmark.py
|
||||
REPLACE_PYTHON+= utils/latency/graph.py
|
||||
REPLACE_PYTHON+= utils/latency/run_tests.py
|
||||
REPLACE_PYTHON+= utils/rfnoc_image_builder.py
|
||||
REPLACE_PYTHON+= utils/uhd_images_downloader.py.in
|
||||
REPLACE_PYTHON+= utils/uhd_power_cal.py
|
||||
REPLACE_PYTHON+= utils/usrp2_card_burner.py
|
||||
REPLACE_PYTHON+= utils/usrp2_card_burner_gui.py
|
||||
REPLACE_PYTHON+= utils/usrp2_recovery.py
|
||||
|
|
@ -62,6 +64,11 @@ REPLACE_PYTHON+= tests/devtest/tx_waveforms_test.py
|
|||
REPLACE_PYTHON+= tests/devtest/uhd_test_base.py
|
||||
REPLACE_PYTHON+= tests/devtest/usrp_probe.py
|
||||
REPLACE_PYTHON+= tests/devtest/usrp_probe_test.py
|
||||
REPLACE_PYTHON+= tests/streaming_performance/batch_run_benchmark_rate.py
|
||||
REPLACE_PYTHON+= tests/streaming_performance/run_E3xx_max_rate_tests.py
|
||||
REPLACE_PYTHON+= tests/streaming_performance/run_N3xx_max_rate_tests.py
|
||||
REPLACE_PYTHON+= tests/streaming_performance/run_X3xx_max_rate_tests.py
|
||||
|
||||
|
||||
INSTALLATION_DIRS+= share/uhd
|
||||
INSTALLATION_DIRS+= share/uhd/firmware
|
||||
|
|
|
|||
241
ham/uhd/PLIST
241
ham/uhd/PLIST
|
|
@ -1,4 +1,6 @@
|
|||
@comment $NetBSD: PLIST,v 1.19 2020/08/01 03:58:54 tnn Exp $
|
||||
@comment $NetBSD: PLIST,v 1.20 2021/12/11 17:39:56 tnn Exp $
|
||||
bin/rfnoc_image_builder
|
||||
bin/uhd_adc_self_cal
|
||||
bin/uhd_cal_rx_iq_balance
|
||||
bin/uhd_cal_tx_dc_offset
|
||||
bin/uhd_cal_tx_iq_balance
|
||||
|
|
@ -8,47 +10,79 @@ bin/uhd_image_loader
|
|||
bin/uhd_usrp_probe
|
||||
include/uhd.h
|
||||
include/uhd/build_info.hpp
|
||||
include/uhd/cal/cal_metadata_generated.h
|
||||
include/uhd/cal/container.hpp
|
||||
include/uhd/cal/database.hpp
|
||||
include/uhd/cal/dsa_cal.hpp
|
||||
include/uhd/cal/dsa_cal_generated.h
|
||||
include/uhd/cal/iq_cal.hpp
|
||||
include/uhd/cal/iq_cal_generated.h
|
||||
include/uhd/cal/pwr_cal.hpp
|
||||
include/uhd/cal/pwr_cal_generated.h
|
||||
include/uhd/config.h
|
||||
include/uhd/config.hpp
|
||||
include/uhd/convert.hpp
|
||||
include/uhd/deprecated.hpp
|
||||
include/uhd/device.hpp
|
||||
include/uhd/device3.hpp
|
||||
include/uhd/error.h
|
||||
include/uhd/exception.hpp
|
||||
include/uhd/features/discoverable_feature.hpp
|
||||
include/uhd/features/discoverable_feature_getter_iface.hpp
|
||||
include/uhd/features/ref_clk_calibration_iface.hpp
|
||||
include/uhd/property_tree.hpp
|
||||
include/uhd/property_tree.ipp
|
||||
include/uhd/rfnoc/block_ctrl.hpp
|
||||
include/uhd/rfnoc/block_ctrl_base.hpp
|
||||
include/uhd/rfnoc/actions.hpp
|
||||
include/uhd/rfnoc/addsub_block_control.hpp
|
||||
include/uhd/rfnoc/block_control.hpp
|
||||
include/uhd/rfnoc/block_id.hpp
|
||||
include/uhd/rfnoc/blockdef.hpp
|
||||
include/uhd/rfnoc/chdr_types.hpp
|
||||
include/uhd/rfnoc/constants.hpp
|
||||
include/uhd/rfnoc/ddc_block_ctrl.hpp
|
||||
include/uhd/rfnoc/dma_fifo_block_ctrl.hpp
|
||||
include/uhd/rfnoc/duc_block_ctrl.hpp
|
||||
include/uhd/rfnoc/fir_block_ctrl.hpp
|
||||
include/uhd/rfnoc/graph.hpp
|
||||
include/uhd/rfnoc/node_ctrl_base.hpp
|
||||
include/uhd/rfnoc/node_ctrl_base.ipp
|
||||
include/uhd/rfnoc/null_block_ctrl.hpp
|
||||
include/uhd/rfnoc/radio_ctrl.hpp
|
||||
include/uhd/rfnoc/rate_node_ctrl.hpp
|
||||
include/uhd/rfnoc/replay_block_ctrl.hpp
|
||||
include/uhd/rfnoc/scalar_node_ctrl.hpp
|
||||
include/uhd/rfnoc/siggen_block_ctrl.hpp
|
||||
include/uhd/rfnoc/sink_block_ctrl_base.hpp
|
||||
include/uhd/rfnoc/sink_node_ctrl.hpp
|
||||
include/uhd/rfnoc/source_block_ctrl_base.hpp
|
||||
include/uhd/rfnoc/source_node_ctrl.hpp
|
||||
include/uhd/rfnoc/stream_sig.hpp
|
||||
include/uhd/rfnoc/terminator_node_ctrl.hpp
|
||||
include/uhd/rfnoc/tick_node_ctrl.hpp
|
||||
include/uhd/rfnoc/window_block_ctrl.hpp
|
||||
include/uhd/rfnoc/ddc_block_control.hpp
|
||||
include/uhd/rfnoc/defaults.hpp
|
||||
include/uhd/rfnoc/dirtifier.hpp
|
||||
include/uhd/rfnoc/dmafifo_block_control.hpp
|
||||
include/uhd/rfnoc/duc_block_control.hpp
|
||||
include/uhd/rfnoc/fft_block_control.hpp
|
||||
include/uhd/rfnoc/filter_node.hpp
|
||||
include/uhd/rfnoc/fir_filter_block_control.hpp
|
||||
include/uhd/rfnoc/fosphor_block_control.hpp
|
||||
include/uhd/rfnoc/graph_edge.hpp
|
||||
include/uhd/rfnoc/keep_one_in_n_block_control.hpp
|
||||
include/uhd/rfnoc/logpwr_block_control.hpp
|
||||
include/uhd/rfnoc/mb_controller.hpp
|
||||
include/uhd/rfnoc/mock_block.hpp
|
||||
include/uhd/rfnoc/moving_average_block_control.hpp
|
||||
include/uhd/rfnoc/multichan_register_iface.hpp
|
||||
include/uhd/rfnoc/noc_block_base.hpp
|
||||
include/uhd/rfnoc/noc_block_make_args.hpp
|
||||
include/uhd/rfnoc/node.hpp
|
||||
include/uhd/rfnoc/node.ipp
|
||||
include/uhd/rfnoc/null_block_control.hpp
|
||||
include/uhd/rfnoc/property.hpp
|
||||
include/uhd/rfnoc/property.ipp
|
||||
include/uhd/rfnoc/radio_control.hpp
|
||||
include/uhd/rfnoc/register_iface.hpp
|
||||
include/uhd/rfnoc/register_iface_holder.hpp
|
||||
include/uhd/rfnoc/registry.hpp
|
||||
include/uhd/rfnoc/replay_block_control.hpp
|
||||
include/uhd/rfnoc/res_source_info.hpp
|
||||
include/uhd/rfnoc/rf_control/core_iface.hpp
|
||||
include/uhd/rfnoc/rf_control/power_reference_iface.hpp
|
||||
include/uhd/rfnoc/rfnoc_types.hpp
|
||||
include/uhd/rfnoc/siggen_block_control.hpp
|
||||
include/uhd/rfnoc/split_stream_block_control.hpp
|
||||
include/uhd/rfnoc/switchboard_block_control.hpp
|
||||
include/uhd/rfnoc/traffic_counter.hpp
|
||||
include/uhd/rfnoc/vector_iir_block_control.hpp
|
||||
include/uhd/rfnoc/window_block_control.hpp
|
||||
include/uhd/rfnoc_graph.hpp
|
||||
include/uhd/stream.hpp
|
||||
include/uhd/transport/adapter_id.hpp
|
||||
include/uhd/transport/bounded_buffer.hpp
|
||||
include/uhd/transport/bounded_buffer.ipp
|
||||
include/uhd/transport/buffer_pool.hpp
|
||||
include/uhd/transport/chdr.hpp
|
||||
include/uhd/transport/frame_buff.hpp
|
||||
include/uhd/transport/if_addrs.hpp
|
||||
include/uhd/transport/tcp_zero_copy.hpp
|
||||
include/uhd/transport/udp_constants.hpp
|
||||
|
|
@ -61,25 +95,23 @@ include/uhd/transport/vrt_if_packet.hpp
|
|||
include/uhd/transport/zero_copy.hpp
|
||||
include/uhd/transport/zero_copy_flow_ctrl.hpp
|
||||
include/uhd/types/byte_vector.hpp
|
||||
include/uhd/types/clock_config.hpp
|
||||
include/uhd/types/device_addr.hpp
|
||||
include/uhd/types/dict.hpp
|
||||
include/uhd/types/dict.ipp
|
||||
include/uhd/types/direction.hpp
|
||||
include/uhd/types/eeprom.hpp
|
||||
include/uhd/types/endianness.hpp
|
||||
include/uhd/types/filters.hpp
|
||||
include/uhd/types/io_type.hpp
|
||||
include/uhd/types/mac_addr.hpp
|
||||
include/uhd/types/memmap_iface.hpp
|
||||
include/uhd/types/metadata.h
|
||||
include/uhd/types/metadata.hpp
|
||||
include/uhd/types/otw_type.hpp
|
||||
include/uhd/types/ranges.h
|
||||
include/uhd/types/ranges.hpp
|
||||
include/uhd/types/ref_vector.hpp
|
||||
include/uhd/types/sensors.h
|
||||
include/uhd/types/sensors.hpp
|
||||
include/uhd/types/serial.hpp
|
||||
include/uhd/types/sid.hpp
|
||||
include/uhd/types/stream_cmd.hpp
|
||||
include/uhd/types/string_vector.h
|
||||
include/uhd/types/time_spec.hpp
|
||||
|
|
@ -113,10 +145,15 @@ include/uhd/utils/assert_has.ipp
|
|||
include/uhd/utils/byteswap.hpp
|
||||
include/uhd/utils/byteswap.ipp
|
||||
include/uhd/utils/cast.hpp
|
||||
include/uhd/utils/chdr/chdr_packet.hpp
|
||||
include/uhd/utils/chdr/chdr_packet.ipp
|
||||
include/uhd/utils/csv.hpp
|
||||
include/uhd/utils/dirty_tracked.hpp
|
||||
include/uhd/utils/fp_compare_delta.ipp
|
||||
include/uhd/utils/fp_compare_epsilon.ipp
|
||||
include/uhd/utils/gain_group.hpp
|
||||
include/uhd/utils/graph_utils.hpp
|
||||
include/uhd/utils/interpolation.hpp
|
||||
include/uhd/utils/log.h
|
||||
include/uhd/utils/log.hpp
|
||||
include/uhd/utils/log_add.hpp
|
||||
|
|
@ -126,6 +163,7 @@ include/uhd/utils/noncopyable.hpp
|
|||
include/uhd/utils/paths.hpp
|
||||
include/uhd/utils/pimpl.hpp
|
||||
include/uhd/utils/platform.hpp
|
||||
include/uhd/utils/pybind_adaptors.hpp
|
||||
include/uhd/utils/safe_call.hpp
|
||||
include/uhd/utils/safe_main.hpp
|
||||
include/uhd/utils/scope_exit.hpp
|
||||
|
|
@ -140,16 +178,15 @@ lib/cmake/uhd/UHDBoost.cmake
|
|||
lib/cmake/uhd/UHDConfig.cmake
|
||||
lib/cmake/uhd/UHDConfigVersion.cmake
|
||||
lib/libuhd.so
|
||||
lib/libuhd.so.3.15.0
|
||||
lib/libuhd.so.4.1.0
|
||||
lib/pkgconfig/uhd.pc
|
||||
lib/uhd/examples/benchmark_rate
|
||||
lib/uhd/examples/benchmark_streamer
|
||||
lib/uhd/examples/gpio
|
||||
lib/uhd/examples/latency_test
|
||||
lib/uhd/examples/network_relay
|
||||
lib/uhd/examples/replay_samples_from_file
|
||||
lib/uhd/examples/rfnoc_nullsource_ce_rx
|
||||
lib/uhd/examples/rfnoc_radio_loopback
|
||||
lib/uhd/examples/rfnoc_replay_samples_from_file
|
||||
lib/uhd/examples/rfnoc_rx_to_file
|
||||
lib/uhd/examples/rx_ascii_art_dft
|
||||
lib/uhd/examples/rx_multi_samples
|
||||
|
|
@ -171,17 +208,24 @@ lib/uhd/examples/tx_timed_samples
|
|||
lib/uhd/examples/tx_waveforms
|
||||
lib/uhd/examples/txrx_loopback_to_file
|
||||
lib/uhd/examples/usrp_list_sensors
|
||||
lib/uhd/tests/actions_test
|
||||
lib/uhd/tests/addr_test
|
||||
lib/uhd/tests/addsub_block_test
|
||||
lib/uhd/tests/block_id_test
|
||||
lib/uhd/tests/blockdef_test
|
||||
lib/uhd/tests/buffer_test
|
||||
lib/uhd/tests/byteswap_test
|
||||
lib/uhd/tests/cal_data_dsa_test
|
||||
lib/uhd/tests/cal_data_gain_pwr_test
|
||||
lib/uhd/tests/cal_data_iq_test
|
||||
lib/uhd/tests/cal_database_test
|
||||
lib/uhd/tests/cast_test
|
||||
lib/uhd/tests/chdr_parse_test
|
||||
lib/uhd/tests/chdr_test
|
||||
lib/uhd/tests/client_zero_test
|
||||
lib/uhd/tests/config_parser_test
|
||||
lib/uhd/tests/constrained_device_args_test
|
||||
lib/uhd/tests/convert_test
|
||||
lib/uhd/tests/device3_test
|
||||
lib/uhd/tests/ddc_block_test
|
||||
lib/uhd/tests/devtest/benchmark_rate_test.py
|
||||
lib/uhd/tests/devtest/bitbang_test.py
|
||||
lib/uhd/tests/devtest/devtest_b2xx.py
|
||||
|
|
@ -189,6 +233,7 @@ lib/uhd/tests/devtest/devtest_e320.py
|
|||
lib/uhd/tests/devtest/devtest_e3xx.py
|
||||
lib/uhd/tests/devtest/devtest_n3x0.py
|
||||
lib/uhd/tests/devtest/devtest_x3x0.py
|
||||
lib/uhd/tests/devtest/devtest_x4x0.py
|
||||
lib/uhd/tests/devtest/gpio_test.py
|
||||
lib/uhd/tests/devtest/list_sensors_test.py
|
||||
lib/uhd/tests/devtest/multi_usrp_test.py
|
||||
|
|
@ -203,46 +248,81 @@ lib/uhd/tests/devtest/uhd_test_base.py
|
|||
lib/uhd/tests/devtest/usrp_probe.py
|
||||
lib/uhd/tests/devtest/usrp_probe_test.py
|
||||
lib/uhd/tests/dict_test
|
||||
lib/uhd/tests/discoverable_feature_test
|
||||
lib/uhd/tests/duc_block_test
|
||||
lib/uhd/tests/eeprom_c_test
|
||||
lib/uhd/tests/eeprom_utils_test
|
||||
lib/uhd/tests/error_c_test
|
||||
lib/uhd/tests/error_test
|
||||
lib/uhd/tests/expert_test
|
||||
lib/uhd/tests/fe_conn_test
|
||||
lib/uhd/tests/fft_block_test
|
||||
lib/uhd/tests/fir_filter_block_test
|
||||
lib/uhd/tests/fosphor_block_test
|
||||
lib/uhd/tests/fp_compare_delta_test
|
||||
lib/uhd/tests/fp_compare_epsilon_test
|
||||
lib/uhd/tests/gain_group_test
|
||||
lib/uhd/tests/graph_search_test
|
||||
lib/uhd/tests/interpolation_test
|
||||
lib/uhd/tests/isatty_test
|
||||
lib/uhd/tests/keep_one_in_n_test
|
||||
lib/uhd/tests/link_test
|
||||
lib/uhd/tests/lmx2572_test
|
||||
lib/uhd/tests/log_test
|
||||
lib/uhd/tests/logpwr_block_test
|
||||
lib/uhd/tests/math_test
|
||||
lib/uhd/tests/mb_controller_test
|
||||
lib/uhd/tests/moving_average_block_test
|
||||
lib/uhd/tests/multichan_register_iface_test
|
||||
lib/uhd/tests/narrow_cast_test
|
||||
lib/uhd/tests/nocscript_expr_test
|
||||
lib/uhd/tests/nocscript_ftable_test
|
||||
lib/uhd/tests/nocscript_parser_test
|
||||
lib/uhd/tests/node_connect_test
|
||||
lib/uhd/tests/null_block_test
|
||||
lib/uhd/tests/offload_io_srv_test
|
||||
lib/uhd/tests/packet_handler_benchmark
|
||||
lib/uhd/tests/paths_test
|
||||
lib/uhd/tests/property_test
|
||||
lib/uhd/tests/pwr_cal_mgr_test
|
||||
lib/uhd/tests/ranges_c_test
|
||||
lib/uhd/tests/ranges_test
|
||||
lib/uhd/tests/rate_node_test
|
||||
lib/uhd/tests/replay_block_test
|
||||
lib/uhd/tests/rf_control_gain_profile_test
|
||||
lib/uhd/tests/rfnoc_chdr_test
|
||||
lib/uhd/tests/rfnoc_detailgraph_test
|
||||
lib/uhd/tests/rfnoc_node_test
|
||||
lib/uhd/tests/rfnoc_property_test
|
||||
lib/uhd/tests/rfnoc_propprop_test
|
||||
lib/uhd/tests/rx_streamer_test
|
||||
lib/uhd/tests/scope_exit_test
|
||||
lib/uhd/tests/sensors_c_test
|
||||
lib/uhd/tests/sensors_test
|
||||
lib/uhd/tests/sid_t_test
|
||||
lib/uhd/tests/serial_number_test
|
||||
lib/uhd/tests/siggen_block_test
|
||||
lib/uhd/tests/soft_reg_test
|
||||
lib/uhd/tests/sph_recv_test
|
||||
lib/uhd/tests/sph_send_test
|
||||
lib/uhd/tests/stream_sig_test
|
||||
lib/uhd/tests/split_stream_block_test
|
||||
lib/uhd/tests/streamer_benchmark
|
||||
lib/uhd/tests/streaming_performance/batch_run_benchmark_rate.py
|
||||
lib/uhd/tests/streaming_performance/parse_benchmark_rate.py
|
||||
lib/uhd/tests/streaming_performance/run_E3xx_max_rate_tests.py
|
||||
lib/uhd/tests/streaming_performance/run_N3xx_max_rate_tests.py
|
||||
lib/uhd/tests/streaming_performance/run_X3xx_max_rate_tests.py
|
||||
lib/uhd/tests/streaming_performance/run_benchmark_rate.py
|
||||
lib/uhd/tests/string_vector_c_test
|
||||
lib/uhd/tests/subdev_spec_c_test
|
||||
lib/uhd/tests/subdev_spec_test
|
||||
lib/uhd/tests/switchboard_block_test
|
||||
lib/uhd/tests/system_time_test
|
||||
lib/uhd/tests/tasks_test
|
||||
lib/uhd/tests/tick_node_test
|
||||
lib/uhd/tests/time_spec_test
|
||||
lib/uhd/tests/transport_test
|
||||
lib/uhd/tests/tx_streamer_test
|
||||
lib/uhd/tests/vector_iir_block_test
|
||||
lib/uhd/tests/vrt_test
|
||||
lib/uhd/tests/window_block_test
|
||||
lib/uhd/tests/x400_rfdc_control_test
|
||||
lib/uhd/tests/x4xx_radio_block_test
|
||||
lib/uhd/tests/zbx_cpld_test
|
||||
lib/uhd/utils/b2xx_fx3_utils
|
||||
lib/uhd/utils/convert_cal_data.py
|
||||
lib/uhd/utils/converter_benchmark
|
||||
lib/uhd/utils/converter_benchmark.py
|
||||
lib/uhd/utils/fx2_init_eeprom
|
||||
|
|
@ -252,6 +332,7 @@ lib/uhd/utils/latency/run_tests.py
|
|||
lib/uhd/utils/octoclock_burn_eeprom
|
||||
lib/uhd/utils/query_gpsdo_sensors
|
||||
lib/uhd/utils/uhd_images_downloader.py
|
||||
lib/uhd/utils/uhd_power_cal.py
|
||||
lib/uhd/utils/usrp2_card_burner.py
|
||||
lib/uhd/utils/usrp_burn_db_eeprom
|
||||
lib/uhd/utils/usrp_burn_mb_eeprom
|
||||
|
|
@ -269,42 +350,42 @@ man/man1/usrp_n2xx_simple_net_burner.1
|
|||
man/man1/usrp_x3xx_fpga_burner.1
|
||||
share/doc/uhd/LICENSE
|
||||
share/doc/uhd/README.md
|
||||
share/uhd/rfnoc/blocks/addsub.xml
|
||||
share/uhd/rfnoc/blocks/block.xml
|
||||
share/uhd/rfnoc/blocks/ddc.xml
|
||||
share/uhd/rfnoc/blocks/ddc_eiscat.xml
|
||||
share/uhd/rfnoc/blocks/ddc_single.xml
|
||||
share/uhd/rfnoc/blocks/debug.xml
|
||||
share/uhd/rfnoc/blocks/digital_gain.xml
|
||||
share/uhd/rfnoc/blocks/dma_fifo.xml
|
||||
share/uhd/rfnoc/blocks/dma_fifo_x4.xml
|
||||
share/uhd/rfnoc/blocks/duc.xml
|
||||
share/uhd/rfnoc/blocks/duc_single.xml
|
||||
share/uhd/rfnoc/blocks/fft.xml
|
||||
share/uhd/rfnoc/blocks/fifo.xml
|
||||
share/uhd/rfnoc/blocks/fir.xml
|
||||
share/uhd/rfnoc/blocks/fosphor.xml
|
||||
share/uhd/rfnoc/blocks/keep_one_in_n.xml
|
||||
share/uhd/rfnoc/blocks/logpwr.xml
|
||||
share/uhd/rfnoc/blocks/moving_avg.xml
|
||||
share/uhd/rfnoc/blocks/nullblock.xml
|
||||
share/uhd/rfnoc/blocks/ofdmeq.xml
|
||||
share/uhd/rfnoc/blocks/packetresizer.xml
|
||||
share/uhd/rfnoc/blocks/radio_e31x.xml
|
||||
share/uhd/rfnoc/blocks/radio_e320.xml
|
||||
share/uhd/rfnoc/blocks/radio_eiscat.xml
|
||||
share/uhd/rfnoc/blocks/radio_magnesium.xml
|
||||
share/uhd/rfnoc/blocks/radio_rhodium.xml
|
||||
share/uhd/rfnoc/blocks/radio_x300.xml
|
||||
share/uhd/rfnoc/blocks/replay.xml
|
||||
share/uhd/rfnoc/blocks/replay_x2.xml
|
||||
share/uhd/rfnoc/blocks/replay_x4.xml
|
||||
share/uhd/rfnoc/blocks/schmidlcox.xml
|
||||
share/uhd/rfnoc/blocks/serialdemod.xml
|
||||
share/uhd/rfnoc/blocks/siggen.xml
|
||||
share/uhd/rfnoc/blocks/splitstream.xml
|
||||
share/uhd/rfnoc/blocks/vector_iir.xml
|
||||
share/uhd/rfnoc/blocks/window.xml
|
||||
share/uhd/cal/cal_metadata.fbs
|
||||
share/uhd/cal/dsa_cal.fbs
|
||||
share/uhd/cal/iq_cal.fbs
|
||||
share/uhd/cal/pwr_cal.fbs
|
||||
share/uhd/rfnoc/blocks/addsub.yml
|
||||
share/uhd/rfnoc/blocks/axi_ram_fifo.yml
|
||||
share/uhd/rfnoc/blocks/axi_ram_fifo_2x64.yml
|
||||
share/uhd/rfnoc/blocks/axi_ram_fifo_4x64.yml
|
||||
share/uhd/rfnoc/blocks/ddc.yml
|
||||
share/uhd/rfnoc/blocks/duc.yml
|
||||
share/uhd/rfnoc/blocks/fft_1x64.yml
|
||||
share/uhd/rfnoc/blocks/fir_filter.yml
|
||||
share/uhd/rfnoc/blocks/fosphor.yml
|
||||
share/uhd/rfnoc/blocks/keep_one_in_n.yml
|
||||
share/uhd/rfnoc/blocks/logpwr.yml
|
||||
share/uhd/rfnoc/blocks/moving_avg.yml
|
||||
share/uhd/rfnoc/blocks/null_src_sink.yml
|
||||
share/uhd/rfnoc/blocks/radio.yml
|
||||
share/uhd/rfnoc/blocks/radio_1x64.yml
|
||||
share/uhd/rfnoc/blocks/radio_2x64.yml
|
||||
share/uhd/rfnoc/blocks/replay.yml
|
||||
share/uhd/rfnoc/blocks/siggen.yml
|
||||
share/uhd/rfnoc/blocks/split_stream.yml
|
||||
share/uhd/rfnoc/blocks/switchboard.yml
|
||||
share/uhd/rfnoc/blocks/vector_iir.yml
|
||||
share/uhd/rfnoc/blocks/window.yml
|
||||
share/uhd/rfnoc/core/e310_bsp.yml
|
||||
share/uhd/rfnoc/core/e320_bsp.yml
|
||||
share/uhd/rfnoc/core/io_signatures.yml
|
||||
share/uhd/rfnoc/core/n300_bsp.yml
|
||||
share/uhd/rfnoc/core/n310_bsp.yml
|
||||
share/uhd/rfnoc/core/n320_bsp.yml
|
||||
share/uhd/rfnoc/core/rfnoc_imagebuilder_args.json
|
||||
share/uhd/rfnoc/core/x300_bsp.yml
|
||||
share/uhd/rfnoc/core/x310_bsp.yml
|
||||
share/uhd/rfnoc/core/x410_bsp.yml
|
||||
@pkgdir share/uhd/images
|
||||
@pkgdir share/uhd/fpga
|
||||
@pkgdir share/uhd/firmware
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:17 rillig Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.5 2021/12/11 17:39:56 tnn Exp $
|
||||
|
||||
BUILDLINK_TREE+= uhd
|
||||
|
||||
|
|
@ -6,6 +6,7 @@ BUILDLINK_TREE+= uhd
|
|||
UHD_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.uhd+= uhd>=2.22
|
||||
BUILDLINK_ABI_DEPENDS.uhd?= uhd>=4.1.0.4
|
||||
BUILDLINK_PKGSRCDIR.uhd?= ../../ham/uhd
|
||||
|
||||
# gnuradio-uhd FindUHD.cmake uses this env var as a hint for finding uhd
|
||||
|
|
|
|||
|
|
@ -1,33 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.28 2021/10/26 10:48:40 nia Exp $
|
||||
$NetBSD: distinfo,v 1.29 2021/12/11 17:39:56 tnn Exp $
|
||||
|
||||
BLAKE2s (uhd-3.15.0.0.tar.gz) = cfb452db0e7dfc00aef5fbfefae19135e55f1576bf05f6d3f7b33d1824316d90
|
||||
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) = 7cb2910d13368e5dbb19bfa4a1d01a325383bd79
|
||||
SHA1 (patch-lib_usrp_cores_rx__frontend__core__3000.cpp) = db294105298e598c94525d639f1c2de7e7b22663
|
||||
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_usrp2_usrp2__impl.cpp) = 339feabd4ac7af60e6b7b5be28e386e7ca48f11c
|
||||
SHA1 (patch-lib_usrp_x300_x300__radio__ctrl__impl.cpp) = 2f0c10f2443b6d2f361ee8a9f339b39c9498d2bb
|
||||
BLAKE2s (uhd-4.1.0.4.tar.gz) = e67997ef49c983de8e328e36e7ec8b041b6becc52f39d80d9d01283ec2c069a9
|
||||
SHA512 (uhd-4.1.0.4.tar.gz) = f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6
|
||||
Size (uhd-4.1.0.4.tar.gz) = 37913211 bytes
|
||||
SHA1 (patch-CMakeLists.txt) = 16cc883a0bffdb6c3a4733dda7060bd206928d68
|
||||
SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 5117c7593c4e92ed6bfb86388cc366c41a1dead7
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: patch-CMakeLists.txt,v 1.3 2020/04/08 08:07:17 adam Exp $
|
||||
$NetBSD: patch-CMakeLists.txt,v 1.4 2021/12/11 17:39:56 tnn Exp $
|
||||
|
||||
Allow overrides on PKG_MAN_DIR.
|
||||
https://github.com/EttusResearch/uhd/issues/301
|
||||
|
||||
Do not use Numpy.
|
||||
|
||||
--- CMakeLists.txt.orig 2020-01-01 04:21:49.000000000 +0000
|
||||
--- CMakeLists.txt.orig 2021-09-29 14:25:58.000000000 +0000
|
||||
+++ CMakeLists.txt
|
||||
@@ -124,8 +124,9 @@ endif()
|
||||
if(NOT DEFINED PKG_DOC_DIR)
|
||||
|
|
@ -18,7 +18,7 @@ Do not use Numpy.
|
|||
########################################################################
|
||||
# UHD config files
|
||||
########################################################################
|
||||
@@ -329,11 +330,6 @@ PYTHON_CHECK_MODULE(
|
||||
@@ -327,11 +328,6 @@ PYTHON_CHECK_MODULE(
|
||||
HAVE_PYTHON_MODULE_REQUESTS
|
||||
)
|
||||
|
||||
|
|
@ -28,5 +28,5 @@ Do not use Numpy.
|
|||
- HAVE_PYTHON_MODULE_NUMPY
|
||||
-)
|
||||
|
||||
########################################################################
|
||||
# Create Uninstall Target
|
||||
PYTHON_CHECK_MODULE(
|
||||
"ruamel.yaml ${RUAMEL.YAML_MIN_VERSION} or greater"
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
$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);
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
$NetBSD: patch-lib_transport_nirio_lvbitx_process-lvbitx.py,v 1.1 2019/10/04 10:41:44 adam Exp $
|
||||
$NetBSD: patch-lib_transport_nirio_lvbitx_process-lvbitx.py,v 1.2 2021/12/11 17:39:56 tnn Exp $
|
||||
|
||||
Do not modify output path.
|
||||
|
||||
--- lib/transport/nirio/lvbitx/process-lvbitx.py.orig 2019-10-03 18:11:53.000000000 +0000
|
||||
--- lib/transport/nirio/lvbitx/process-lvbitx.py.orig 2021-09-29 14:25:58.000000000 +0000
|
||||
+++ lib/transport/nirio/lvbitx/process-lvbitx.py
|
||||
@@ -30,7 +30,7 @@ if (len(args) < 1):
|
||||
|
||||
lvbitx_filename = args[0]
|
||||
input_filename = os.path.relpath(lvbitx_filename)
|
||||
-autogen_src_path = os.path.relpath(options.output_src_path) if (options.output_src_path is not None) else os.path.dirname(input_filename)
|
||||
input_filename = os.path.realpath(lvbitx_filename)
|
||||
-autogen_src_path = os.path.realpath(options.output_src_path) if (options.output_src_path is not None) else os.path.dirname(input_filename)
|
||||
+autogen_src_path = options.output_src_path if options.output_src_path is not None else os.path.dirname(input_filename)
|
||||
class_name = os.path.splitext(os.path.basename(input_filename))[0]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
$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
|
||||
|
|
@ -1,211 +0,0 @@
|
|||
$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")){
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_cores_rx__dsp__core__3000.cpp,v 1.2 2021/04/24 16:34:54 tnn Exp $
|
||||
|
||||
libuhd.so.3.15.0: undefined reference to `int boost::math::sign<double>(double const&)'
|
||||
|
||||
--- lib/usrp/cores/rx_dsp_core_3000.cpp.orig 2020-01-01 04:21:49.000000000 +0000
|
||||
+++ lib/usrp/cores/rx_dsp_core_3000.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
|
||||
#include <boost/assign/list_of.hpp>
|
||||
#include <boost/math/special_functions/round.hpp>
|
||||
+#include <boost/math/special_functions/sign.hpp>
|
||||
#include <boost/thread/thread.hpp> //thread sleep
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
@@ -300,10 +301,10 @@ public:
|
||||
.set_publisher(boost::bind(&rx_dsp_core_3000::get_host_rates, this));
|
||||
subtree->create<double>("rate/value")
|
||||
.set(DEFAULT_RATE)
|
||||
- .set_coercer(boost::bind(&rx_dsp_core_3000::set_host_rate, this, _1));
|
||||
+ .set_coercer(boost::bind(&rx_dsp_core_3000::set_host_rate, this, boost::placeholders::_1));
|
||||
subtree->create<double>("freq/value")
|
||||
.set(DEFAULT_CORDIC_FREQ)
|
||||
- .set_coercer(boost::bind(&rx_dsp_core_3000::set_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&rx_dsp_core_3000::set_freq, this, boost::placeholders::_1))
|
||||
.set_publisher([this]() { return this->get_freq(); });
|
||||
subtree->create<meta_range_t>("freq/range")
|
||||
.set_publisher(boost::bind(&rx_dsp_core_3000::get_freq_range, this));
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_cores_rx__frontend__core__3000.cpp,v 1.1 2021/04/24 16:34:54 tnn Exp $
|
||||
|
||||
libuhd.so.3.15.0: undefined reference to `int boost::math::sign<double>(double const&)'
|
||||
|
||||
--- lib/usrp/cores/rx_frontend_core_3000.cpp.orig 2020-01-01 04:21:49.000000000 +0000
|
||||
+++ lib/usrp/cores/rx_frontend_core_3000.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <boost/assign/list_of.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/math/special_functions/round.hpp>
|
||||
+#include <boost/math/special_functions/sign.hpp>
|
||||
|
||||
using namespace uhd;
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_cores_tx__dsp__core__3000.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/cores/tx_dsp_core_3000.cpp.orig 2020-05-09 15:29:07.365961234 +0000
|
||||
+++ lib/usrp/cores/tx_dsp_core_3000.cpp
|
||||
@@ -187,10 +187,10 @@ public:
|
||||
.set_publisher(boost::bind(&tx_dsp_core_3000::get_host_rates, this));
|
||||
subtree->create<double>("rate/value")
|
||||
.set(DEFAULT_RATE)
|
||||
- .set_coercer(boost::bind(&tx_dsp_core_3000::set_host_rate, this, _1));
|
||||
+ .set_coercer(boost::bind(&tx_dsp_core_3000::set_host_rate, this, boost::placeholders::_1));
|
||||
subtree->create<double>("freq/value")
|
||||
.set(DEFAULT_CORDIC_FREQ)
|
||||
- .set_coercer(boost::bind(&tx_dsp_core_3000::set_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&tx_dsp_core_3000::set_freq, this, boost::placeholders::_1))
|
||||
.set_publisher([this]() { return this->get_freq(); });
|
||||
subtree->create<meta_range_t>("freq/range")
|
||||
.set_publisher(boost::bind(&tx_dsp_core_3000::get_freq_range, this));
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__cbx.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_cbx.cpp.orig 2020-05-09 15:39:26.631024880 +0000
|
||||
+++ lib/usrp/dboard/db_cbx.cpp
|
||||
@@ -19,8 +19,8 @@ using namespace boost::assign;
|
||||
sbx_xcvr::cbx::cbx(sbx_xcvr *_self_sbx_xcvr) {
|
||||
//register the handle to our base CBX class
|
||||
self_base = _self_sbx_xcvr;
|
||||
- _txlo = max287x_iface::make<max2870>(boost::bind(&sbx_xcvr::cbx::write_lo_regs, this, dboard_iface::UNIT_TX, _1));
|
||||
- _rxlo = max287x_iface::make<max2870>(boost::bind(&sbx_xcvr::cbx::write_lo_regs, this, dboard_iface::UNIT_RX, _1));
|
||||
+ _txlo = max287x_iface::make<max2870>(boost::bind(&sbx_xcvr::cbx::write_lo_regs, this, dboard_iface::UNIT_TX, boost::placeholders::_1));
|
||||
+ _rxlo = max287x_iface::make<max2870>(boost::bind(&sbx_xcvr::cbx::write_lo_regs, this, dboard_iface::UNIT_RX, boost::placeholders::_1));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__dbsrx.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_dbsrx.cpp.orig 2020-05-09 15:44:27.579328645 +0000
|
||||
+++ lib/usrp/dboard/db_dbsrx.cpp
|
||||
@@ -198,13 +198,13 @@ dbsrx::dbsrx(ctor_args_t args) : rx_dboa
|
||||
.set_publisher(boost::bind(&dbsrx::get_locked, this));
|
||||
for(const std::string &name: dbsrx_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&dbsrx::set_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&dbsrx::set_gain, this, boost::placeholders::_1, name))
|
||||
.set(dbsrx_gain_ranges[name].start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(dbsrx_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&dbsrx::set_lo_freq, this, _1));
|
||||
+ .set_coercer(boost::bind(&dbsrx::set_lo_freq, this, boost::placeholders::_1));
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(dbsrx_freq_range);
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
@@ -218,7 +218,7 @@ dbsrx::dbsrx(ctor_args_t args) : rx_dboa
|
||||
this->get_rx_subtree()->create<bool>("use_lo_offset")
|
||||
.set(false);
|
||||
this->get_rx_subtree()->create<double>("bandwidth/value")
|
||||
- .set_coercer(boost::bind(&dbsrx::set_bandwidth, this, _1));
|
||||
+ .set_coercer(boost::bind(&dbsrx::set_bandwidth, this, boost::placeholders::_1));
|
||||
this->get_rx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
.set(dbsrx_bandwidth_range);
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__dbsrx2.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_dbsrx2.cpp.orig 2020-05-09 15:49:00.790946323 +0000
|
||||
+++ lib/usrp/dboard/db_dbsrx2.cpp
|
||||
@@ -179,13 +179,13 @@ dbsrx2::dbsrx2(ctor_args_t args) : rx_db
|
||||
.set_publisher(boost::bind(&dbsrx2::get_locked, this));
|
||||
for(const std::string &name: dbsrx2_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&dbsrx2::set_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&dbsrx2::set_gain, this, boost::placeholders::_1, name))
|
||||
.set(dbsrx2_gain_ranges[name].start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(dbsrx2_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&dbsrx2::set_lo_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&dbsrx2::set_lo_freq, this, boost::placeholders::_1))
|
||||
.set(dbsrx2_freq_range.start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(dbsrx2_freq_range);
|
||||
@@ -203,7 +203,7 @@ dbsrx2::dbsrx2(ctor_args_t args) : rx_db
|
||||
double codec_rate = this->get_iface()->get_codec_rate(dboard_iface::UNIT_RX);
|
||||
|
||||
this->get_rx_subtree()->create<double>("bandwidth/value")
|
||||
- .set_coercer(boost::bind(&dbsrx2::set_bandwidth, this, _1))
|
||||
+ .set_coercer(boost::bind(&dbsrx2::set_bandwidth, this, boost::placeholders::_1))
|
||||
.set(2.0*(0.8*codec_rate/2.0)); //bandwidth in lowpass, convert to complex bandpass
|
||||
//default to anti-alias at different codec_rate
|
||||
this->get_rx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__rfx.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_rfx.cpp.orig 2020-05-09 15:49:14.740543409 +0000
|
||||
+++ lib/usrp/dboard/db_rfx.cpp
|
||||
@@ -176,17 +176,17 @@ rfx_xcvr::rfx_xcvr(
|
||||
.set_publisher(boost::bind(&rfx_xcvr::get_locked, this, dboard_iface::UNIT_RX));
|
||||
for(const std::string &name: _rx_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&rfx_xcvr::set_rx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&rfx_xcvr::set_rx_gain, this, boost::placeholders::_1, name))
|
||||
.set(_rx_gain_ranges[name].start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(_rx_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&rfx_xcvr::set_lo_freq, this, dboard_iface::UNIT_RX, _1))
|
||||
+ .set_coercer(boost::bind(&rfx_xcvr::set_lo_freq, this, dboard_iface::UNIT_RX, boost::placeholders::_1))
|
||||
.set((_freq_range.start() + _freq_range.stop())/2.0);
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range").set(_freq_range);
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&rfx_xcvr::set_rx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&rfx_xcvr::set_rx_ant, this, boost::placeholders::_1))
|
||||
.set("RX2");
|
||||
this->get_rx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(rfx_rx_antennas);
|
||||
@@ -212,11 +212,11 @@ rfx_xcvr::rfx_xcvr(
|
||||
.set_publisher(boost::bind(&rfx_xcvr::get_locked, this, dboard_iface::UNIT_TX));
|
||||
this->get_tx_subtree()->create<int>("gains"); //phony property so this dir exists
|
||||
this->get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&rfx_xcvr::set_lo_freq, this, dboard_iface::UNIT_TX, _1))
|
||||
+ .set_coercer(boost::bind(&rfx_xcvr::set_lo_freq, this, dboard_iface::UNIT_TX, boost::placeholders::_1))
|
||||
.set((_freq_range.start() + _freq_range.stop())/2.0);
|
||||
this->get_tx_subtree()->create<meta_range_t>("freq/range").set(_freq_range);
|
||||
this->get_tx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&rfx_xcvr::set_tx_ant, this, _1)).set(rfx_tx_antennas.at(0));
|
||||
+ .add_coerced_subscriber(boost::bind(&rfx_xcvr::set_tx_ant, this, boost::placeholders::_1)).set(rfx_tx_antennas.at(0));
|
||||
this->get_tx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(rfx_tx_antennas);
|
||||
this->get_tx_subtree()->create<std::string>("connection").set("IQ");
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__sbx__common.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_sbx_common.cpp.orig 2020-05-09 15:36:12.520397133 +0000
|
||||
+++ lib/usrp/dboard/db_sbx_common.cpp
|
||||
@@ -149,17 +149,17 @@ sbx_xcvr::sbx_xcvr(ctor_args_t args) : x
|
||||
.set_publisher(boost::bind(&sbx_xcvr::get_locked, this, dboard_iface::UNIT_RX));
|
||||
for(const std::string &name: sbx_rx_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&sbx_xcvr::set_rx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&sbx_xcvr::set_rx_gain, this, boost::placeholders::_1, name))
|
||||
.set(sbx_rx_gain_ranges[name].start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(sbx_rx_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&sbx_xcvr::set_lo_freq, this, dboard_iface::UNIT_RX, _1))
|
||||
+ .set_coercer(boost::bind(&sbx_xcvr::set_lo_freq, this, dboard_iface::UNIT_RX, boost::placeholders::_1))
|
||||
.set((freq_range.start() + freq_range.stop())/2.0);
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range").set(freq_range);
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&sbx_xcvr::set_rx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&sbx_xcvr::set_rx_ant, this, boost::placeholders::_1))
|
||||
.set("RX2");
|
||||
this->get_rx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(sbx_rx_antennas);
|
||||
@@ -190,17 +190,17 @@ sbx_xcvr::sbx_xcvr(ctor_args_t args) : x
|
||||
.set_publisher(boost::bind(&sbx_xcvr::get_locked, this, dboard_iface::UNIT_TX));
|
||||
for(const std::string &name: sbx_tx_gain_ranges.keys()){
|
||||
this->get_tx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&sbx_xcvr::set_tx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&sbx_xcvr::set_tx_gain, this, boost::placeholders::_1, name))
|
||||
.set(sbx_tx_gain_ranges[name].start());
|
||||
this->get_tx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(sbx_tx_gain_ranges[name]);
|
||||
}
|
||||
this->get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&sbx_xcvr::set_lo_freq, this, dboard_iface::UNIT_TX, _1))
|
||||
+ .set_coercer(boost::bind(&sbx_xcvr::set_lo_freq, this, dboard_iface::UNIT_TX, boost::placeholders::_1))
|
||||
.set((freq_range.start() + freq_range.stop())/2.0);
|
||||
this->get_tx_subtree()->create<meta_range_t>("freq/range").set(freq_range);
|
||||
this->get_tx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&sbx_xcvr::set_tx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&sbx_xcvr::set_tx_ant, this, boost::placeholders::_1))
|
||||
.set(sbx_tx_antennas.at(0));
|
||||
this->get_tx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(sbx_tx_antennas);
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__sbx__version3.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_sbx_version3.cpp.orig 2020-05-09 15:37:17.228299743 +0000
|
||||
+++ lib/usrp/dboard/db_sbx_version3.cpp
|
||||
@@ -20,8 +20,8 @@ using namespace boost::assign;
|
||||
sbx_xcvr::sbx_version3::sbx_version3(sbx_xcvr *_self_sbx_xcvr) {
|
||||
//register the handle to our base SBX class
|
||||
self_base = _self_sbx_xcvr;
|
||||
- _txlo = adf435x_iface::make_adf4350(boost::bind(&sbx_xcvr::sbx_version3::write_lo_regs, this, dboard_iface::UNIT_TX, _1));
|
||||
- _rxlo = adf435x_iface::make_adf4350(boost::bind(&sbx_xcvr::sbx_version3::write_lo_regs, this, dboard_iface::UNIT_RX, _1));
|
||||
+ _txlo = adf435x_iface::make_adf4350(boost::bind(&sbx_xcvr::sbx_version3::write_lo_regs, this, dboard_iface::UNIT_TX, boost::placeholders::_1));
|
||||
+ _rxlo = adf435x_iface::make_adf4350(boost::bind(&sbx_xcvr::sbx_version3::write_lo_regs, this, dboard_iface::UNIT_RX, boost::placeholders::_1));
|
||||
}
|
||||
|
||||
sbx_xcvr::sbx_version3::~sbx_version3(void){
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__sbx__version4.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_sbx_version4.cpp.orig 2020-05-09 15:38:28.873157679 +0000
|
||||
+++ lib/usrp/dboard/db_sbx_version4.cpp
|
||||
@@ -20,8 +20,8 @@ using namespace boost::assign;
|
||||
sbx_xcvr::sbx_version4::sbx_version4(sbx_xcvr *_self_sbx_xcvr) {
|
||||
//register the handle to our base SBX class
|
||||
self_base = _self_sbx_xcvr;
|
||||
- _txlo = adf435x_iface::make_adf4351(boost::bind(&sbx_xcvr::sbx_version4::write_lo_regs, this, dboard_iface::UNIT_TX, _1));
|
||||
- _rxlo = adf435x_iface::make_adf4351(boost::bind(&sbx_xcvr::sbx_version4::write_lo_regs, this, dboard_iface::UNIT_RX, _1));
|
||||
+ _txlo = adf435x_iface::make_adf4351(boost::bind(&sbx_xcvr::sbx_version4::write_lo_regs, this, dboard_iface::UNIT_TX, boost::placeholders::_1));
|
||||
+ _rxlo = adf435x_iface::make_adf4351(boost::bind(&sbx_xcvr::sbx_version4::write_lo_regs, this, dboard_iface::UNIT_RX, boost::placeholders::_1));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__tvrx.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_tvrx.cpp.orig 2020-05-09 15:47:27.655845074 +0000
|
||||
+++ lib/usrp/dboard/db_tvrx.cpp
|
||||
@@ -180,12 +180,12 @@ tvrx::tvrx(ctor_args_t args) : rx_dboard
|
||||
this->get_rx_subtree()->create<int>("sensors"); //phony property so this dir exists
|
||||
for(const std::string &name: get_tvrx_gain_ranges().keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&tvrx::set_gain, this, _1, name));
|
||||
+ .set_coercer(boost::bind(&tvrx::set_gain, this, boost::placeholders::_1, name));
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(get_tvrx_gain_ranges()[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&tvrx::set_freq, this, _1));
|
||||
+ .set_coercer(boost::bind(&tvrx::set_freq, this, boost::placeholders::_1));
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(tvrx_freq_range);
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__tvrx2.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_tvrx2.cpp.orig 2020-05-09 15:49:26.498190121 +0000
|
||||
+++ lib/usrp/dboard/db_tvrx2.cpp
|
||||
@@ -958,12 +958,12 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboa
|
||||
.set_publisher(boost::bind(&tvrx2::get_temp, this));
|
||||
for(const std::string &name: tvrx2_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&tvrx2::set_gain, this, _1, name));
|
||||
+ .set_coercer(boost::bind(&tvrx2::set_gain, this, boost::placeholders::_1, name));
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(tvrx2_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&tvrx2::set_lo_freq, this, _1));
|
||||
+ .set_coercer(boost::bind(&tvrx2::set_lo_freq, this, boost::placeholders::_1));
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(tvrx2_freq_range);
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
@@ -973,12 +973,12 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboa
|
||||
this->get_rx_subtree()->create<std::string>("connection")
|
||||
.set(tvrx2_sd_name_to_conn[get_subdev_name()]);
|
||||
this->get_rx_subtree()->create<bool>("enabled")
|
||||
- .set_coercer(boost::bind(&tvrx2::set_enabled, this, _1))
|
||||
+ .set_coercer(boost::bind(&tvrx2::set_enabled, this, boost::placeholders::_1))
|
||||
.set(_enabled);
|
||||
this->get_rx_subtree()->create<bool>("use_lo_offset")
|
||||
.set(false);
|
||||
this->get_rx_subtree()->create<double>("bandwidth/value")
|
||||
- .set_coercer(boost::bind(&tvrx2::set_bandwidth, this, _1))
|
||||
+ .set_coercer(boost::bind(&tvrx2::set_bandwidth, this, boost::placeholders::_1))
|
||||
.set(_bandwidth);
|
||||
this->get_rx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
.set(tvrx2_bandwidth_range);
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__ubx.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_ubx.cpp.orig 2020-05-09 15:40:25.281970601 +0000
|
||||
+++ lib/usrp/dboard/db_ubx.cpp
|
||||
@@ -395,10 +395,10 @@ public:
|
||||
// Initialize LOs
|
||||
if (_rev == 0)
|
||||
{
|
||||
- _txlo1 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO1, _1));
|
||||
- _txlo2 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO2, _1));
|
||||
- _rxlo1 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO1, _1));
|
||||
- _rxlo2 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO2, _1));
|
||||
+ _txlo1 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO1, boost::placeholders::_1));
|
||||
+ _txlo2 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO2, boost::placeholders::_1));
|
||||
+ _rxlo1 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO1, boost::placeholders::_1));
|
||||
+ _rxlo2 = max287x_iface::make<max2870>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO2, boost::placeholders::_1));
|
||||
std::vector<max287x_iface::sptr> los{_txlo1, _txlo2, _rxlo1, _rxlo2};
|
||||
for(max287x_iface::sptr lo: los)
|
||||
{
|
||||
@@ -409,10 +409,10 @@ public:
|
||||
}
|
||||
else if (_rev == 1 or _rev == 2)
|
||||
{
|
||||
- _txlo1 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO1, _1));
|
||||
- _txlo2 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO2, _1));
|
||||
- _rxlo1 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO1, _1));
|
||||
- _rxlo2 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO2, _1));
|
||||
+ _txlo1 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO1, boost::placeholders::_1));
|
||||
+ _txlo2 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, TXLO2, boost::placeholders::_1));
|
||||
+ _rxlo1 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO1, boost::placeholders::_1));
|
||||
+ _rxlo2 = max287x_iface::make<max2871>(boost::bind(&ubx_xcvr::write_spi_regs, this, RXLO2, boost::placeholders::_1));
|
||||
std::vector<max287x_iface::sptr> los{_txlo1, _txlo2, _rxlo1, _rxlo2};
|
||||
for(max287x_iface::sptr lo: los)
|
||||
{
|
||||
@@ -439,12 +439,12 @@ public:
|
||||
get_rx_subtree()->create<std::vector<std::string> >("power_mode/options")
|
||||
.set(ubx_power_modes);
|
||||
get_rx_subtree()->create<std::string>("power_mode/value")
|
||||
- .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_power_mode, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_power_mode, this, boost::placeholders::_1))
|
||||
.set("performance");
|
||||
get_rx_subtree()->create<std::vector<std::string> >("xcvr_mode/options")
|
||||
.set(ubx_xcvr_modes);
|
||||
get_rx_subtree()->create<std::string>("xcvr_mode/value")
|
||||
- .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_xcvr_mode, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_xcvr_mode, this, boost::placeholders::_1))
|
||||
.set("FDX");
|
||||
get_rx_subtree()->create<std::vector<std::string> >("temp_comp_mode/options")
|
||||
.set(ubx_temp_comp_modes);
|
||||
@@ -456,12 +456,12 @@ public:
|
||||
get_tx_subtree()->create<std::vector<std::string> >("power_mode/options")
|
||||
.set(ubx_power_modes);
|
||||
get_tx_subtree()->create<std::string>("power_mode/value")
|
||||
- .add_coerced_subscriber(boost::bind(&uhd::property<std::string>::set, &get_rx_subtree()->access<std::string>("power_mode/value"), _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&uhd::property<std::string>::set, &get_rx_subtree()->access<std::string>("power_mode/value"), boost::placeholders::_1))
|
||||
.set_publisher(boost::bind(&uhd::property<std::string>::get, &get_rx_subtree()->access<std::string>("power_mode/value")));
|
||||
get_tx_subtree()->create<std::vector<std::string> >("xcvr_mode/options")
|
||||
.set(ubx_xcvr_modes);
|
||||
get_tx_subtree()->create<std::string>("xcvr_mode/value")
|
||||
- .add_coerced_subscriber(boost::bind(&uhd::property<std::string>::set, &get_rx_subtree()->access<std::string>("xcvr_mode/value"), _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&uhd::property<std::string>::set, &get_rx_subtree()->access<std::string>("xcvr_mode/value"), boost::placeholders::_1))
|
||||
.set_publisher(boost::bind(&uhd::property<std::string>::get, &get_rx_subtree()->access<std::string>("xcvr_mode/value")));
|
||||
get_tx_subtree()->create<std::vector<std::string> >("temp_comp_mode/options")
|
||||
.set(ubx_temp_comp_modes);
|
||||
@@ -488,18 +488,18 @@ public:
|
||||
get_tx_subtree()->create<sensor_value_t>("sensors/lo_locked")
|
||||
.set_publisher(boost::bind(&ubx_xcvr::get_locked, this, "TXLO"));
|
||||
get_tx_subtree()->create<double>("gains/PGA0/value")
|
||||
- .set_coercer(boost::bind(&ubx_xcvr::set_tx_gain, this, _1)).set(0);
|
||||
+ .set_coercer(boost::bind(&ubx_xcvr::set_tx_gain, this, boost::placeholders::_1)).set(0);
|
||||
get_tx_subtree()->create<meta_range_t>("gains/PGA0/range")
|
||||
.set(ubx_tx_gain_range);
|
||||
get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&ubx_xcvr::set_tx_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&ubx_xcvr::set_tx_freq, this, boost::placeholders::_1))
|
||||
.set(ubx_freq_range.start());
|
||||
get_tx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(ubx_freq_range);
|
||||
get_tx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(ubx_tx_antennas);
|
||||
get_tx_subtree()->create<std::string>("antenna/value")
|
||||
- .set_coercer(boost::bind(&ubx_xcvr::set_tx_ant, this, _1))
|
||||
+ .set_coercer(boost::bind(&ubx_xcvr::set_tx_ant, this, boost::placeholders::_1))
|
||||
.set(ubx_tx_antennas.at(0));
|
||||
get_tx_subtree()->create<std::string>("connection")
|
||||
.set("QI");
|
||||
@@ -512,7 +512,7 @@ public:
|
||||
get_tx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
.set(freq_range_t(bw, bw));
|
||||
get_tx_subtree()->create<int64_t>("sync_delay")
|
||||
- .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_sync_delay, this, true, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_sync_delay, this, true, boost::placeholders::_1))
|
||||
.set(0);
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
@@ -524,19 +524,19 @@ public:
|
||||
get_rx_subtree()->create<sensor_value_t>("sensors/lo_locked")
|
||||
.set_publisher(boost::bind(&ubx_xcvr::get_locked, this, "RXLO"));
|
||||
get_rx_subtree()->create<double>("gains/PGA0/value")
|
||||
- .set_coercer(boost::bind(&ubx_xcvr::set_rx_gain, this, _1))
|
||||
+ .set_coercer(boost::bind(&ubx_xcvr::set_rx_gain, this, boost::placeholders::_1))
|
||||
.set(0);
|
||||
get_rx_subtree()->create<meta_range_t>("gains/PGA0/range")
|
||||
.set(ubx_rx_gain_range);
|
||||
get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&ubx_xcvr::set_rx_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&ubx_xcvr::set_rx_freq, this, boost::placeholders::_1))
|
||||
.set(ubx_freq_range.start());
|
||||
get_rx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(ubx_freq_range);
|
||||
get_rx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(ubx_rx_antennas);
|
||||
get_rx_subtree()->create<std::string>("antenna/value")
|
||||
- .set_coercer(boost::bind(&ubx_xcvr::set_rx_ant, this, _1)).set("RX2");
|
||||
+ .set_coercer(boost::bind(&ubx_xcvr::set_rx_ant, this, boost::placeholders::_1)).set("RX2");
|
||||
get_rx_subtree()->create<std::string>("connection")
|
||||
.set("IQ");
|
||||
get_rx_subtree()->create<bool>("enabled")
|
||||
@@ -548,7 +548,7 @@ public:
|
||||
get_rx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
.set(freq_range_t(bw, bw));
|
||||
get_rx_subtree()->create<int64_t>("sync_delay")
|
||||
- .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_sync_delay, this, false, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&ubx_xcvr::set_sync_delay, this, false, boost::placeholders::_1))
|
||||
.set(0);
|
||||
}
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__wbx__common.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_wbx_common.cpp.orig 2020-05-09 15:50:03.270707228 +0000
|
||||
+++ lib/usrp/dboard/db_wbx_common.cpp
|
||||
@@ -62,14 +62,14 @@ wbx_base::wbx_base(ctor_args_t args) : x
|
||||
.set_publisher(boost::bind(&wbx_base::get_locked, this, dboard_iface::UNIT_RX));
|
||||
for(const std::string &name: wbx_rx_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::set_rx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&wbx_base::set_rx_gain, this, boost::placeholders::_1, name))
|
||||
.set(wbx_rx_gain_ranges[name].start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(wbx_rx_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<std::string>("connection").set("IQ");
|
||||
this->get_rx_subtree()->create<bool>("enabled")
|
||||
- .add_coerced_subscriber(boost::bind(&wbx_base::set_rx_enabled, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&wbx_base::set_rx_enabled, this, boost::placeholders::_1))
|
||||
.set(true); //start enabled
|
||||
this->get_rx_subtree()->create<bool>("use_lo_offset").set(false);
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__wbx__simple.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_wbx_simple.cpp.orig 2020-05-09 15:49:57.928917699 +0000
|
||||
+++ lib/usrp/dboard/db_wbx_simple.cpp
|
||||
@@ -78,7 +78,7 @@ wbx_simple::wbx_simple(ctor_args_t args)
|
||||
std::string(str(boost::format("%s+GDB") % this->get_rx_subtree()->access<std::string>("name").get()
|
||||
)));
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&wbx_simple::set_rx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&wbx_simple::set_rx_ant, this, boost::placeholders::_1))
|
||||
.set("RX2");
|
||||
this->get_rx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(wbx_rx_antennas);
|
||||
@@ -90,7 +90,7 @@ wbx_simple::wbx_simple(ctor_args_t args)
|
||||
std::string(str(boost::format("%s+GDB") % this->get_tx_subtree()->access<std::string>("name").get()
|
||||
)));
|
||||
this->get_tx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&wbx_simple::set_tx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&wbx_simple::set_tx_ant, this, boost::placeholders::_1))
|
||||
.set(wbx_tx_antennas.at(0));
|
||||
this->get_tx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(wbx_tx_antennas);
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__wbx__version2.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_wbx_version2.cpp.orig 2020-05-09 15:49:51.620204930 +0000
|
||||
+++ lib/usrp/dboard/db_wbx_version2.cpp
|
||||
@@ -65,15 +65,15 @@ static double tx_pga0_gain_to_dac_volts(
|
||||
wbx_base::wbx_version2::wbx_version2(wbx_base *_self_wbx_base) {
|
||||
//register our handle on the primary wbx_base instance
|
||||
self_base = _self_wbx_base;
|
||||
- _txlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_TX, _1));
|
||||
- _rxlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_RX, _1));
|
||||
+ _txlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_TX, boost::placeholders::_1));
|
||||
+ _rxlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_RX, boost::placeholders::_1));
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Register RX properties
|
||||
////////////////////////////////////////////////////////////////////
|
||||
this->get_rx_subtree()->create<std::string>("name").set("WBXv2 RX");
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version2::set_lo_freq, this, dboard_iface::UNIT_RX, _1))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version2::set_lo_freq, this, dboard_iface::UNIT_RX, boost::placeholders::_1))
|
||||
.set((wbx_v2_freq_range.start() + wbx_v2_freq_range.stop())/2.0);
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range").set(wbx_v2_freq_range);
|
||||
|
||||
@@ -83,17 +83,17 @@ wbx_base::wbx_version2::wbx_version2(wbx
|
||||
this->get_tx_subtree()->create<std::string>("name").set("WBXv2 TX");
|
||||
for(const std::string &name: wbx_v2_tx_gain_ranges.keys()){
|
||||
self_base->get_tx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version2::set_tx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version2::set_tx_gain, this, boost::placeholders::_1, name))
|
||||
.set(wbx_v2_tx_gain_ranges[name].start());
|
||||
self_base->get_tx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(wbx_v2_tx_gain_ranges[name]);
|
||||
}
|
||||
this->get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version2::set_lo_freq, this, dboard_iface::UNIT_TX, _1))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version2::set_lo_freq, this, dboard_iface::UNIT_TX, boost::placeholders::_1))
|
||||
.set((wbx_v2_freq_range.start() + wbx_v2_freq_range.stop())/2.0);
|
||||
this->get_tx_subtree()->create<meta_range_t>("freq/range").set(wbx_v2_freq_range);
|
||||
this->get_tx_subtree()->create<bool>("enabled")
|
||||
- .add_coerced_subscriber(boost::bind(&wbx_base::wbx_version2::set_tx_enabled, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&wbx_base::wbx_version2::set_tx_enabled, this, boost::placeholders::_1))
|
||||
.set(true); //start enabled
|
||||
|
||||
//set attenuator control bits
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__wbx__version3.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_wbx_version3.cpp.orig 2020-05-09 15:49:45.866944459 +0000
|
||||
+++ lib/usrp/dboard/db_wbx_version3.cpp
|
||||
@@ -70,15 +70,15 @@ static int tx_pga0_gain_to_iobits(double
|
||||
wbx_base::wbx_version3::wbx_version3(wbx_base *_self_wbx_base) {
|
||||
//register our handle on the primary wbx_base instance
|
||||
self_base = _self_wbx_base;
|
||||
- _txlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_TX, _1));
|
||||
- _rxlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_RX, _1));
|
||||
+ _txlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_TX, boost::placeholders::_1));
|
||||
+ _rxlo = adf435x_iface::make_adf4350(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_RX, boost::placeholders::_1));
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Register RX properties
|
||||
////////////////////////////////////////////////////////////////////
|
||||
this->get_rx_subtree()->create<std::string>("name").set("WBXv3 RX");
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version3::set_lo_freq, this, dboard_iface::UNIT_RX, _1))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version3::set_lo_freq, this, dboard_iface::UNIT_RX, boost::placeholders::_1))
|
||||
.set((wbx_v3_freq_range.start() + wbx_v3_freq_range.stop())/2.0);
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range").set(wbx_v3_freq_range);
|
||||
|
||||
@@ -88,17 +88,17 @@ wbx_base::wbx_version3::wbx_version3(wbx
|
||||
this->get_tx_subtree()->create<std::string>("name").set("WBXv3 TX");
|
||||
for(const std::string &name: wbx_v3_tx_gain_ranges.keys()){
|
||||
self_base->get_tx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version3::set_tx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version3::set_tx_gain, this, boost::placeholders::_1, name))
|
||||
.set(wbx_v3_tx_gain_ranges[name].start());
|
||||
self_base->get_tx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(wbx_v3_tx_gain_ranges[name]);
|
||||
}
|
||||
this->get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version3::set_lo_freq, this, dboard_iface::UNIT_TX, _1))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version3::set_lo_freq, this, dboard_iface::UNIT_TX, boost::placeholders::_1))
|
||||
.set((wbx_v3_freq_range.start() + wbx_v3_freq_range.stop())/2.0);
|
||||
this->get_tx_subtree()->create<meta_range_t>("freq/range").set(wbx_v3_freq_range);
|
||||
this->get_tx_subtree()->create<bool>("enabled")
|
||||
- .add_coerced_subscriber(boost::bind(&wbx_base::wbx_version3::set_tx_enabled, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&wbx_base::wbx_version3::set_tx_enabled, this, boost::placeholders::_1))
|
||||
.set(true); //start enabled
|
||||
|
||||
//set attenuator control bits
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__wbx__version4.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_wbx_version4.cpp.orig 2020-05-09 15:49:39.733159439 +0000
|
||||
+++ lib/usrp/dboard/db_wbx_version4.cpp
|
||||
@@ -71,8 +71,8 @@ static int tx_pga0_gain_to_iobits(double
|
||||
wbx_base::wbx_version4::wbx_version4(wbx_base *_self_wbx_base) {
|
||||
//register our handle on the primary wbx_base instance
|
||||
self_base = _self_wbx_base;
|
||||
- _txlo = adf435x_iface::make_adf4351(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_TX, _1));
|
||||
- _rxlo = adf435x_iface::make_adf4351(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_RX, _1));
|
||||
+ _txlo = adf435x_iface::make_adf4351(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_TX, boost::placeholders::_1));
|
||||
+ _rxlo = adf435x_iface::make_adf4351(boost::bind(&wbx_base::wbx_versionx::write_lo_regs, this, dboard_iface::UNIT_RX, boost::placeholders::_1));
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Register RX properties
|
||||
@@ -82,7 +82,7 @@ wbx_base::wbx_version4::wbx_version4(wbx
|
||||
if(rx_id == 0x0063) this->get_rx_subtree()->create<std::string>("name").set("WBXv4 RX");
|
||||
else if(rx_id == 0x0081) this->get_rx_subtree()->create<std::string>("name").set("WBX-120 RX");
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version4::set_lo_freq, this, dboard_iface::UNIT_RX, _1))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version4::set_lo_freq, this, dboard_iface::UNIT_RX, boost::placeholders::_1))
|
||||
.set((wbx_v4_freq_range.start() + wbx_v4_freq_range.stop())/2.0);
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range").set(wbx_v4_freq_range);
|
||||
|
||||
@@ -95,17 +95,17 @@ wbx_base::wbx_version4::wbx_version4(wbx
|
||||
else if(rx_id == 0x0081) this->get_tx_subtree()->create<std::string>("name").set("WBX-120 TX");
|
||||
for(const std::string &name: wbx_v4_tx_gain_ranges.keys()){
|
||||
self_base->get_tx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version4::set_tx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version4::set_tx_gain, this, boost::placeholders::_1, name))
|
||||
.set(wbx_v4_tx_gain_ranges[name].start());
|
||||
self_base->get_tx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(wbx_v4_tx_gain_ranges[name]);
|
||||
}
|
||||
this->get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&wbx_base::wbx_version4::set_lo_freq, this, dboard_iface::UNIT_TX, _1))
|
||||
+ .set_coercer(boost::bind(&wbx_base::wbx_version4::set_lo_freq, this, dboard_iface::UNIT_TX, boost::placeholders::_1))
|
||||
.set((wbx_v4_freq_range.start() + wbx_v4_freq_range.stop())/2.0);
|
||||
this->get_tx_subtree()->create<meta_range_t>("freq/range").set(wbx_v4_freq_range);
|
||||
this->get_tx_subtree()->create<bool>("enabled")
|
||||
- .add_coerced_subscriber(boost::bind(&wbx_base::wbx_version4::set_tx_enabled, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&wbx_base::wbx_version4::set_tx_enabled, this, boost::placeholders::_1))
|
||||
.set(true); //start enabled
|
||||
|
||||
//set attenuator control bits
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_db__xcvr2450.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/db_xcvr2450.cpp.orig 2020-05-09 15:31:27.549815118 +0000
|
||||
+++ lib/usrp/dboard/db_xcvr2450.cpp
|
||||
@@ -227,18 +227,18 @@ xcvr2450::xcvr2450(ctor_args_t args) : x
|
||||
.set_publisher(boost::bind(&xcvr2450::get_rssi, this));
|
||||
for(const std::string &name: xcvr_rx_gain_ranges.keys()){
|
||||
this->get_rx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&xcvr2450::set_rx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&xcvr2450::set_rx_gain, this, boost::placeholders::_1, name))
|
||||
.set(xcvr_rx_gain_ranges[name].start());
|
||||
this->get_rx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(xcvr_rx_gain_ranges[name]);
|
||||
}
|
||||
this->get_rx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&xcvr2450::set_lo_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&xcvr2450::set_lo_freq, this, boost::placeholders::_1))
|
||||
.set(double(2.45e9));
|
||||
this->get_rx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(xcvr_freq_range);
|
||||
this->get_rx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&xcvr2450::set_rx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&xcvr2450::set_rx_ant, this, boost::placeholders::_1))
|
||||
.set(xcvr_antennas.at(0));
|
||||
this->get_rx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(xcvr_antennas);
|
||||
@@ -249,7 +249,7 @@ xcvr2450::xcvr2450(ctor_args_t args) : x
|
||||
this->get_rx_subtree()->create<bool>("use_lo_offset")
|
||||
.set(false);
|
||||
this->get_rx_subtree()->create<double>("bandwidth/value")
|
||||
- .set_coercer(boost::bind(&xcvr2450::set_rx_bandwidth, this, _1)) //complex bandpass bandwidth
|
||||
+ .set_coercer(boost::bind(&xcvr2450::set_rx_bandwidth, this, boost::placeholders::_1)) //complex bandpass bandwidth
|
||||
.set(2.0*_rx_bandwidth); //_rx_bandwidth in lowpass, convert to complex bandpass
|
||||
this->get_rx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
.set(xcvr_rx_bandwidth_range);
|
||||
@@ -263,18 +263,18 @@ xcvr2450::xcvr2450(ctor_args_t args) : x
|
||||
.set_publisher(boost::bind(&xcvr2450::get_locked, this));
|
||||
for(const std::string &name: xcvr_tx_gain_ranges.keys()){
|
||||
this->get_tx_subtree()->create<double>("gains/"+name+"/value")
|
||||
- .set_coercer(boost::bind(&xcvr2450::set_tx_gain, this, _1, name))
|
||||
+ .set_coercer(boost::bind(&xcvr2450::set_tx_gain, this, boost::placeholders::_1, name))
|
||||
.set(xcvr_tx_gain_ranges[name].start());
|
||||
this->get_tx_subtree()->create<meta_range_t>("gains/"+name+"/range")
|
||||
.set(xcvr_tx_gain_ranges[name]);
|
||||
}
|
||||
this->get_tx_subtree()->create<double>("freq/value")
|
||||
- .set_coercer(boost::bind(&xcvr2450::set_lo_freq, this, _1))
|
||||
+ .set_coercer(boost::bind(&xcvr2450::set_lo_freq, this, boost::placeholders::_1))
|
||||
.set(double(2.45e9));
|
||||
this->get_tx_subtree()->create<meta_range_t>("freq/range")
|
||||
.set(xcvr_freq_range);
|
||||
this->get_tx_subtree()->create<std::string>("antenna/value")
|
||||
- .add_coerced_subscriber(boost::bind(&xcvr2450::set_tx_ant, this, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&xcvr2450::set_tx_ant, this, boost::placeholders::_1))
|
||||
.set(xcvr_antennas.at(1));
|
||||
this->get_tx_subtree()->create<std::vector<std::string> >("antenna/options")
|
||||
.set(xcvr_antennas);
|
||||
@@ -285,7 +285,7 @@ xcvr2450::xcvr2450(ctor_args_t args) : x
|
||||
this->get_tx_subtree()->create<bool>("use_lo_offset")
|
||||
.set(false);
|
||||
this->get_tx_subtree()->create<double>("bandwidth/value")
|
||||
- .set_coercer(boost::bind(&xcvr2450::set_tx_bandwidth, this, _1)) //complex bandpass bandwidth
|
||||
+ .set_coercer(boost::bind(&xcvr2450::set_tx_bandwidth, this, boost::placeholders::_1)) //complex bandpass bandwidth
|
||||
.set(2.0*_tx_bandwidth); //_tx_bandwidth in lowpass, convert to complex bandpass
|
||||
this->get_tx_subtree()->create<meta_range_t>("bandwidth/range")
|
||||
.set(xcvr_tx_bandwidth_range);
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_dboard_eiscat_eiscat__radio__ctrl__impl.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp.orig 2020-05-09 15:49:34.413319138 +0000
|
||||
+++ lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp
|
||||
@@ -301,7 +301,7 @@ UHD_RFNOC_RADIO_BLOCK_CONSTRUCTOR(eiscat
|
||||
UHD_ASSERT_THROW(not _tree->exists("tick_rate"));
|
||||
_tree->create<double>("tick_rate")
|
||||
.set(EISCAT_TICK_RATE)
|
||||
- .set_coercer(boost::bind(&eiscat_radio_ctrl_impl::set_rate, this, _1))
|
||||
+ .set_coercer(boost::bind(&eiscat_radio_ctrl_impl::set_rate, this, boost::placeholders::_1))
|
||||
;
|
||||
}
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_multi__usrp.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/multi_usrp.cpp.orig 2020-05-09 15:19:48.569394841 +0000
|
||||
+++ lib/usrp/multi_usrp.cpp
|
||||
@@ -216,7 +216,7 @@ static gain_fcns_t make_gain_fcns_from_s
|
||||
gain_fcns_t gain_fcns;
|
||||
gain_fcns.get_range = boost::bind(&get_gain_range, subtree);
|
||||
gain_fcns.get_value = boost::bind(&get_gain_value, subtree);
|
||||
- gain_fcns.set_value = boost::bind(&set_gain_value, subtree, _1);
|
||||
+ gain_fcns.set_value = boost::bind(&set_gain_value, subtree, boost::placeholders::_1);
|
||||
return gain_fcns;
|
||||
}
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_usrp2_usrp2__impl.cpp,v 1.1 2021/04/24 16:34:54 tnn Exp $
|
||||
|
||||
libuhd.so.3.15.0: undefined reference to `int boost::math::sign<double>(double const&)'
|
||||
|
||||
--- lib/usrp/usrp2/usrp2_impl.cpp.orig 2020-01-01 04:21:49.000000000 +0000
|
||||
+++ lib/usrp/usrp2/usrp2_impl.cpp
|
||||
@@ -835,6 +835,9 @@ void usrp2_impl::set_tx_fe_corrections(c
|
||||
}
|
||||
}
|
||||
|
||||
+#include <boost/math/special_functions/round.hpp>
|
||||
+#include <boost/math/special_functions/sign.hpp>
|
||||
+
|
||||
double usrp2_impl::set_tx_dsp_freq(
|
||||
const std::string &mb,
|
||||
const double freq_
|
||||
@@ -878,8 +881,6 @@ meta_range_t usrp2_impl::get_tx_dsp_freq
|
||||
);
|
||||
}
|
||||
|
||||
-#include <boost/math/special_functions/round.hpp>
|
||||
-#include <boost/math/special_functions/sign.hpp>
|
||||
|
||||
void usrp2_impl::update_clock_source(const std::string &mb, const std::string &source){
|
||||
//NOTICE: U2_REG_MISC_CTRL_CLOCK is on the wb clock, and cannot be set from fifo_ctrl
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
$NetBSD: patch-lib_usrp_x300_x300__radio__ctrl__impl.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $
|
||||
|
||||
--- lib/usrp/x300/x300_radio_ctrl_impl.cpp.orig 2020-05-09 16:48:46.365817291 +0000
|
||||
+++ lib/usrp/x300/x300_radio_ctrl_impl.cpp
|
||||
@@ -151,7 +151,7 @@ UHD_RFNOC_RADIO_BLOCK_CONSTRUCTOR(x300_r
|
||||
_tree->create<meta_range_t>("rx_codecs" / _radio_slot / "gains" / "digital" / "range")
|
||||
.set(meta_range_t(0, 6.0, 0.5));
|
||||
_tree->create<double>("rx_codecs" / _radio_slot / "gains" / "digital" / "value")
|
||||
- .add_coerced_subscriber(boost::bind(&x300_adc_ctrl::set_gain, _adc, _1))
|
||||
+ .add_coerced_subscriber(boost::bind(&x300_adc_ctrl::set_gain, _adc, boost::placeholders::_1))
|
||||
.set(0);
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
@@ -187,7 +187,7 @@ UHD_RFNOC_RADIO_BLOCK_CONSTRUCTOR(x300_r
|
||||
if (_tree->exists(fs_path("time") / "cmd")) {
|
||||
_tree->access<time_spec_t>(fs_path("time") / "cmd")
|
||||
.add_coerced_subscriber(
|
||||
- boost::bind(&x300_radio_ctrl_impl::set_fe_cmd_time, this, _1, i));
|
||||
+ boost::bind(&x300_radio_ctrl_impl::set_fe_cmd_time, this, boost::placeholders::_1, i));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -820,7 +820,7 @@ void x300_radio_ctrl_impl::setup_radio(u
|
||||
this,
|
||||
zpu_i2c,
|
||||
(BASE_ADDR | addr),
|
||||
- _1));
|
||||
+ boost::placeholders::_1));
|
||||
}
|
||||
|
||||
// create a new dboard interface
|
||||
@@ -894,7 +894,7 @@ void x300_radio_ctrl_impl::setup_radio(u
|
||||
/ _rx_fe_map[i].db_fe_name / "antenna"
|
||||
/ "value")
|
||||
.add_desired_subscriber(boost::bind(
|
||||
- &x300_radio_ctrl_impl::_update_atr_leds, this, _1, i));
|
||||
+ &x300_radio_ctrl_impl::_update_atr_leds, this, boost::placeholders::_1, i));
|
||||
_update_atr_leds(_tree
|
||||
->access<std::string>(db_path / "rx_frontends"
|
||||
/ _rx_fe_map[i].db_fe_name
|
||||
@@ -921,7 +921,7 @@ void x300_radio_ctrl_impl::setup_radio(u
|
||||
this,
|
||||
db_path,
|
||||
_root_path / "tx_fe_corrections" / _tx_fe_map[i].db_fe_name,
|
||||
- _1));
|
||||
+ boost::placeholders::_1));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -938,7 +938,7 @@ void x300_radio_ctrl_impl::setup_radio(u
|
||||
this,
|
||||
db_path,
|
||||
_root_path / "rx_fe_corrections" / _tx_fe_map[i].db_fe_name,
|
||||
- _1));
|
||||
+ boost::placeholders::_1));
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue