diff options
110 files changed, 203 insertions, 203 deletions
diff --git a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp index 00ffd5472..c7a31e92a 100644 --- a/mpm/include/mpm/ad937x/ad937x_ctrl.hpp +++ b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/ad937x/ad937x_ctrl_types.hpp b/mpm/include/mpm/ad937x/ad937x_ctrl_types.hpp index 38e53dd07..89c539739 100644 --- a/mpm/include/mpm/ad937x/ad937x_ctrl_types.hpp +++ b/mpm/include/mpm/ad937x/ad937x_ctrl_types.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/ad937x/ad937x_spi_iface.hpp b/mpm/include/mpm/ad937x/ad937x_spi_iface.hpp index 23c61eeb0..042c55265 100644 --- a/mpm/include/mpm/ad937x/ad937x_spi_iface.hpp +++ b/mpm/include/mpm/ad937x/ad937x_spi_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/ad937x/adi_ctrl.hpp b/mpm/include/mpm/ad937x/adi_ctrl.hpp index 355c01fe6..f6b8aa89b 100644 --- a/mpm/include/mpm/ad937x/adi_ctrl.hpp +++ b/mpm/include/mpm/ad937x/adi_ctrl.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/dboards/magnesium_manager.hpp b/mpm/include/mpm/dboards/magnesium_manager.hpp index dba56f6a8..200de90b3 100644 --- a/mpm/include/mpm/dboards/magnesium_manager.hpp +++ b/mpm/include/mpm/dboards/magnesium_manager.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/exception.hpp b/mpm/include/mpm/exception.hpp index db085fec3..876ca7714 100644 --- a/mpm/include/mpm/exception.hpp +++ b/mpm/include/mpm/exception.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/spi/spi_iface.hpp b/mpm/include/mpm/spi/spi_iface.hpp index c458136f1..2cc5d740f 100644 --- a/mpm/include/mpm/spi/spi_iface.hpp +++ b/mpm/include/mpm/spi/spi_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/spi/spi_python.hpp b/mpm/include/mpm/spi/spi_python.hpp index 57287e803..49c34b0b6 100644 --- a/mpm/include/mpm/spi/spi_python.hpp +++ b/mpm/include/mpm/spi/spi_python.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/spi/spi_regs_iface.hpp b/mpm/include/mpm/spi/spi_regs_iface.hpp index 105193cee..a74d7ebb4 100644 --- a/mpm/include/mpm/spi/spi_regs_iface.hpp +++ b/mpm/include/mpm/spi/spi_regs_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/tests/tests_spi_iface.hpp b/mpm/include/mpm/tests/tests_spi_iface.hpp index 205ec1ab0..c30922747 100644 --- a/mpm/include/mpm/tests/tests_spi_iface.hpp +++ b/mpm/include/mpm/tests/tests_spi_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/types/lockable.hpp b/mpm/include/mpm/types/lockable.hpp index a463e9e27..848fdbd7e 100644 --- a/mpm/include/mpm/types/lockable.hpp +++ b/mpm/include/mpm/types/lockable.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/types/log_buf.hpp b/mpm/include/mpm/types/log_buf.hpp index 758cb79c6..df788ff6f 100644 --- a/mpm/include/mpm/types/log_buf.hpp +++ b/mpm/include/mpm/types/log_buf.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/types/mmap_regs_iface.hpp b/mpm/include/mpm/types/mmap_regs_iface.hpp index 969eb8160..ad76d54ee 100644 --- a/mpm/include/mpm/types/mmap_regs_iface.hpp +++ b/mpm/include/mpm/types/mmap_regs_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/types/regs_iface.hpp b/mpm/include/mpm/types/regs_iface.hpp index aaed44ec7..832e798da 100644 --- a/mpm/include/mpm/types/regs_iface.hpp +++ b/mpm/include/mpm/types/regs_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/types/types_python.hpp b/mpm/include/mpm/types/types_python.hpp index 2e7dbaf0e..0dcc7e6ad 100644 --- a/mpm/include/mpm/types/types_python.hpp +++ b/mpm/include/mpm/types/types_python.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/include/mpm/xbar_iface.hpp b/mpm/include/mpm/xbar_iface.hpp index 52172f85a..89751b115 100644 --- a/mpm/include/mpm/xbar_iface.hpp +++ b/mpm/include/mpm/xbar_iface.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once #include <boost/noncopyable.hpp> diff --git a/mpm/lib/dboards/magnesium_manager.cpp b/mpm/lib/dboards/magnesium_manager.cpp index 2d12712ab..49ab7f9ec 100644 --- a/mpm/lib/dboards/magnesium_manager.cpp +++ b/mpm/lib/dboards/magnesium_manager.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/dboards/magnesium_manager.hpp> diff --git a/mpm/lib/exception.cpp b/mpm/lib/exception.cpp index 34422d870..89883a980 100644 --- a/mpm/lib/exception.cpp +++ b/mpm/lib/exception.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/exception.hpp> diff --git a/mpm/lib/mykonos/ad937x_ctrl.cpp b/mpm/lib/mykonos/ad937x_ctrl.cpp index 0e9e2ec00..65f516501 100644 --- a/mpm/lib/mykonos/ad937x_ctrl.cpp +++ b/mpm/lib/mykonos/ad937x_ctrl.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad937x_device.hpp" diff --git a/mpm/lib/mykonos/ad937x_device.cpp b/mpm/lib/mykonos/ad937x_device.cpp index 9b48a80bf..c46f0ad89 100644 --- a/mpm/lib/mykonos/ad937x_device.cpp +++ b/mpm/lib/mykonos/ad937x_device.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad937x_device.hpp" diff --git a/mpm/lib/mykonos/ad937x_device.hpp b/mpm/lib/mykonos/ad937x_device.hpp index 24a15ba69..55c6f0cad 100644 --- a/mpm/lib/mykonos/ad937x_device.hpp +++ b/mpm/lib/mykonos/ad937x_device.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017-2018 Ettus Research, National Instruments Company +// Copyright 2017-2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/lib/mykonos/ad937x_device_types.hpp b/mpm/lib/mykonos/ad937x_device_types.hpp index 4f54c51d4..e4330d278 100644 --- a/mpm/lib/mykonos/ad937x_device_types.hpp +++ b/mpm/lib/mykonos/ad937x_device_types.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/lib/mykonos/ad937x_spi_iface.cpp b/mpm/lib/mykonos/ad937x_spi_iface.cpp index ddbf28113..d78f4951f 100644 --- a/mpm/lib/mykonos/ad937x_spi_iface.cpp +++ b/mpm/lib/mykonos/ad937x_spi_iface.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/ad937x/ad937x_spi_iface.hpp> diff --git a/mpm/lib/mykonos/adi_ctrl.cpp b/mpm/lib/mykonos/adi_ctrl.cpp index c1d8b3d2e..5b2775ae0 100644 --- a/mpm/lib/mykonos/adi_ctrl.cpp +++ b/mpm/lib/mykonos/adi_ctrl.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "adi/common.h" diff --git a/mpm/lib/mykonos/config/ad937x_config_t.cpp b/mpm/lib/mykonos/config/ad937x_config_t.cpp index b707400c8..9bebeafad 100644 --- a/mpm/lib/mykonos/config/ad937x_config_t.cpp +++ b/mpm/lib/mykonos/config/ad937x_config_t.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad937x_config_t.hpp" diff --git a/mpm/lib/mykonos/config/ad937x_config_t.hpp b/mpm/lib/mykonos/config/ad937x_config_t.hpp index 93b08a1df..7cbabb9b5 100644 --- a/mpm/lib/mykonos/config/ad937x_config_t.hpp +++ b/mpm/lib/mykonos/config/ad937x_config_t.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/lib/mykonos/config/ad937x_default_config.hpp b/mpm/lib/mykonos/config/ad937x_default_config.hpp index 85e729af5..e01c0c6d3 100644 --- a/mpm/lib/mykonos/config/ad937x_default_config.hpp +++ b/mpm/lib/mykonos/config/ad937x_default_config.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "../adi/t_mykonos.h" diff --git a/mpm/lib/mykonos/config/ad937x_fir.cpp b/mpm/lib/mykonos/config/ad937x_fir.cpp index 07358595e..01c8772eb 100644 --- a/mpm/lib/mykonos/config/ad937x_fir.cpp +++ b/mpm/lib/mykonos/config/ad937x_fir.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad937x_fir.hpp" diff --git a/mpm/lib/mykonos/config/ad937x_fir.hpp b/mpm/lib/mykonos/config/ad937x_fir.hpp index 740d5cfe6..c3fda6fb7 100644 --- a/mpm/lib/mykonos/config/ad937x_fir.hpp +++ b/mpm/lib/mykonos/config/ad937x_fir.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp index 44c5f1e32..d4fbef0ad 100644 --- a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp +++ b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad937x_gain_ctrl_config.hpp" diff --git a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp index 35e288bc4..380efb0de 100644 --- a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp +++ b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/lib/spi/spi_regs_iface.cpp b/mpm/lib/spi/spi_regs_iface.cpp index d5d7874cb..a1b5d29f8 100644 --- a/mpm/lib/spi/spi_regs_iface.cpp +++ b/mpm/lib/spi/spi_regs_iface.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/types/regs_iface.hpp> diff --git a/mpm/lib/spi/spidev.c b/mpm/lib/spi/spidev.c index 646ff8bf3..ac5690cd4 100644 --- a/mpm/lib/spi/spidev.c +++ b/mpm/lib/spi/spidev.c @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "spidev.h" diff --git a/mpm/lib/spi/spidev.h b/mpm/lib/spi/spidev.h index d7022e1d4..97c120e9f 100644 --- a/mpm/lib/spi/spidev.h +++ b/mpm/lib/spi/spidev.h @@ -1,7 +1,7 @@ /* - * Copyright 2017 Ettus Research, National Instruments Company + * Copyright 2017 Ettus Research, a National Instruments Company * - * SPDX-License-Identifier: GPL-3.0 + * SPDX-License-Identifier: GPL-3.0-or-later */ #include <stdint.h> diff --git a/mpm/lib/spi/spidev_iface.cpp b/mpm/lib/spi/spidev_iface.cpp index c9dbd1fe2..8b629e7b6 100644 --- a/mpm/lib/spi/spidev_iface.cpp +++ b/mpm/lib/spi/spidev_iface.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // diff --git a/mpm/lib/types/lockable.cpp b/mpm/lib/types/lockable.cpp index f5e36a01a..8710e8752 100644 --- a/mpm/lib/types/lockable.cpp +++ b/mpm/lib/types/lockable.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/types/lockable.hpp> diff --git a/mpm/lib/types/log_buf.cpp b/mpm/lib/types/log_buf.cpp index d159ca6a2..f1ef0cbee 100644 --- a/mpm/lib/types/log_buf.cpp +++ b/mpm/lib/types/log_buf.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/types/log_buf.hpp> diff --git a/mpm/lib/types/mmap_regs_iface.cpp b/mpm/lib/types/mmap_regs_iface.cpp index 3af47a61a..96457d7ad 100644 --- a/mpm/lib/types/mmap_regs_iface.cpp +++ b/mpm/lib/types/mmap_regs_iface.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/types/mmap_regs_iface.hpp> diff --git a/mpm/lib/xbar_iface.cpp b/mpm/lib/xbar_iface.cpp index 3cd94e245..cff5ed2e7 100644 --- a/mpm/lib/xbar_iface.cpp +++ b/mpm/lib/xbar_iface.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "mpm/xbar_iface.hpp" diff --git a/mpm/mpm_test_main.cpp b/mpm/mpm_test_main.cpp index be9eea601..9de9ad78a 100644 --- a/mpm/mpm_test_main.cpp +++ b/mpm/mpm_test_main.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "spi_lock.h" #include "ad937x_ctrl.hpp" diff --git a/mpm/python/aurora_bist_test.py b/mpm/python/aurora_bist_test.py index a55bee490..9fe6f10b4 100644 --- a/mpm/python/aurora_bist_test.py +++ b/mpm/python/aurora_bist_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Aurora BIST command line utility diff --git a/mpm/python/converters.hpp b/mpm/python/converters.hpp index 5f5ff1785..ede9507a9 100644 --- a/mpm/python/converters.hpp +++ b/mpm/python/converters.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/python/lib_helper.cpp b/mpm/python/lib_helper.cpp index a723fb899..2d533f073 100644 --- a/mpm/python/lib_helper.cpp +++ b/mpm/python/lib_helper.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "lib_helper.hpp" diff --git a/mpm/python/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs.cpp index 520590773..716209205 100644 --- a/mpm/python/pyusrp_periphs.cpp +++ b/mpm/python/pyusrp_periphs.cpp @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0+ +// SPDX-License-Identifier: GPL-3.0-or-later // // include hackery to only include boost python and define the macro here diff --git a/mpm/python/setup.py.in b/mpm/python/setup.py.in index 3e25f8085..e131f02f1 100755 --- a/mpm/python/setup.py.in +++ b/mpm/python/setup.py.in @@ -1,8 +1,8 @@ #!/usr/bin/env python # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ USRP/MPM diff --git a/mpm/python/socket_test.py b/mpm/python/socket_test.py index dcca72637..1f87664bf 100755 --- a/mpm/python/socket_test.py +++ b/mpm/python/socket_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import socket diff --git a/mpm/python/test_lmk.py b/mpm/python/test_lmk.py index 697b55935..db957abb6 100755 --- a/mpm/python/test_lmk.py +++ b/mpm/python/test_lmk.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import libpyusrp_periphs as p diff --git a/mpm/python/tests_periphs.cpp b/mpm/python/tests_periphs.cpp index feab6aa63..c0446d87a 100644 --- a/mpm/python/tests_periphs.cpp +++ b/mpm/python/tests_periphs.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "tests_periphs.hpp" diff --git a/mpm/python/tests_periphs.hpp b/mpm/python/tests_periphs.hpp index 2972d570a..b10996572 100644 --- a/mpm/python/tests_periphs.hpp +++ b/mpm/python/tests_periphs.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #pragma once diff --git a/mpm/python/usrp_hwd.py b/mpm/python/usrp_hwd.py index 2a597c789..267415601 100755 --- a/mpm/python/usrp_hwd.py +++ b/mpm/python/usrp_hwd.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Main executable for the USRP Hardware Daemon diff --git a/mpm/python/usrp_mpm/__init__.py b/mpm/python/usrp_mpm/__init__.py index b0f201089..00cbcc987 100644 --- a/mpm/python/usrp_mpm/__init__.py +++ b/mpm/python/usrp_mpm/__init__.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ MPM Module diff --git a/mpm/python/usrp_mpm/aurora_control.py b/mpm/python/usrp_mpm/aurora_control.py index 8cea73464..c46ae634c 100644 --- a/mpm/python/usrp_mpm/aurora_control.py +++ b/mpm/python/usrp_mpm/aurora_control.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Aurora SFP control diff --git a/mpm/python/usrp_mpm/bfrfs.py b/mpm/python/usrp_mpm/bfrfs.py index 52126f4ed..84cbad26c 100644 --- a/mpm/python/usrp_mpm/bfrfs.py +++ b/mpm/python/usrp_mpm/bfrfs.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ BufferFS. Serialization mini-library meant for use with EEPROMs. diff --git a/mpm/python/usrp_mpm/chips/__init__.py b/mpm/python/usrp_mpm/chips/__init__.py index 31ba707bb..c8d50d714 100644 --- a/mpm/python/usrp_mpm/chips/__init__.py +++ b/mpm/python/usrp_mpm/chips/__init__.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Chips submodule diff --git a/mpm/python/usrp_mpm/chips/lmk04828.py b/mpm/python/usrp_mpm/chips/lmk04828.py index c7b3fb497..c0496a6af 100644 --- a/mpm/python/usrp_mpm/chips/lmk04828.py +++ b/mpm/python/usrp_mpm/chips/lmk04828.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ LMK04828 parent driver class diff --git a/mpm/python/usrp_mpm/cores/__init__.py b/mpm/python/usrp_mpm/cores/__init__.py index 15f016feb..0cd2bc0c7 100644 --- a/mpm/python/usrp_mpm/cores/__init__.py +++ b/mpm/python/usrp_mpm/cores/__init__.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Cores submodule diff --git a/mpm/python/usrp_mpm/cores/nijesdcore.py b/mpm/python/usrp_mpm/cores/nijesdcore.py index 5d1f4e264..bf2bde6e9 100644 --- a/mpm/python/usrp_mpm/cores/nijesdcore.py +++ b/mpm/python/usrp_mpm/cores/nijesdcore.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ JESD FPGA Core Interface diff --git a/mpm/python/usrp_mpm/cores/tdc_sync.py b/mpm/python/usrp_mpm/cores/tdc_sync.py index f58234e2d..1ded38fef 100644 --- a/mpm/python/usrp_mpm/cores/tdc_sync.py +++ b/mpm/python/usrp_mpm/cores/tdc_sync.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ TDC clock synchronization diff --git a/mpm/python/usrp_mpm/dboard_manager/__init__.py b/mpm/python/usrp_mpm/dboard_manager/__init__.py index 4da567000..3f7b6e9f0 100644 --- a/mpm/python/usrp_mpm/dboard_manager/__init__.py +++ b/mpm/python/usrp_mpm/dboard_manager/__init__.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ dboards module __init__.py diff --git a/mpm/python/usrp_mpm/dboard_manager/base.py b/mpm/python/usrp_mpm/dboard_manager/base.py index 3bc0bdcff..68a3f3d5b 100644 --- a/mpm/python/usrp_mpm/dboard_manager/base.py +++ b/mpm/python/usrp_mpm/dboard_manager/base.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ dboard base implementation module diff --git a/mpm/python/usrp_mpm/dboard_manager/eiscat.py b/mpm/python/usrp_mpm/dboard_manager/eiscat.py index 18de2446d..2b1c247ba 100644 --- a/mpm/python/usrp_mpm/dboard_manager/eiscat.py +++ b/mpm/python/usrp_mpm/dboard_manager/eiscat.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ EISCAT rx board implementation module diff --git a/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py b/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py index 91d12651f..1fb756955 100644 --- a/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py +++ b/mpm/python/usrp_mpm/dboard_manager/lmk_eiscat.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ LMK04828 driver for use with Magnesium diff --git a/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py b/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py index d9579417c..22d3de983 100644 --- a/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py +++ b/mpm/python/usrp_mpm/dboard_manager/lmk_mg.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ LMK04828 driver for use with Magnesium diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index f933d1f14..470723e02 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Magnesium dboard implementation module diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py b/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py index be5cae797..a5ccde40b 100755 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium_update_cpld.py @@ -2,7 +2,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Update the CPLD image for the N310 diff --git a/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py b/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py index 77ce4ce89..2f74ce11c 100644 --- a/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py +++ b/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Magnesium dboard peripherals (CPLD, port expander, dboard regs) diff --git a/mpm/python/usrp_mpm/dboard_manager/test.py b/mpm/python/usrp_mpm/dboard_manager/test.py index e07648c86..207439c50 100644 --- a/mpm/python/usrp_mpm/dboard_manager/test.py +++ b/mpm/python/usrp_mpm/dboard_manager/test.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ magnesium dboard implementation module diff --git a/mpm/python/usrp_mpm/dboard_manager/unknown.py b/mpm/python/usrp_mpm/dboard_manager/unknown.py index 6b1bbbb61..7afc66f74 100644 --- a/mpm/python/usrp_mpm/dboard_manager/unknown.py +++ b/mpm/python/usrp_mpm/dboard_manager/unknown.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ EISCAT rx board implementation module diff --git a/mpm/python/usrp_mpm/discovery.py b/mpm/python/usrp_mpm/discovery.py index 8c58fa682..c1a894276 100644 --- a/mpm/python/usrp_mpm/discovery.py +++ b/mpm/python/usrp_mpm/discovery.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Code to run the discovery port diff --git a/mpm/python/usrp_mpm/eeprom.py b/mpm/python/usrp_mpm/eeprom.py index 54dd9bb12..543823cbb 100644 --- a/mpm/python/usrp_mpm/eeprom.py +++ b/mpm/python/usrp_mpm/eeprom.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ EEPROM management code diff --git a/mpm/python/usrp_mpm/ethtable.py b/mpm/python/usrp_mpm/ethtable.py index d2cc14e80..e3a3035ec 100644 --- a/mpm/python/usrp_mpm/ethtable.py +++ b/mpm/python/usrp_mpm/ethtable.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Ethernet dispatcher table control diff --git a/mpm/python/usrp_mpm/fpga_bit_to_bin.py b/mpm/python/usrp_mpm/fpga_bit_to_bin.py index ca85898c3..983bb97d6 100755 --- a/mpm/python/usrp_mpm/fpga_bit_to_bin.py +++ b/mpm/python/usrp_mpm/fpga_bit_to_bin.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Convert FPGA Bit files to bin files suitable for flashing diff --git a/mpm/python/usrp_mpm/gpsd_iface.py b/mpm/python/usrp_mpm/gpsd_iface.py index 63f079e63..66abfd4bd 100644 --- a/mpm/python/usrp_mpm/gpsd_iface.py +++ b/mpm/python/usrp_mpm/gpsd_iface.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ GPS service daemon (GPSd) interface class diff --git a/mpm/python/usrp_mpm/liberiotable.py b/mpm/python/usrp_mpm/liberiotable.py index cc848d570..19226345b 100644 --- a/mpm/python/usrp_mpm/liberiotable.py +++ b/mpm/python/usrp_mpm/liberiotable.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Liberio DMA dispatcher table control diff --git a/mpm/python/usrp_mpm/mpmlog.py b/mpm/python/usrp_mpm/mpmlog.py index 494ee8f2f..02ea305ca 100644 --- a/mpm/python/usrp_mpm/mpmlog.py +++ b/mpm/python/usrp_mpm/mpmlog.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ MPM Logging diff --git a/mpm/python/usrp_mpm/mpmtypes.py b/mpm/python/usrp_mpm/mpmtypes.py index cf81f4f16..32ee10fbb 100644 --- a/mpm/python/usrp_mpm/mpmtypes.py +++ b/mpm/python/usrp_mpm/mpmtypes.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ MPM types diff --git a/mpm/python/usrp_mpm/mpmutils.py b/mpm/python/usrp_mpm/mpmutils.py index 1e4f49b54..539cd8de4 100644 --- a/mpm/python/usrp_mpm/mpmutils.py +++ b/mpm/python/usrp_mpm/mpmutils.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Miscellaneous utilities for MPM diff --git a/mpm/python/usrp_mpm/periph_manager/__init__.py.in b/mpm/python/usrp_mpm/periph_manager/__init__.py.in index f642b0a42..f507a6808 100644 --- a/mpm/python/usrp_mpm/periph_manager/__init__.py.in +++ b/mpm/python/usrp_mpm/periph_manager/__init__.py.in @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ periph_manager __init__.py diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py index 384be99f3..6608a5d2b 100644 --- a/mpm/python/usrp_mpm/periph_manager/base.py +++ b/mpm/python/usrp_mpm/periph_manager/base.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Mboard implementation base class diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py index ca92301fe..d0fb7feee 100644 --- a/mpm/python/usrp_mpm/periph_manager/n310.py +++ b/mpm/python/usrp_mpm/periph_manager/n310.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ N310 implementation module diff --git a/mpm/python/usrp_mpm/periph_manager/test.py b/mpm/python/usrp_mpm/periph_manager/test.py index 7df40722e..e0fced56b 100644 --- a/mpm/python/usrp_mpm/periph_manager/test.py +++ b/mpm/python/usrp_mpm/periph_manager/test.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ test periph_manager implementation module diff --git a/mpm/python/usrp_mpm/prefs.py b/mpm/python/usrp_mpm/prefs.py index 8ed6f13ff..0e9d636b2 100644 --- a/mpm/python/usrp_mpm/prefs.py +++ b/mpm/python/usrp_mpm/prefs.py @@ -1,7 +1,7 @@ # # Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ MPM preferences management diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py index abb3b4327..00175d312 100644 --- a/mpm/python/usrp_mpm/rpc_server.py +++ b/mpm/python/usrp_mpm/rpc_server.py @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Implemented RPC Servers diff --git a/mpm/python/usrp_mpm/sys_utils/__init__.py b/mpm/python/usrp_mpm/sys_utils/__init__.py index 61be8ac53..c282aff97 100644 --- a/mpm/python/usrp_mpm/sys_utils/__init__.py +++ b/mpm/python/usrp_mpm/sys_utils/__init__.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ System/OS Utilities diff --git a/mpm/python/usrp_mpm/sys_utils/dtoverlay.py b/mpm/python/usrp_mpm/sys_utils/dtoverlay.py index 30f7ae4a0..0c1593fb6 100644 --- a/mpm/python/usrp_mpm/sys_utils/dtoverlay.py +++ b/mpm/python/usrp_mpm/sys_utils/dtoverlay.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Manipulation of device tree overlays (Linux kernel) diff --git a/mpm/python/usrp_mpm/sys_utils/net.py b/mpm/python/usrp_mpm/sys_utils/net.py index f40e147dc..1b6ddd2c1 100644 --- a/mpm/python/usrp_mpm/sys_utils/net.py +++ b/mpm/python/usrp_mpm/sys_utils/net.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ N310 implementation module diff --git a/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py b/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py index 286b8e54a..ccc597785 100644 --- a/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py +++ b/mpm/python/usrp_mpm/sys_utils/sysfs_gpio.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Access to GPIOs mapped into the PS via sysfs diff --git a/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py b/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py index 8b1098469..a5df76858 100644 --- a/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py +++ b/mpm/python/usrp_mpm/sys_utils/sysfs_thermal.py @@ -1,7 +1,7 @@ # # Copyright 2017 Ettus Research, A National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later """ sysfs thermal sensors API """ diff --git a/mpm/python/usrp_mpm/sys_utils/udev.py b/mpm/python/usrp_mpm/sys_utils/udev.py index efd36c245..70b3bcb65 100644 --- a/mpm/python/usrp_mpm/sys_utils/udev.py +++ b/mpm/python/usrp_mpm/sys_utils/udev.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Utilities for udev lookups diff --git a/mpm/python/usrp_mpm/sys_utils/uio.py b/mpm/python/usrp_mpm/sys_utils/uio.py index 6e3a8c182..0a611cc08 100644 --- a/mpm/python/usrp_mpm/sys_utils/uio.py +++ b/mpm/python/usrp_mpm/sys_utils/uio.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Access to UIO mapped memory. diff --git a/mpm/python/usrp_mpm/sys_utils/watchdog.py b/mpm/python/usrp_mpm/sys_utils/watchdog.py index 3c0a48f4a..1acf95bde 100644 --- a/mpm/python/usrp_mpm/sys_utils/watchdog.py +++ b/mpm/python/usrp_mpm/sys_utils/watchdog.py @@ -1,7 +1,7 @@ # -# Copyright 2018 Ettus Research, National Instruments Company +# Copyright 2018 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ systemd watchdog control module diff --git a/mpm/python/usrp_mpm/test_bfrfs.py b/mpm/python/usrp_mpm/test_bfrfs.py index ae12fa8ed..d4a0b9ae1 100644 --- a/mpm/python/usrp_mpm/test_bfrfs.py +++ b/mpm/python/usrp_mpm/test_bfrfs.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import mpmlog import bfrfs diff --git a/mpm/python/usrp_mpm/xports/__init__.py b/mpm/python/usrp_mpm/xports/__init__.py index 36d429ad9..e3e2bc89b 100644 --- a/mpm/python/usrp_mpm/xports/__init__.py +++ b/mpm/python/usrp_mpm/xports/__init__.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Transport managers diff --git a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py index f1e9fe2de..d5c0d2e97 100644 --- a/mpm/python/usrp_mpm/xports/xportmgr_liberio.py +++ b/mpm/python/usrp_mpm/xports/xportmgr_liberio.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ Liberio Transport manager diff --git a/mpm/python/usrp_mpm/xports/xportmgr_udp.py b/mpm/python/usrp_mpm/xports/xportmgr_udp.py index 5e565ba86..fe7a9a9d4 100644 --- a/mpm/python/usrp_mpm/xports/xportmgr_udp.py +++ b/mpm/python/usrp_mpm/xports/xportmgr_udp.py @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ UDP Transport manager diff --git a/mpm/tests/tests_device.hpp b/mpm/tests/tests_device.hpp index d87ed23f4..390575178 100644 --- a/mpm/tests/tests_device.hpp +++ b/mpm/tests/tests_device.hpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/tests/tests_spi_iface.hpp> diff --git a/mpm/tests/tests_spi_iface.cpp b/mpm/tests/tests_spi_iface.cpp index 8639d8f83..063002fa9 100644 --- a/mpm/tests/tests_spi_iface.cpp +++ b/mpm/tests/tests_spi_iface.cpp @@ -1,7 +1,7 @@ // -// Copyright 2017 Ettus Research, National Instruments Company +// Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <mpm/tests/tests_spi_iface.hpp> diff --git a/mpm/tools/db-dump.c b/mpm/tools/db-dump.c index f4190a2aa..f86eec845 100644 --- a/mpm/tools/db-dump.c +++ b/mpm/tools/db-dump.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/db-id.c b/mpm/tools/db-id.c index 140f50914..dc08ac736 100644 --- a/mpm/tools/db-id.c +++ b/mpm/tools/db-id.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <stdio.h> diff --git a/mpm/tools/db-init.c b/mpm/tools/db-init.c index c0e7ba464..fdf8dcd87 100644 --- a/mpm/tools/db-init.c +++ b/mpm/tools/db-init.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/eeprom-blank.c b/mpm/tools/eeprom-blank.c index d8314a382..13e671a22 100644 --- a/mpm/tools/eeprom-blank.c +++ b/mpm/tools/eeprom-blank.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/eeprom-dump.c b/mpm/tools/eeprom-dump.c index 08c2c4208..875523c20 100644 --- a/mpm/tools/eeprom-dump.c +++ b/mpm/tools/eeprom-dump.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/eeprom-id.c b/mpm/tools/eeprom-id.c index f19a17ca1..0b2c78f26 100644 --- a/mpm/tools/eeprom-id.c +++ b/mpm/tools/eeprom-id.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <stdio.h> diff --git a/mpm/tools/eeprom-init.c b/mpm/tools/eeprom-init.c index a7eeeab70..a19d8a771 100644 --- a/mpm/tools/eeprom-init.c +++ b/mpm/tools/eeprom-init.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/eeprom-set-flags.c b/mpm/tools/eeprom-set-flags.c index 00a96677e..3380b3c3e 100644 --- a/mpm/tools/eeprom-set-flags.c +++ b/mpm/tools/eeprom-set-flags.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/eeprom.c b/mpm/tools/eeprom.c index e111226cc..ce4c76277 100644 --- a/mpm/tools/eeprom.c +++ b/mpm/tools/eeprom.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include <stdio.h> diff --git a/mpm/tools/eeprom.h b/mpm/tools/eeprom.h index 9b8ef15fb..fc5b47426 100644 --- a/mpm/tools/eeprom.h +++ b/mpm/tools/eeprom.h @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef EEPROM_H diff --git a/mpm/tools/fan-limits.c b/mpm/tools/fan-limits.c index 4000d5832..3328c2175 100644 --- a/mpm/tools/fan-limits.c +++ b/mpm/tools/fan-limits.c @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "eeprom.h" diff --git a/mpm/tools/mpm_debug.py b/mpm/tools/mpm_debug.py index 0d9139fbd..3b4e8d562 100755 --- a/mpm/tools/mpm_debug.py +++ b/mpm/tools/mpm_debug.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # import socket from mprpc import RPCClient diff --git a/mpm/tools/mpm_shell.py b/mpm/tools/mpm_shell.py index d17fb5c61..e480a4857 100755 --- a/mpm/tools/mpm_shell.py +++ b/mpm/tools/mpm_shell.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# Copyright 2017 Ettus Research, National Instruments Company +# Copyright 2017 Ettus Research, a National Instruments Company # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0-or-later # """ RPC shell to debug USRP MPM capable devices |