From ae5211d71dcd0715ed83e1d4949d8425d64cb3d1 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
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/types/CMakeLists.txt      | 1 +
 host/lib/types/byte_vector.cpp     | 3 ++-
 host/lib/types/device_addr.cpp     | 3 ++-
 host/lib/types/filters.cpp         | 3 ++-
 host/lib/types/mac_addr.cpp        | 3 ++-
 host/lib/types/metadata.cpp        | 3 ++-
 host/lib/types/metadata_c.cpp      | 3 ++-
 host/lib/types/ranges.cpp          | 3 ++-
 host/lib/types/ranges_c.cpp        | 3 ++-
 host/lib/types/sensors.cpp         | 3 ++-
 host/lib/types/sensors_c.cpp       | 3 ++-
 host/lib/types/serial.cpp          | 3 ++-
 host/lib/types/sid.cpp             | 3 ++-
 host/lib/types/string_vector_c.cpp | 3 ++-
 host/lib/types/time_spec.cpp       | 3 ++-
 host/lib/types/tune.cpp            | 3 ++-
 host/lib/types/tune_c.cpp          | 3 ++-
 host/lib/types/types.cpp           | 3 ++-
 host/lib/types/usrp_info_c.cpp     | 3 ++-
 host/lib/types/wb_iface.cpp        | 3 ++-
 20 files changed, 39 insertions(+), 19 deletions(-)

(limited to 'host/lib/types')

diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt
index 12e4fd72c..2156160cd 100644
--- a/host/lib/types/CMakeLists.txt
+++ b/host/lib/types/CMakeLists.txt
@@ -1,5 +1,6 @@
 #
 # Copyright 2011-2013,2015 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
 #
 # SPDX-License-Identifier: GPL-3.0
 #
diff --git a/host/lib/types/byte_vector.cpp b/host/lib/types/byte_vector.cpp
index fefcbac7a..d3633f2f6 100644
--- a/host/lib/types/byte_vector.cpp
+++ b/host/lib/types/byte_vector.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
 //
 
 
diff --git a/host/lib/types/device_addr.cpp b/host/lib/types/device_addr.cpp
index 6e9b2441b..18376a8b8 100644
--- a/host/lib/types/device_addr.cpp
+++ b/host/lib/types/device_addr.cpp
@@ -1,7 +1,8 @@
 //
 // Copyright 2011,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/types/device_addr.hpp>
diff --git a/host/lib/types/filters.cpp b/host/lib/types/filters.cpp
index 85a93da3e..5d59e4cd5 100644
--- a/host/lib/types/filters.cpp
+++ b/host/lib/types/filters.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 <uhd/types/filters.hpp>
diff --git a/host/lib/types/mac_addr.cpp b/host/lib/types/mac_addr.cpp
index 8ba5e7e28..dc710c4eb 100644
--- a/host/lib/types/mac_addr.cpp
+++ b/host/lib/types/mac_addr.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 <uhd/types/mac_addr.hpp>
diff --git a/host/lib/types/metadata.cpp b/host/lib/types/metadata.cpp
index cebf3a2b7..bdc432d9c 100644
--- a/host/lib/types/metadata.cpp
+++ b/host/lib/types/metadata.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 <string>
diff --git a/host/lib/types/metadata_c.cpp b/host/lib/types/metadata_c.cpp
index 7d3ac380d..352e5278f 100644
--- a/host/lib/types/metadata_c.cpp
+++ b/host/lib/types/metadata_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 <uhd/types/metadata.h>
diff --git a/host/lib/types/ranges.cpp b/host/lib/types/ranges.cpp
index 0cd890709..3b452aee5 100644
--- a/host/lib/types/ranges.cpp
+++ b/host/lib/types/ranges.cpp
@@ -1,7 +1,8 @@
 //
 // Copyright 2011-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 <uhd/types/ranges.hpp>
diff --git a/host/lib/types/ranges_c.cpp b/host/lib/types/ranges_c.cpp
index 5e007db28..922955147 100644
--- a/host/lib/types/ranges_c.cpp
+++ b/host/lib/types/ranges_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 <uhd/types/ranges.h>
diff --git a/host/lib/types/sensors.cpp b/host/lib/types/sensors.cpp
index d015cf666..e9f7ab506 100644
--- a/host/lib/types/sensors.cpp
+++ b/host/lib/types/sensors.cpp
@@ -1,7 +1,8 @@
 //
 // Copyright 2011-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 <uhd/types/sensors.hpp>
diff --git a/host/lib/types/sensors_c.cpp b/host/lib/types/sensors_c.cpp
index a2c26aeb1..6ea3eadae 100644
--- a/host/lib/types/sensors_c.cpp
+++ b/host/lib/types/sensors_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 <uhd/types/sensors.h>
diff --git a/host/lib/types/serial.cpp b/host/lib/types/serial.cpp
index de3ff49a8..381bb2181 100644
--- a/host/lib/types/serial.cpp
+++ b/host/lib/types/serial.cpp
@@ -1,7 +1,8 @@
 //
 // Copyright 2011-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 <uhd/types/serial.hpp>
diff --git a/host/lib/types/sid.cpp b/host/lib/types/sid.cpp
index 9be955b82..1f7aa0227 100644
--- a/host/lib/types/sid.cpp
+++ b/host/lib/types/sid.cpp
@@ -1,7 +1,8 @@
 //
 // Copyright 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/types/sid.hpp>
diff --git a/host/lib/types/string_vector_c.cpp b/host/lib/types/string_vector_c.cpp
index 61584b670..cf5da529a 100644
--- a/host/lib/types/string_vector_c.cpp
+++ b/host/lib/types/string_vector_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 <uhd/types/string_vector.h>
diff --git a/host/lib/types/time_spec.cpp b/host/lib/types/time_spec.cpp
index 94c91b1b6..40df87611 100644
--- a/host/lib/types/time_spec.cpp
+++ b/host/lib/types/time_spec.cpp
@@ -1,7 +1,8 @@
 //
 // Copyright 2011-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 <uhd/types/time_spec.hpp>
diff --git a/host/lib/types/tune.cpp b/host/lib/types/tune.cpp
index 3302039ec..eb504d1a3 100644
--- a/host/lib/types/tune.cpp
+++ b/host/lib/types/tune.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 <uhd/types/tune_request.hpp>
diff --git a/host/lib/types/tune_c.cpp b/host/lib/types/tune_c.cpp
index b51069ffc..db53e84ef 100644
--- a/host/lib/types/tune_c.cpp
+++ b/host/lib/types/tune_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 <uhd/types/tune_request.h>
diff --git a/host/lib/types/types.cpp b/host/lib/types/types.cpp
index 20fabae16..aa87f30a5 100644
--- a/host/lib/types/types.cpp
+++ b/host/lib/types/types.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 <uhd/types/stream_cmd.hpp>
diff --git a/host/lib/types/usrp_info_c.cpp b/host/lib/types/usrp_info_c.cpp
index ae2229870..841607be5 100644
--- a/host/lib/types/usrp_info_c.cpp
+++ b/host/lib/types/usrp_info_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 <uhd/types/usrp_info.h>
diff --git a/host/lib/types/wb_iface.cpp b/host/lib/types/wb_iface.cpp
index 93b6b4ecd..aad5d0bfe 100644
--- a/host/lib/types/wb_iface.cpp
+++ b/host/lib/types/wb_iface.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 <uhd/types/wb_iface.hpp>
-- 
cgit v1.2.3