aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/n230
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/n230
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/n230')
-rw-r--r--host/lib/usrp/n230/CMakeLists.txt1
-rw-r--r--host/lib/usrp/n230/n230_clk_pps_ctrl.cpp3
-rw-r--r--host/lib/usrp/n230/n230_clk_pps_ctrl.hpp3
-rw-r--r--host/lib/usrp/n230/n230_cores.cpp3
-rw-r--r--host/lib/usrp/n230/n230_cores.hpp3
-rw-r--r--host/lib/usrp/n230/n230_defaults.h3
-rw-r--r--host/lib/usrp/n230/n230_device_args.hpp3
-rw-r--r--host/lib/usrp/n230/n230_eeprom.h3
-rw-r--r--host/lib/usrp/n230/n230_eeprom_manager.cpp3
-rw-r--r--host/lib/usrp/n230/n230_eeprom_manager.hpp3
-rw-r--r--host/lib/usrp/n230/n230_fpga_defs.h3
-rw-r--r--host/lib/usrp/n230/n230_frontend_ctrl.cpp3
-rw-r--r--host/lib/usrp/n230/n230_frontend_ctrl.hpp3
-rw-r--r--host/lib/usrp/n230/n230_fw_comm_protocol.h3
-rw-r--r--host/lib/usrp/n230/n230_fw_ctrl_iface.cpp3
-rw-r--r--host/lib/usrp/n230/n230_fw_ctrl_iface.hpp3
-rw-r--r--host/lib/usrp/n230/n230_fw_defs.h3
-rw-r--r--host/lib/usrp/n230/n230_fw_host_iface.h3
-rw-r--r--host/lib/usrp/n230/n230_image_loader.cpp3
-rw-r--r--host/lib/usrp/n230/n230_impl.cpp3
-rw-r--r--host/lib/usrp/n230/n230_impl.hpp3
-rw-r--r--host/lib/usrp/n230/n230_resource_manager.cpp3
-rw-r--r--host/lib/usrp/n230/n230_resource_manager.hpp3
-rw-r--r--host/lib/usrp/n230/n230_stream_manager.cpp3
-rw-r--r--host/lib/usrp/n230/n230_stream_manager.hpp3
-rw-r--r--host/lib/usrp/n230/n230_uart.cpp3
-rw-r--r--host/lib/usrp/n230/n230_uart.hpp3
27 files changed, 53 insertions, 26 deletions
diff --git a/host/lib/usrp/n230/CMakeLists.txt b/host/lib/usrp/n230/CMakeLists.txt
index 2c10cd872..9d16067a0 100644
--- a/host/lib/usrp/n230/CMakeLists.txt
+++ b/host/lib/usrp/n230/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/usrp/n230/n230_clk_pps_ctrl.cpp b/host/lib/usrp/n230/n230_clk_pps_ctrl.cpp
index 6ada98d5b..749f3777a 100644
--- a/host/lib/usrp/n230/n230_clk_pps_ctrl.cpp
+++ b/host/lib/usrp/n230/n230_clk_pps_ctrl.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 "n230_clk_pps_ctrl.hpp"
diff --git a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp
index 940e8e318..53ff0571f 100644
--- a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp
+++ b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp
@@ -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
//
#ifndef INCLUDED_N230_CLK_PPS_CTRL_HPP
diff --git a/host/lib/usrp/n230/n230_cores.cpp b/host/lib/usrp/n230/n230_cores.cpp
index 98b45518d..8e0132abd 100644
--- a/host/lib/usrp/n230/n230_cores.cpp
+++ b/host/lib/usrp/n230/n230_cores.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 "n230_cores.hpp"
diff --git a/host/lib/usrp/n230/n230_cores.hpp b/host/lib/usrp/n230/n230_cores.hpp
index 832ace329..ac454cc39 100644
--- a/host/lib/usrp/n230/n230_cores.hpp
+++ b/host/lib/usrp/n230/n230_cores.hpp
@@ -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
//
#ifndef INCLUDED_N230_CORES_HPP
diff --git a/host/lib/usrp/n230/n230_defaults.h b/host/lib/usrp/n230/n230_defaults.h
index 4c8a9bbc5..e224ab6f9 100644
--- a/host/lib/usrp/n230/n230_defaults.h
+++ b/host/lib/usrp/n230/n230_defaults.h
@@ -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
//
#ifndef INCLUDED_N230_DEFAULTS_H
diff --git a/host/lib/usrp/n230/n230_device_args.hpp b/host/lib/usrp/n230/n230_device_args.hpp
index b0a4a23c9..0e7b5dfe2 100644
--- a/host/lib/usrp/n230/n230_device_args.hpp
+++ b/host/lib/usrp/n230/n230_device_args.hpp
@@ -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
//
#ifndef INCLUDED_N230_DEV_ARGS_HPP
diff --git a/host/lib/usrp/n230/n230_eeprom.h b/host/lib/usrp/n230/n230_eeprom.h
index 47ba4b421..fdc942af5 100644
--- a/host/lib/usrp/n230/n230_eeprom.h
+++ b/host/lib/usrp/n230/n230_eeprom.h
@@ -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
//
#ifndef INCLUDED_N230_EEPROM_H
diff --git a/host/lib/usrp/n230/n230_eeprom_manager.cpp b/host/lib/usrp/n230/n230_eeprom_manager.cpp
index 8e68f8f99..f5fda3c2f 100644
--- a/host/lib/usrp/n230/n230_eeprom_manager.cpp
+++ b/host/lib/usrp/n230/n230_eeprom_manager.cpp
@@ -1,7 +1,8 @@
//
// Copyright 2013-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 "n230_eeprom.h"
diff --git a/host/lib/usrp/n230/n230_eeprom_manager.hpp b/host/lib/usrp/n230/n230_eeprom_manager.hpp
index da5cb36ae..cc51f3747 100644
--- a/host/lib/usrp/n230/n230_eeprom_manager.hpp
+++ b/host/lib/usrp/n230/n230_eeprom_manager.hpp
@@ -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
//
#ifndef INCLUDED_N230_EEPROM_MANAGER_HPP
diff --git a/host/lib/usrp/n230/n230_fpga_defs.h b/host/lib/usrp/n230/n230_fpga_defs.h
index 3e13e3454..e3efff7af 100644
--- a/host/lib/usrp/n230/n230_fpga_defs.h
+++ b/host/lib/usrp/n230/n230_fpga_defs.h
@@ -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
//
#ifndef INCLUDED_N230_FPGA_DEFS_H
diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.cpp b/host/lib/usrp/n230/n230_frontend_ctrl.cpp
index e49ee1ed3..7cbe578eb 100644
--- a/host/lib/usrp/n230/n230_frontend_ctrl.cpp
+++ b/host/lib/usrp/n230/n230_frontend_ctrl.cpp
@@ -1,7 +1,8 @@
//
// Copyright 2013-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 "n230_frontend_ctrl.hpp"
diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.hpp b/host/lib/usrp/n230/n230_frontend_ctrl.hpp
index c5aa302de..6faa35ac8 100644
--- a/host/lib/usrp/n230/n230_frontend_ctrl.hpp
+++ b/host/lib/usrp/n230/n230_frontend_ctrl.hpp
@@ -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
//
#ifndef INCLUDED_N230_FRONTEND_CTRL_HPP
diff --git a/host/lib/usrp/n230/n230_fw_comm_protocol.h b/host/lib/usrp/n230/n230_fw_comm_protocol.h
index 15926ebdc..77d8bd7bf 100644
--- a/host/lib/usrp/n230/n230_fw_comm_protocol.h
+++ b/host/lib/usrp/n230/n230_fw_comm_protocol.h
@@ -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
//
#ifndef INCLUDED_N230_FW_COMM_PROTOCOL
diff --git a/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp b/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp
index 391df4d54..17fc46d68 100644
--- a/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp
+++ b/host/lib/usrp/n230/n230_fw_ctrl_iface.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 "n230_fw_ctrl_iface.hpp"
diff --git a/host/lib/usrp/n230/n230_fw_ctrl_iface.hpp b/host/lib/usrp/n230/n230_fw_ctrl_iface.hpp
index fa584a455..942640332 100644
--- a/host/lib/usrp/n230/n230_fw_ctrl_iface.hpp
+++ b/host/lib/usrp/n230/n230_fw_ctrl_iface.hpp
@@ -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
//
#ifndef INCLUDED_LIBUHD_USRP_N230_UDP_FW_CTRL_IFACE_HPP
diff --git a/host/lib/usrp/n230/n230_fw_defs.h b/host/lib/usrp/n230/n230_fw_defs.h
index cb2178229..a9e4f9274 100644
--- a/host/lib/usrp/n230/n230_fw_defs.h
+++ b/host/lib/usrp/n230/n230_fw_defs.h
@@ -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
//
#ifndef INCLUDED_N230_FW_DEFS_H
diff --git a/host/lib/usrp/n230/n230_fw_host_iface.h b/host/lib/usrp/n230/n230_fw_host_iface.h
index d5d9c3812..552049ccd 100644
--- a/host/lib/usrp/n230/n230_fw_host_iface.h
+++ b/host/lib/usrp/n230/n230_fw_host_iface.h
@@ -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
//
#ifndef INCLUDED_N230_FW_HOST_IFACE_H
diff --git a/host/lib/usrp/n230/n230_image_loader.cpp b/host/lib/usrp/n230/n230_image_loader.cpp
index 6387126a6..ff5eb6bd9 100644
--- a/host/lib/usrp/n230/n230_image_loader.cpp
+++ b/host/lib/usrp/n230/n230_image_loader.cpp
@@ -1,7 +1,8 @@
//
// Copyright 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 <fstream>
diff --git a/host/lib/usrp/n230/n230_impl.cpp b/host/lib/usrp/n230/n230_impl.cpp
index c2f58f665..fd3d33ef5 100644
--- a/host/lib/usrp/n230/n230_impl.cpp
+++ b/host/lib/usrp/n230/n230_impl.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 "n230_impl.hpp"
diff --git a/host/lib/usrp/n230/n230_impl.hpp b/host/lib/usrp/n230/n230_impl.hpp
index c09100a2e..d0547922a 100644
--- a/host/lib/usrp/n230/n230_impl.hpp
+++ b/host/lib/usrp/n230/n230_impl.hpp
@@ -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
//
#ifndef INCLUDED_N230_IMPL_HPP
diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp
index 7eab35c7a..e9f8b5c7d 100644
--- a/host/lib/usrp/n230/n230_resource_manager.cpp
+++ b/host/lib/usrp/n230/n230_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 "n230_resource_manager.hpp"
diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp
index f79b0c483..b2a9b6a9d 100644
--- a/host/lib/usrp/n230/n230_resource_manager.hpp
+++ b/host/lib/usrp/n230/n230_resource_manager.hpp
@@ -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
//
#ifndef INCLUDED_N230_RESOURCE_MANAGER_HPP
diff --git a/host/lib/usrp/n230/n230_stream_manager.cpp b/host/lib/usrp/n230/n230_stream_manager.cpp
index 4340c6e9d..3071adf3a 100644
--- a/host/lib/usrp/n230/n230_stream_manager.cpp
+++ b/host/lib/usrp/n230/n230_stream_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 "n230_stream_manager.hpp"
diff --git a/host/lib/usrp/n230/n230_stream_manager.hpp b/host/lib/usrp/n230/n230_stream_manager.hpp
index 2691e9fc8..a6acb602d 100644
--- a/host/lib/usrp/n230/n230_stream_manager.hpp
+++ b/host/lib/usrp/n230/n230_stream_manager.hpp
@@ -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
//
#ifndef INCLUDED_N230_STREAM_MANAGER_HPP
diff --git a/host/lib/usrp/n230/n230_uart.cpp b/host/lib/usrp/n230/n230_uart.cpp
index b53196afe..8689335c8 100644
--- a/host/lib/usrp/n230/n230_uart.cpp
+++ b/host/lib/usrp/n230/n230_uart.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 "n230_uart.hpp"
diff --git a/host/lib/usrp/n230/n230_uart.hpp b/host/lib/usrp/n230/n230_uart.hpp
index 9da588942..1a90ca928 100644
--- a/host/lib/usrp/n230/n230_uart.hpp
+++ b/host/lib/usrp/n230/n230_uart.hpp
@@ -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
//
#ifndef INCLUDED_N230_UART_HPP