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/lib/usrp/usrp2 | |
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/lib/usrp/usrp2')
-rw-r--r-- | host/lib/usrp/usrp2/CMakeLists.txt | 1 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.hpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.hpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/dboard_iface.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/mb_eeprom.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/n200_image_loader.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_clk_regs.hpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.hpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 3 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_regs.hpp | 3 |
18 files changed, 33 insertions, 17 deletions
diff --git a/host/lib/usrp/usrp2/CMakeLists.txt b/host/lib/usrp/usrp2/CMakeLists.txt index 9ac9cad8d..8e7e186bb 100644 --- a/host/lib/usrp/usrp2/CMakeLists.txt +++ b/host/lib/usrp/usrp2/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2011-2012,2014-2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp index 38dc82ae6..c175a8c12 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.cpp +++ b/host/lib/usrp/usrp2/clock_ctrl.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 "clock_ctrl.hpp" diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp index f587273fb..96a1a0714 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.hpp +++ b/host/lib/usrp/usrp2/clock_ctrl.hpp @@ -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 // #ifndef INCLUDED_CLOCK_CTRL_HPP diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp index 660f77598..c3e7b332f 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.cpp +++ b/host/lib/usrp/usrp2/codec_ctrl.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 "codec_ctrl.hpp" diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp index 17bc2fdfd..e32b508e9 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.hpp +++ b/host/lib/usrp/usrp2/codec_ctrl.hpp @@ -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 // #ifndef INCLUDED_CODEC_CTRL_HPP diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index 6e7524479..5187d000e 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2012,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 "gpio_core_200.hpp" diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index 09c007301..006247a7f 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -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 // #ifndef INCLUDED_USRP2_FW_COMMON_H diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index d69c0f4b7..2d6d7c11d 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.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 "validate_subdev_spec.hpp" diff --git a/host/lib/usrp/usrp2/mb_eeprom.cpp b/host/lib/usrp/usrp2/mb_eeprom.cpp index 5b86633d6..b1c8ab8b0 100644 --- a/host/lib/usrp/usrp2/mb_eeprom.cpp +++ b/host/lib/usrp/usrp2/mb_eeprom.cpp @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research (National Instruments Corp.) // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "usrp2_impl.hpp" diff --git a/host/lib/usrp/usrp2/n200_image_loader.cpp b/host/lib/usrp/usrp2/n200_image_loader.cpp index 529ae92f2..36da357e4 100644 --- a/host/lib/usrp/usrp2/n200_image_loader.cpp +++ b/host/lib/usrp/usrp2/n200_image_loader.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 <cstring> diff --git a/host/lib/usrp/usrp2/usrp2_clk_regs.hpp b/host/lib/usrp/usrp2/usrp2_clk_regs.hpp index fb1603709..ac58decc0 100644 --- a/host/lib/usrp/usrp2/usrp2_clk_regs.hpp +++ b/host/lib/usrp/usrp2/usrp2_clk_regs.hpp @@ -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 // #ifndef INCLUDED_USRP2_CLK_REGS_HPP diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp index 07a94f4ea..0c0a21851 100644 --- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp +++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp @@ -1,7 +1,8 @@ // // 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 // #include "usrp2_regs.hpp" diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp index c182e9961..1e670a7f4 100644 --- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp +++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp @@ -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 // #ifndef INCLUDED_USRP2_FIFO_CTRL_HPP diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 86a3b4aa7..a3d1bc390 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2012,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 "usrp2_regs.hpp" diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp index 238e716c0..05cdfba54 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.hpp +++ b/host/lib/usrp/usrp2/usrp2_iface.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 INCLUDED_USRP2_IFACE_HPP diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 19feae71d..4afdfae56 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -1,7 +1,7 @@ // // Copyright 2010-2012,2014,2017 Ettus Research, A National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "usrp2_impl.hpp" diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 75b8c726c..81d72ccdd 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -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 // #ifndef INCLUDED_USRP2_IMPL_HPP diff --git a/host/lib/usrp/usrp2/usrp2_regs.hpp b/host/lib/usrp/usrp2/usrp2_regs.hpp index aae0f40fc..f26b33ecb 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.hpp +++ b/host/lib/usrp/usrp2/usrp2_regs.hpp @@ -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 // #ifndef INCLUDED_USRP2_REGS_HPP |