diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-19 15:30:32 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-19 16:54:52 -0800 |
| commit | ae5211d71dcd0715ed83e1d4949d8425d64cb3d1 (patch) | |
| tree | d78d7cd9138636a8e860af7fbe0f0ca538681cd5 /host/utils | |
| parent | f15dbc0484adf95c245ac86fb9aa7ea37ccce71b (diff) | |
| download | uhd-ae5211d71dcd0715ed83e1d4949d8425d64cb3d1.tar.gz uhd-ae5211d71dcd0715ed83e1d4949d8425d64cb3d1.tar.bz2 uhd-ae5211d71dcd0715ed83e1d4949d8425d64cb3d1.zip | |
uhd: Update license headers
All copyright is now attributed to "Ettus Research, a National
Instruments company".
SPDX headers were also updated to latest version 3.0.
Diffstat (limited to 'host/utils')
35 files changed, 65 insertions, 32 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 4ca33c2ba..d71a71740 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2010-2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/utils/b2xx_fx3_utils.cpp b/host/utils/b2xx_fx3_utils.cpp index 6fddcac8c..f261cc61c 100644 --- a/host/utils/b2xx_fx3_utils.cpp +++ b/host/utils/b2xx_fx3_utils.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <cstdlib> diff --git a/host/utils/b2xx_side_channel.py b/host/utils/b2xx_side_channel.py index e6d876016..df4540a40 100755 --- a/host/utils/b2xx_side_channel.py +++ b/host/utils/b2xx_side_channel.py @@ -2,8 +2,9 @@ # -*- coding: utf-8 -*- # # Copyright 2013-2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Tool to read log buffers from the FX3. Use to debug USB connection issues. diff --git a/host/utils/converter_benchmark.cpp b/host/utils/converter_benchmark.cpp index c1ab4d936..017a4ff4c 100644 --- a/host/utils/converter_benchmark.cpp +++ b/host/utils/converter_benchmark.cpp @@ -1,7 +1,8 @@ // // Copyright 2015-2016 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/safe_main.hpp> diff --git a/host/utils/converter_benchmark.py b/host/utils/converter_benchmark.py index 10161bd3c..c24c1f983 100644 --- a/host/utils/converter_benchmark.py +++ b/host/utils/converter_benchmark.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Wrap the converter_benchmark tool and produce prettier results. diff --git a/host/utils/fx2_init_eeprom.cpp b/host/utils/fx2_init_eeprom.cpp index aeb4a31ef..9edefcda0 100644 --- a/host/utils/fx2_init_eeprom.cpp +++ b/host/utils/fx2_init_eeprom.cpp @@ -1,7 +1,8 @@ // // Copyright 2010,2014,2016 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/safe_main.hpp> diff --git a/host/utils/latency/CMakeLists.txt b/host/utils/latency/CMakeLists.txt index 8a30b4f89..4ccfd3eba 100644 --- a/host/utils/latency/CMakeLists.txt +++ b/host/utils/latency/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2010-2013 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/utils/latency/graph.py b/host/utils/latency/graph.py index 370e4d21f..a675bc7cd 100755 --- a/host/utils/latency/graph.py +++ b/host/utils/latency/graph.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2012 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import sys, re diff --git a/host/utils/latency/include/Responder.hpp b/host/utils/latency/include/Responder.hpp index dd967bc99..0d690bcd6 100644 --- a/host/utils/latency/include/Responder.hpp +++ b/host/utils/latency/include/Responder.hpp @@ -1,7 +1,8 @@ // // Copyright 2010-2013 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef RESPONDER_H diff --git a/host/utils/latency/lib/Responder.cpp b/host/utils/latency/lib/Responder.cpp index 72f1a9147..1b0450a23 100644 --- a/host/utils/latency/lib/Responder.cpp +++ b/host/utils/latency/lib/Responder.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2013 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "Responder.hpp" diff --git a/host/utils/latency/pci_hwdata.py b/host/utils/latency/pci_hwdata.py index 3366e599f..a0f969caa 100755 --- a/host/utils/latency/pci_hwdata.py +++ b/host/utils/latency/pci_hwdata.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2013 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # # This script exists for convenience. Run it once to get your hardware info. diff --git a/host/utils/latency/responder.cpp b/host/utils/latency/responder.cpp index d655469ca..3a94b135f 100644 --- a/host/utils/latency/responder.cpp +++ b/host/utils/latency/responder.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2012 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <boost/program_options.hpp> diff --git a/host/utils/latency/run_tests.py b/host/utils/latency/run_tests.py index 7cfb9c2d1..e3056964d 100755 --- a/host/utils/latency/run_tests.py +++ b/host/utils/latency/run_tests.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2012 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import subprocess, time diff --git a/host/utils/octoclock_burn_eeprom.cpp b/host/utils/octoclock_burn_eeprom.cpp index a3845a3fa..a4a8adf03 100644 --- a/host/utils/octoclock_burn_eeprom.cpp +++ b/host/utils/octoclock_burn_eeprom.cpp @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/device.hpp> diff --git a/host/utils/octoclock_firmware_burner.cpp b/host/utils/octoclock_firmware_burner.cpp index 18f462041..da84daac0 100644 --- a/host/utils/octoclock_firmware_burner.cpp +++ b/host/utils/octoclock_firmware_burner.cpp @@ -1,7 +1,8 @@ // // Copyright 2014-2015 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <boost/program_options.hpp> diff --git a/host/utils/query_gpsdo_sensors.cpp b/host/utils/query_gpsdo_sensors.cpp index fded15159..b839cd499 100644 --- a/host/utils/query_gpsdo_sensors.cpp +++ b/host/utils/query_gpsdo_sensors.cpp @@ -1,7 +1,8 @@ // // Copyright 2012,2014-2016 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/paths.hpp> diff --git a/host/utils/uhd-usrp.rules b/host/utils/uhd-usrp.rules index 7a49ec3e4..861fb5e56 100644 --- a/host/utils/uhd-usrp.rules +++ b/host/utils/uhd-usrp.rules @@ -1,5 +1,6 @@ # # Copyright 2011,2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp index 31e1c82ed..88ec77a0a 100644 --- a/host/utils/uhd_cal_rx_iq_balance.cpp +++ b/host/utils/uhd_cal_rx_iq_balance.cpp @@ -1,7 +1,8 @@ // // Copyright 2010,2012,2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "usrp_cal_utils.hpp" diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp index ecd1062fb..0a11cc223 100644 --- a/host/utils/uhd_cal_tx_dc_offset.cpp +++ b/host/utils/uhd_cal_tx_dc_offset.cpp @@ -1,7 +1,8 @@ // // Copyright 2010,2012,2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "usrp_cal_utils.hpp" diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp index 0fcbfe57a..da6631dc4 100644 --- a/host/utils/uhd_cal_tx_iq_balance.cpp +++ b/host/utils/uhd_cal_tx_iq_balance.cpp @@ -1,7 +1,8 @@ // // Copyright 2010,2012,2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "usrp_cal_utils.hpp" diff --git a/host/utils/uhd_config_info.cpp b/host/utils/uhd_config_info.cpp index 05e5e64f2..2b7fb5d6c 100644 --- a/host/utils/uhd_config_info.cpp +++ b/host/utils/uhd_config_info.cpp @@ -1,7 +1,7 @@ // // Copyright 2015-2016 National Instruments Corp. // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/build_info.hpp> diff --git a/host/utils/uhd_find_devices.cpp b/host/utils/uhd_find_devices.cpp index 8454afb4d..ab2ba5ab3 100644 --- a/host/utils/uhd_find_devices.cpp +++ b/host/utils/uhd_find_devices.cpp @@ -1,7 +1,8 @@ // // Copyright 2010 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/safe_main.hpp> diff --git a/host/utils/uhd_image_loader.cpp b/host/utils/uhd_image_loader.cpp index 8051d8f1b..2ba38a6ec 100644 --- a/host/utils/uhd_image_loader.cpp +++ b/host/utils/uhd_image_loader.cpp @@ -1,7 +1,8 @@ // // Copyright 2015-2017 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <csignal> diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in index fcba16c33..9fb660e5a 100644 --- a/host/utils/uhd_images_downloader.py.in +++ b/host/utils/uhd_images_downloader.py.in @@ -2,7 +2,7 @@ # # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Download image files required for USRPs diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp index be1d50924..42ec7c6a1 100644 --- a/host/utils/uhd_usrp_probe.cpp +++ b/host/utils/uhd_usrp_probe.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2011,2015-2016 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/safe_main.hpp> diff --git a/host/utils/usrp2_card_burner.py b/host/utils/usrp2_card_burner.py index 1a6f2030d..7d904746e 100755 --- a/host/utils/usrp2_card_burner.py +++ b/host/utils/usrp2_card_burner.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2010-2011 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import platform diff --git a/host/utils/usrp2_card_burner_gui.py b/host/utils/usrp2_card_burner_gui.py index f0fbae81f..5586fc770 100755 --- a/host/utils/usrp2_card_burner_gui.py +++ b/host/utils/usrp2_card_burner_gui.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2010-2011 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import usrp2_card_burner #import implementation diff --git a/host/utils/usrp2_recovery.py b/host/utils/usrp2_recovery.py index 956bebc1d..aca1d6f24 100755 --- a/host/utils/usrp2_recovery.py +++ b/host/utils/usrp2_recovery.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2010-2011 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ diff --git a/host/utils/usrp_burn_db_eeprom.cpp b/host/utils/usrp_burn_db_eeprom.cpp index 6d6919738..f3d6d3346 100644 --- a/host/utils/usrp_burn_db_eeprom.cpp +++ b/host/utils/usrp_burn_db_eeprom.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2011 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // diff --git a/host/utils/usrp_burn_mb_eeprom.cpp b/host/utils/usrp_burn_mb_eeprom.cpp index 311420ea6..5e1212d38 100644 --- a/host/utils/usrp_burn_mb_eeprom.cpp +++ b/host/utils/usrp_burn_mb_eeprom.cpp @@ -1,7 +1,8 @@ // // Copyright 2010,2013-2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/safe_main.hpp> diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index bfb7383ea..367ec44ab 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -1,7 +1,8 @@ // // Copyright 2011-2012,2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <uhd/utils/paths.hpp> diff --git a/host/utils/usrp_e3x0_network_mode.cpp b/host/utils/usrp_e3x0_network_mode.cpp index 25d4b02bf..937f4db3d 100644 --- a/host/utils/usrp_e3x0_network_mode.cpp +++ b/host/utils/usrp_e3x0_network_mode.cpp @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "../lib/usrp/e300/e300_network.hpp" diff --git a/host/utils/usrp_n2xx_net_burner.py b/host/utils/usrp_n2xx_net_burner.py index f86f42403..a291f6d60 100755 --- a/host/utils/usrp_n2xx_net_burner.py +++ b/host/utils/usrp_n2xx_net_burner.py @@ -1,8 +1,9 @@ #!/usr/bin/env python # # Copyright 2010-2011,2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import optparse diff --git a/host/utils/usrp_n2xx_simple_net_burner.cpp b/host/utils/usrp_n2xx_simple_net_burner.cpp index 3965a9816..3d018091f 100644 --- a/host/utils/usrp_n2xx_simple_net_burner.cpp +++ b/host/utils/usrp_n2xx_simple_net_burner.cpp @@ -1,7 +1,8 @@ // // Copyright 2012-2015 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <boost/program_options.hpp> diff --git a/host/utils/usrp_x3xx_fpga_burner.cpp b/host/utils/usrp_x3xx_fpga_burner.cpp index 8545bf51a..98e6113d5 100644 --- a/host/utils/usrp_x3xx_fpga_burner.cpp +++ b/host/utils/usrp_x3xx_fpga_burner.cpp @@ -1,7 +1,8 @@ // // Copyright 2013-2015 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <iostream> |