aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/b100
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/usrp/b100
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/usrp/b100')
-rw-r--r--host/lib/usrp/b100/CMakeLists.txt1
-rw-r--r--host/lib/usrp/b100/b100_impl.cpp3
-rw-r--r--host/lib/usrp/b100/b100_impl.hpp3
-rw-r--r--host/lib/usrp/b100/b100_regs.hpp3
-rw-r--r--host/lib/usrp/b100/clock_ctrl.cpp3
-rw-r--r--host/lib/usrp/b100/clock_ctrl.hpp3
-rw-r--r--host/lib/usrp/b100/codec_ctrl.cpp3
-rw-r--r--host/lib/usrp/b100/codec_ctrl.hpp3
-rw-r--r--host/lib/usrp/b100/dboard_iface.cpp3
-rw-r--r--host/lib/usrp/b100/io_impl.cpp3
-rw-r--r--host/lib/usrp/b100/mb_eeprom.cpp2
-rw-r--r--host/lib/usrp/b100/usb_zero_copy_wrapper.cpp3
12 files changed, 22 insertions, 11 deletions
diff --git a/host/lib/usrp/b100/CMakeLists.txt b/host/lib/usrp/b100/CMakeLists.txt
index 41af2bb00..b1bcd22a4 100644
--- a/host/lib/usrp/b100/CMakeLists.txt
+++ b/host/lib/usrp/b100/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/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp
index 65377e1d7..8f9f5c15f 100644
--- a/host/lib/usrp/b100/b100_impl.cpp
+++ b/host/lib/usrp/b100/b100_impl.cpp
@@ -1,7 +1,8 @@
//
// Copyright 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 "apply_corrections.hpp"
diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp
index 731dc25e9..dc4b43040 100644
--- a/host/lib/usrp/b100/b100_impl.hpp
+++ b/host/lib/usrp/b100/b100_impl.hpp
@@ -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
//
#ifndef INCLUDED_B100_IMPL_HPP
diff --git a/host/lib/usrp/b100/b100_regs.hpp b/host/lib/usrp/b100/b100_regs.hpp
index a3885567e..8cb231488 100644
--- a/host/lib/usrp/b100/b100_regs.hpp
+++ b/host/lib/usrp/b100/b100_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_B100_REGS_HPP
diff --git a/host/lib/usrp/b100/clock_ctrl.cpp b/host/lib/usrp/b100/clock_ctrl.cpp
index 4720b31f3..e3ef7d6a5 100644
--- a/host/lib/usrp/b100/clock_ctrl.cpp
+++ b/host/lib/usrp/b100/clock_ctrl.cpp
@@ -1,7 +1,8 @@
//
// Copyright 2011,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 "clock_ctrl.hpp"
diff --git a/host/lib/usrp/b100/clock_ctrl.hpp b/host/lib/usrp/b100/clock_ctrl.hpp
index f86ee71e8..4d014208c 100644
--- a/host/lib/usrp/b100/clock_ctrl.hpp
+++ b/host/lib/usrp/b100/clock_ctrl.hpp
@@ -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
//
#ifndef INCLUDED_B100_CLOCK_CTRL_HPP
diff --git a/host/lib/usrp/b100/codec_ctrl.cpp b/host/lib/usrp/b100/codec_ctrl.cpp
index 9ef17de57..1dac58916 100644
--- a/host/lib/usrp/b100/codec_ctrl.cpp
+++ b/host/lib/usrp/b100/codec_ctrl.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 "codec_ctrl.hpp"
diff --git a/host/lib/usrp/b100/codec_ctrl.hpp b/host/lib/usrp/b100/codec_ctrl.hpp
index e8288cd3b..cd7b0bfdf 100644
--- a/host/lib/usrp/b100/codec_ctrl.hpp
+++ b/host/lib/usrp/b100/codec_ctrl.hpp
@@ -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
//
#ifndef INCLUDED_B100_CODEC_CTRL_HPP
diff --git a/host/lib/usrp/b100/dboard_iface.cpp b/host/lib/usrp/b100/dboard_iface.cpp
index 9d221a928..0820d1427 100644
--- a/host/lib/usrp/b100/dboard_iface.cpp
+++ b/host/lib/usrp/b100/dboard_iface.cpp
@@ -1,7 +1,8 @@
//
// Copyright 2011,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/b100/io_impl.cpp b/host/lib/usrp/b100/io_impl.cpp
index 545021576..f6c5c3fb0 100644
--- a/host/lib/usrp/b100/io_impl.cpp
+++ b/host/lib/usrp/b100/io_impl.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 "validate_subdev_spec.hpp"
diff --git a/host/lib/usrp/b100/mb_eeprom.cpp b/host/lib/usrp/b100/mb_eeprom.cpp
index be7137b7b..e353ceec4 100644
--- a/host/lib/usrp/b100/mb_eeprom.cpp
+++ b/host/lib/usrp/b100/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 "b100_impl.hpp"
diff --git a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
index 2c93887b2..7efd061c0 100644
--- a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
+++ b/host/lib/usrp/b100/usb_zero_copy_wrapper.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/transport/usb_zero_copy.hpp>