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/usrp/usrp1/CMakeLists.txt | 1 + host/lib/usrp/usrp1/codec_ctrl.cpp | 3 ++- host/lib/usrp/usrp1/codec_ctrl.hpp | 3 ++- host/lib/usrp/usrp1/dboard_iface.cpp | 3 ++- host/lib/usrp/usrp1/io_impl.cpp | 3 ++- host/lib/usrp/usrp1/mb_eeprom.cpp | 2 +- host/lib/usrp/usrp1/soft_time_ctrl.cpp | 3 ++- host/lib/usrp/usrp1/soft_time_ctrl.hpp | 3 ++- host/lib/usrp/usrp1/usrp1_calc_mux.hpp | 3 ++- host/lib/usrp/usrp1/usrp1_iface.cpp | 3 ++- host/lib/usrp/usrp1/usrp1_iface.hpp | 3 ++- host/lib/usrp/usrp1/usrp1_impl.cpp | 3 ++- host/lib/usrp/usrp1/usrp1_impl.hpp | 3 ++- 13 files changed, 24 insertions(+), 12 deletions(-) (limited to 'host/lib/usrp/usrp1') diff --git a/host/lib/usrp/usrp1/CMakeLists.txt b/host/lib/usrp/usrp1/CMakeLists.txt index a7e725a2e..0c3c94c7b 100644 --- a/host/lib/usrp/usrp1/CMakeLists.txt +++ b/host/lib/usrp/usrp1/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2010-2011,2015 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/lib/usrp/usrp1/codec_ctrl.cpp b/host/lib/usrp/usrp1/codec_ctrl.cpp index 21f19423f..bcb3a28d9 100644 --- a/host/lib/usrp/usrp1/codec_ctrl.cpp +++ b/host/lib/usrp/usrp1/codec_ctrl.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 "codec_ctrl.hpp" diff --git a/host/lib/usrp/usrp1/codec_ctrl.hpp b/host/lib/usrp/usrp1/codec_ctrl.hpp index a62cd5e36..7e5dae1e4 100644 --- a/host/lib/usrp/usrp1/codec_ctrl.hpp +++ b/host/lib/usrp/usrp1/codec_ctrl.hpp @@ -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 // #ifndef INCLUDED_USRP1_CODEC_CTRL_HPP diff --git a/host/lib/usrp/usrp1/dboard_iface.cpp b/host/lib/usrp/usrp1/dboard_iface.cpp index 7de848332..2f295b22b 100644 --- a/host/lib/usrp/usrp1/dboard_iface.cpp +++ b/host/lib/usrp/usrp1/dboard_iface.cpp @@ -1,7 +1,8 @@ // // Copyright 2010-2012,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 "usrp1_iface.hpp" diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp index d9bea74d3..a4ffac3db 100644 --- a/host/lib/usrp/usrp1/io_impl.cpp +++ b/host/lib/usrp/usrp1/io_impl.cpp @@ -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 // #include "validate_subdev_spec.hpp" diff --git a/host/lib/usrp/usrp1/mb_eeprom.cpp b/host/lib/usrp/usrp1/mb_eeprom.cpp index ba05b6fd0..cedbb8944 100644 --- a/host/lib/usrp/usrp1/mb_eeprom.cpp +++ b/host/lib/usrp/usrp1/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 "usrp1_impl.hpp" diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp index 619a05faa..626f973e1 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp @@ -1,7 +1,8 @@ // // Copyright 2011-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 "soft_time_ctrl.hpp" diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.hpp b/host/lib/usrp/usrp1/soft_time_ctrl.hpp index a072a96db..28b65a3f9 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.hpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.hpp @@ -1,7 +1,8 @@ // // Copyright 2011-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 // #ifndef INCLUDED_LIBUHD_USRP_USRP1_SOFT_TIME_CTRL_HPP diff --git a/host/lib/usrp/usrp1/usrp1_calc_mux.hpp b/host/lib/usrp/usrp1/usrp1_calc_mux.hpp index d81e735cc..76e0bf971 100644 --- a/host/lib/usrp/usrp1/usrp1_calc_mux.hpp +++ b/host/lib/usrp/usrp1/usrp1_calc_mux.hpp @@ -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/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp index 4654d4bcd..ebc438f20 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.cpp +++ b/host/lib/usrp/usrp1/usrp1_iface.cpp @@ -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 // #include "usrp1_iface.hpp" diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp index 601f032f7..ec6bc52d4 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.hpp +++ b/host/lib/usrp/usrp1/usrp1_iface.hpp @@ -1,7 +1,8 @@ // // Copyright 2010-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_USRP1_IFACE_HPP diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index a3f76ff41..9dee15049 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.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 "usrp1_impl.hpp" diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp index fa38f58ef..e26fa44d0 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.hpp +++ b/host/lib/usrp/usrp1/usrp1_impl.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 // #include "usrp1_iface.hpp" -- cgit v1.2.3