aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/transport/nirio
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-02-19 15:30:32 -0800
committerMartin Braun <martin.braun@ettus.com>2018-02-19 16:54:52 -0800
commitae5211d71dcd0715ed83e1d4949d8425d64cb3d1 (patch)
treed78d7cd9138636a8e860af7fbe0f0ca538681cd5 /host/lib/transport/nirio
parentf15dbc0484adf95c245ac86fb9aa7ea37ccce71b (diff)
downloaduhd-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/transport/nirio')
-rw-r--r--host/lib/transport/nirio/CMakeLists.txt1
-rw-r--r--host/lib/transport/nirio/lvbitx/CMakeLists.txt1
-rwxr-xr-xhost/lib/transport/nirio/lvbitx/process-lvbitx.py3
-rw-r--r--host/lib/transport/nirio/nifpga_lvbitx.cpp3
-rw-r--r--host/lib/transport/nirio/nirio_driver_iface_linux.cpp3
-rw-r--r--host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp3
-rw-r--r--host/lib/transport/nirio/nirio_driver_iface_win.cpp3
-rw-r--r--host/lib/transport/nirio/nirio_resource_manager.cpp3
-rw-r--r--host/lib/transport/nirio/niriok_proxy.cpp3
-rw-r--r--host/lib/transport/nirio/niriok_proxy_impl_v1.cpp3
-rw-r--r--host/lib/transport/nirio/niriok_proxy_impl_v2.cpp3
-rw-r--r--host/lib/transport/nirio/niusrprio_session.cpp3
-rw-r--r--host/lib/transport/nirio/rpc/CMakeLists.txt1
-rw-r--r--host/lib/transport/nirio/rpc/rpc_client.cpp3
-rw-r--r--host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp3
-rw-r--r--host/lib/transport/nirio/status.cpp3
16 files changed, 29 insertions, 13 deletions
diff --git a/host/lib/transport/nirio/CMakeLists.txt b/host/lib/transport/nirio/CMakeLists.txt
index c759166f3..8336d6063 100644
--- a/host/lib/transport/nirio/CMakeLists.txt
+++ b/host/lib/transport/nirio/CMakeLists.txt
@@ -1,5 +1,6 @@
#
# Copyright 2013-2014 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
# SPDX-License-Identifier: GPL-3.0
#
diff --git a/host/lib/transport/nirio/lvbitx/CMakeLists.txt b/host/lib/transport/nirio/lvbitx/CMakeLists.txt
index 99c1a194e..6fbd6b469 100644
--- a/host/lib/transport/nirio/lvbitx/CMakeLists.txt
+++ b/host/lib/transport/nirio/lvbitx/CMakeLists.txt
@@ -1,5 +1,6 @@
#
# Copyright 2013,2015 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
# SPDX-License-Identifier: GPL-3.0
#
diff --git a/host/lib/transport/nirio/lvbitx/process-lvbitx.py b/host/lib/transport/nirio/lvbitx/process-lvbitx.py
index 09af4606b..5a4f0afa3 100755
--- a/host/lib/transport/nirio/lvbitx/process-lvbitx.py
+++ b/host/lib/transport/nirio/lvbitx/process-lvbitx.py
@@ -1,8 +1,9 @@
#!/usr/bin/python
#
# 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
#
from xml.etree import ElementTree
diff --git a/host/lib/transport/nirio/nifpga_lvbitx.cpp b/host/lib/transport/nirio/nifpga_lvbitx.cpp
index f018446aa..2d8b63293 100644
--- a/host/lib/transport/nirio/nifpga_lvbitx.cpp
+++ b/host/lib/transport/nirio/nifpga_lvbitx.cpp
@@ -1,7 +1,8 @@
//
// Copyright 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/transport/nirio/nifpga_lvbitx.h>
diff --git a/host/lib/transport/nirio/nirio_driver_iface_linux.cpp b/host/lib/transport/nirio/nirio_driver_iface_linux.cpp
index 680fc49fd..b66f6413e 100644
--- a/host/lib/transport/nirio/nirio_driver_iface_linux.cpp
+++ b/host/lib/transport/nirio/nirio_driver_iface_linux.cpp
@@ -1,7 +1,8 @@
//
// 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
//
#include <uhd/transport/nirio/nirio_driver_iface.h>
diff --git a/host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp b/host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp
index f212867b5..548f3b7f4 100644
--- a/host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp
+++ b/host/lib/transport/nirio/nirio_driver_iface_unsupported.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/transport/nirio/nirio_driver_iface.h>
diff --git a/host/lib/transport/nirio/nirio_driver_iface_win.cpp b/host/lib/transport/nirio/nirio_driver_iface_win.cpp
index 9d213a4e1..6a5513ebe 100644
--- a/host/lib/transport/nirio/nirio_driver_iface_win.cpp
+++ b/host/lib/transport/nirio/nirio_driver_iface_win.cpp
@@ -1,7 +1,8 @@
//
// Copyright 2013,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/transport/nirio/nirio_driver_iface.h>
diff --git a/host/lib/transport/nirio/nirio_resource_manager.cpp b/host/lib/transport/nirio/nirio_resource_manager.cpp
index 3eb9d1665..42e85d7c1 100644
--- a/host/lib/transport/nirio/nirio_resource_manager.cpp
+++ b/host/lib/transport/nirio/nirio_resource_manager.cpp
@@ -1,7 +1,8 @@
//
// 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
//
#include <uhd/transport/nirio/nirio_resource_manager.h>
diff --git a/host/lib/transport/nirio/niriok_proxy.cpp b/host/lib/transport/nirio/niriok_proxy.cpp
index 7eb211d15..ee177c371 100644
--- a/host/lib/transport/nirio/niriok_proxy.cpp
+++ b/host/lib/transport/nirio/niriok_proxy.cpp
@@ -1,7 +1,8 @@
//
// Copyright 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/transport/nirio/niriok_proxy.h>
diff --git a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp
index b851827c7..ae69cb470 100644
--- a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp
+++ b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp
@@ -1,7 +1,8 @@
//
// Copyright 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/transport/nirio/niriok_proxy_impl_v1.h>
diff --git a/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp b/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp
index 4881a9596..7e442eef1 100644
--- a/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp
+++ b/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp
@@ -1,7 +1,8 @@
//
// Copyright 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
//
diff --git a/host/lib/transport/nirio/niusrprio_session.cpp b/host/lib/transport/nirio/niusrprio_session.cpp
index 8d0c05a8f..2f11d31e6 100644
--- a/host/lib/transport/nirio/niusrprio_session.cpp
+++ b/host/lib/transport/nirio/niusrprio_session.cpp
@@ -1,7 +1,8 @@
//
// 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
//
diff --git a/host/lib/transport/nirio/rpc/CMakeLists.txt b/host/lib/transport/nirio/rpc/CMakeLists.txt
index e5563c928..bde242ca3 100644
--- a/host/lib/transport/nirio/rpc/CMakeLists.txt
+++ b/host/lib/transport/nirio/rpc/CMakeLists.txt
@@ -1,5 +1,6 @@
#
# Copyright 2013 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
# SPDX-License-Identifier: GPL-3.0
#
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index 28cb9d734..e047c6bec 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -1,7 +1,8 @@
///
// Copyright 2013,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/transport/nirio/rpc/rpc_client.hpp>
diff --git a/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp b/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp
index 77ea539ba..f8a733a2b 100644
--- a/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp
@@ -1,7 +1,8 @@
//
// 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
//
#include <uhd/transport/nirio/rpc/usrprio_rpc_client.hpp>
diff --git a/host/lib/transport/nirio/status.cpp b/host/lib/transport/nirio/status.cpp
index 2004063fe..4dd63f5c6 100644
--- a/host/lib/transport/nirio/status.cpp
+++ b/host/lib/transport/nirio/status.cpp
@@ -1,7 +1,8 @@
//
// 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
//