From ae5211d71dcd0715ed83e1d4949d8425d64cb3d1 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 19 Feb 2018 15:30:32 -0800 Subject: 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. --- host/lib/utils/CMakeLists.txt | 1 + host/lib/utils/compat_check.cpp | 2 +- host/lib/utils/config_parser.cpp | 2 +- host/lib/utils/csv.cpp | 3 ++- host/lib/utils/eeprom_utils.cpp | 2 +- host/lib/utils/eeprom_utils.hpp | 2 +- host/lib/utils/gain_group.cpp | 3 ++- host/lib/utils/ihex.cpp | 3 ++- host/lib/utils/ihex.hpp | 3 ++- host/lib/utils/load_modules.cpp | 3 ++- host/lib/utils/log.cpp | 3 ++- host/lib/utils/log_c.cpp | 2 +- host/lib/utils/paths.cpp | 3 ++- host/lib/utils/platform.cpp | 3 ++- host/lib/utils/rpc.hpp | 2 +- host/lib/utils/static.cpp | 3 ++- host/lib/utils/tasks.cpp | 3 ++- host/lib/utils/thread.cpp | 3 ++- host/lib/utils/thread_priority_c.cpp | 3 ++- 19 files changed, 31 insertions(+), 18 deletions(-) (limited to 'host/lib/utils') diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index c7de9fbf8..7af094e83 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2010-2011 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/lib/utils/compat_check.cpp b/host/lib/utils/compat_check.cpp index aebf6e6bf..f15ba8bba 100644 --- a/host/lib/utils/compat_check.cpp +++ b/host/lib/utils/compat_check.cpp @@ -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 // #include diff --git a/host/lib/utils/config_parser.cpp b/host/lib/utils/config_parser.cpp index a88a99a01..dfd8d1b8b 100644 --- a/host/lib/utils/config_parser.cpp +++ b/host/lib/utils/config_parser.cpp @@ -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 // #include diff --git a/host/lib/utils/csv.cpp b/host/lib/utils/csv.cpp index 681a6d68e..29b219fef 100644 --- a/host/lib/utils/csv.cpp +++ b/host/lib/utils/csv.cpp @@ -1,7 +1,8 @@ // // Copyright 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 // #include diff --git a/host/lib/utils/eeprom_utils.cpp b/host/lib/utils/eeprom_utils.cpp index acf81a1ce..0090a3612 100644 --- a/host/lib/utils/eeprom_utils.cpp +++ b/host/lib/utils/eeprom_utils.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 "eeprom_utils.hpp" diff --git a/host/lib/utils/eeprom_utils.hpp b/host/lib/utils/eeprom_utils.hpp index b6ff264fb..28deca790 100644 --- a/host/lib/utils/eeprom_utils.hpp +++ b/host/lib/utils/eeprom_utils.hpp @@ -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 diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp index c57a328ed..46fa8a240 100644 --- a/host/lib/utils/gain_group.cpp +++ b/host/lib/utils/gain_group.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2011,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 diff --git a/host/lib/utils/ihex.cpp b/host/lib/utils/ihex.cpp index 8060f9a47..ce0dd6e69 100644 --- a/host/lib/utils/ihex.cpp +++ b/host/lib/utils/ihex.cpp @@ -1,7 +1,8 @@ // // 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 // #include "ihex.hpp" diff --git a/host/lib/utils/ihex.hpp b/host/lib/utils/ihex.hpp index 2b67abe93..4b1be77f1 100644 --- a/host/lib/utils/ihex.hpp +++ b/host/lib/utils/ihex.hpp @@ -1,7 +1,8 @@ // // 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 // #ifndef INCLUDED_IHEX_READER_HPP diff --git a/host/lib/utils/load_modules.cpp b/host/lib/utils/load_modules.cpp index 19f2c300c..c862a0abd 100644 --- a/host/lib/utils/load_modules.cpp +++ b/host/lib/utils/load_modules.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 // #include diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp index af2cf4aa8..f7885b300 100644 --- a/host/lib/utils/log.cpp +++ b/host/lib/utils/log.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 diff --git a/host/lib/utils/log_c.cpp b/host/lib/utils/log_c.cpp index 73fb28e68..8ccc031a5 100644 --- a/host/lib/utils/log_c.cpp +++ b/host/lib/utils/log_c.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 diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index a03ce9cfa..d609e254f 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-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 diff --git a/host/lib/utils/platform.cpp b/host/lib/utils/platform.cpp index 2c9ee0238..859f3aa20 100644 --- a/host/lib/utils/platform.cpp +++ b/host/lib/utils/platform.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 diff --git a/host/lib/utils/rpc.hpp b/host/lib/utils/rpc.hpp index 1ab7e5f6e..c7c27afd2 100644 --- a/host/lib/utils/rpc.hpp +++ b/host/lib/utils/rpc.hpp @@ -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 INCLUDED_UTILS_RPC_HPP diff --git a/host/lib/utils/static.cpp b/host/lib/utils/static.cpp index bc670e6d9..84ca992c8 100644 --- a/host/lib/utils/static.cpp +++ b/host/lib/utils/static.cpp @@ -1,7 +1,8 @@ // // Copyright 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 // #include diff --git a/host/lib/utils/tasks.cpp b/host/lib/utils/tasks.cpp index 4941ab480..888a5a8f1 100644 --- a/host/lib/utils/tasks.cpp +++ b/host/lib/utils/tasks.cpp @@ -1,7 +1,8 @@ // // Copyright 2011,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 diff --git a/host/lib/utils/thread.cpp b/host/lib/utils/thread.cpp index f06cdf498..893496243 100644 --- a/host/lib/utils/thread.cpp +++ b/host/lib/utils/thread.cpp @@ -1,7 +1,8 @@ // // 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 // #include diff --git a/host/lib/utils/thread_priority_c.cpp b/host/lib/utils/thread_priority_c.cpp index 7a91ad3f6..6f0c76fe9 100644 --- a/host/lib/utils/thread_priority_c.cpp +++ b/host/lib/utils/thread_priority_c.cpp @@ -1,7 +1,8 @@ // // 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 // #include -- cgit v1.2.3