diff options
Diffstat (limited to 'host/lib/usrp/common')
32 files changed, 59 insertions, 31 deletions
diff --git a/host/lib/usrp/common/CMakeLists.txt b/host/lib/usrp/common/CMakeLists.txt index c11dde123..dca3663bb 100644 --- a/host/lib/usrp/common/CMakeLists.txt +++ b/host/lib/usrp/common/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright 2011-2013,2016 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # # SPDX-License-Identifier: GPL-3.0 # diff --git a/host/lib/usrp/common/ad9361_ctrl.cpp b/host/lib/usrp/common/ad9361_ctrl.cpp index a93c199a3..a6f219185 100644 --- a/host/lib/usrp/common/ad9361_ctrl.cpp +++ b/host/lib/usrp/common/ad9361_ctrl.cpp @@ -1,7 +1,8 @@ // // Copyright 2012-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 "ad9361_ctrl.hpp" diff --git a/host/lib/usrp/common/ad9361_ctrl.hpp b/host/lib/usrp/common/ad9361_ctrl.hpp index 8dbb909f7..b9e81074b 100644 --- a/host/lib/usrp/common/ad9361_ctrl.hpp +++ b/host/lib/usrp/common/ad9361_ctrl.hpp @@ -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 // #ifndef INCLUDED_AD9361_CTRL_HPP diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_client.h b/host/lib/usrp/common/ad9361_driver/ad9361_client.h index 196782d8d..a2343a3db 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_client.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_client.h @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_AD9361_CLIENT_H diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp index ebde82b17..6558595d9 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad9361_filter_taps.h" diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.h b/host/lib/usrp/common/ad9361_driver/ad9361_device.h index 99f4b25a3..5bc3d2aee 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.h @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_AD9361_DEVICE_H diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_filter_taps.h b/host/lib/usrp/common/ad9361_driver/ad9361_filter_taps.h index 9ee538bce..9411730f1 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_filter_taps.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_filter_taps.h @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_AD9361_FILTER_TAPS_HPP diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_gain_tables.h b/host/lib/usrp/common/ad9361_driver/ad9361_gain_tables.h index a8206359a..7787b2dc6 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_gain_tables.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_gain_tables.h @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_AD9361_GAIN_TABLES_HPP diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_synth_lut.h b/host/lib/usrp/common/ad9361_driver/ad9361_synth_lut.h index 497a9013f..4ee376f46 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_synth_lut.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_synth_lut.h @@ -1,7 +1,8 @@ // // Copyright 2014 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_AD9361_SYNTH_LUT_HPP diff --git a/host/lib/usrp/common/ad936x_manager.cpp b/host/lib/usrp/common/ad936x_manager.cpp index b82865fe1..34e51ec0e 100644 --- a/host/lib/usrp/common/ad936x_manager.cpp +++ b/host/lib/usrp/common/ad936x_manager.cpp @@ -1,7 +1,8 @@ // // Copyright 2015 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "ad936x_manager.hpp" diff --git a/host/lib/usrp/common/ad936x_manager.hpp b/host/lib/usrp/common/ad936x_manager.hpp index c1190abfd..dd5c38337 100644 --- a/host/lib/usrp/common/ad936x_manager.hpp +++ b/host/lib/usrp/common/ad936x_manager.hpp @@ -1,7 +1,8 @@ // // Copyright 2015 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_AD9361_MANAGER_HPP diff --git a/host/lib/usrp/common/adf4001_ctrl.cpp b/host/lib/usrp/common/adf4001_ctrl.cpp index b7361d64e..5fb9fd223 100644 --- a/host/lib/usrp/common/adf4001_ctrl.cpp +++ b/host/lib/usrp/common/adf4001_ctrl.cpp @@ -1,12 +1,13 @@ // // Copyright 2013 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // // Original ADF4001 driver written by: bistromath // Mar 1, 2013 // // Re-used and re-licensed with permission. // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "adf4001_ctrl.hpp" diff --git a/host/lib/usrp/common/adf4001_ctrl.hpp b/host/lib/usrp/common/adf4001_ctrl.hpp index bd2d4528d..c7f6668b8 100644 --- a/host/lib/usrp/common/adf4001_ctrl.hpp +++ b/host/lib/usrp/common/adf4001_ctrl.hpp @@ -1,12 +1,13 @@ // // Copyright 2013 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company // // Original ADF4001 driver written by: bistromath // Mar 1, 2013 // // Re-used and re-licensed with permission. // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_LIBUHD_USRP_COMMON_ADF4001_HPP diff --git a/host/lib/usrp/common/adf435x.cpp b/host/lib/usrp/common/adf435x.cpp index 9c8dbabd8..d1d533ad2 100644 --- a/host/lib/usrp/common/adf435x.cpp +++ b/host/lib/usrp/common/adf435x.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 "adf435x.hpp" diff --git a/host/lib/usrp/common/adf435x.hpp b/host/lib/usrp/common/adf435x.hpp index 1b4ee6425..bd7b91b95 100644 --- a/host/lib/usrp/common/adf435x.hpp +++ b/host/lib/usrp/common/adf435x.hpp @@ -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 // #ifndef INCLUDED_ADF435X_HPP diff --git a/host/lib/usrp/common/adf535x.cpp b/host/lib/usrp/common/adf535x.cpp index 4289d7493..4885f4b5a 100644 --- a/host/lib/usrp/common/adf535x.cpp +++ b/host/lib/usrp/common/adf535x.cpp @@ -1,7 +1,7 @@ // // Copyright 2013-2014, 2017 Ettus Research, A National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "adf535x.hpp" diff --git a/host/lib/usrp/common/adf535x.hpp b/host/lib/usrp/common/adf535x.hpp index 539290c28..8380c9d04 100644 --- a/host/lib/usrp/common/adf535x.hpp +++ b/host/lib/usrp/common/adf535x.hpp @@ -1,7 +1,7 @@ // // Copyright 2015, 2017 Ettus Research, A National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDED_ADF535X_HPP diff --git a/host/lib/usrp/common/apply_corrections.cpp b/host/lib/usrp/common/apply_corrections.cpp index 47d33a36a..3d7127bfe 100644 --- a/host/lib/usrp/common/apply_corrections.cpp +++ b/host/lib/usrp/common/apply_corrections.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 "apply_corrections.hpp" diff --git a/host/lib/usrp/common/apply_corrections.hpp b/host/lib/usrp/common/apply_corrections.hpp index 3e1b58252..3b4669f9a 100644 --- a/host/lib/usrp/common/apply_corrections.hpp +++ b/host/lib/usrp/common/apply_corrections.hpp @@ -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 // #ifndef INCLUDED_LIBUHD_USRP_COMMON_APPLY_CORRECTIONS_HPP diff --git a/host/lib/usrp/common/async_packet_handler.hpp b/host/lib/usrp/common/async_packet_handler.hpp index a9f32a6ed..de9d17001 100644 --- a/host/lib/usrp/common/async_packet_handler.hpp +++ b/host/lib/usrp/common/async_packet_handler.hpp @@ -1,7 +1,8 @@ // // Copyright 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_LIBUHD_USRP_COMMON_ASYNC_PACKET_HANDLER_HPP diff --git a/host/lib/usrp/common/fifo_ctrl_excelsior.cpp b/host/lib/usrp/common/fifo_ctrl_excelsior.cpp index e1d2d9bb6..b25b76f6b 100644 --- a/host/lib/usrp/common/fifo_ctrl_excelsior.cpp +++ b/host/lib/usrp/common/fifo_ctrl_excelsior.cpp @@ -1,7 +1,8 @@ // // Copyright 2012,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 "fifo_ctrl_excelsior.hpp" diff --git a/host/lib/usrp/common/fifo_ctrl_excelsior.hpp b/host/lib/usrp/common/fifo_ctrl_excelsior.hpp index 7c9eefa54..91c006a1a 100644 --- a/host/lib/usrp/common/fifo_ctrl_excelsior.hpp +++ b/host/lib/usrp/common/fifo_ctrl_excelsior.hpp @@ -1,7 +1,8 @@ // // Copyright 2012,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 // #ifndef INCLUDED_B200_CTRL_HPP diff --git a/host/lib/usrp/common/fx2_ctrl.cpp b/host/lib/usrp/common/fx2_ctrl.cpp index 73c238828..3d8ff6e67 100644 --- a/host/lib/usrp/common/fx2_ctrl.cpp +++ b/host/lib/usrp/common/fx2_ctrl.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 "fx2_ctrl.hpp" diff --git a/host/lib/usrp/common/fx2_ctrl.hpp b/host/lib/usrp/common/fx2_ctrl.hpp index ae84d38f6..258aa7d04 100644 --- a/host/lib/usrp/common/fx2_ctrl.hpp +++ b/host/lib/usrp/common/fx2_ctrl.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_LIBUHD_USRP_COMMON_FX2_CTRL_HPP diff --git a/host/lib/usrp/common/lmk04828.cpp b/host/lib/usrp/common/lmk04828.cpp index c342b1cf8..46766e8d2 100644 --- a/host/lib/usrp/common/lmk04828.cpp +++ b/host/lib/usrp/common/lmk04828.cpp @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #include "lmk04828.hpp" diff --git a/host/lib/usrp/common/lmk04828.hpp b/host/lib/usrp/common/lmk04828.hpp index e911b8d0c..e2f1b8669 100644 --- a/host/lib/usrp/common/lmk04828.hpp +++ b/host/lib/usrp/common/lmk04828.hpp @@ -1,7 +1,7 @@ // // Copyright 2017 Ettus Research, a National Instruments Company // -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GPL-3.0-or-later // #ifndef INCLUDE_LMK04828_HPP diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp index d88ce1e61..762daf7b6 100644 --- a/host/lib/usrp/common/max287x.hpp +++ b/host/lib/usrp/common/max287x.hpp @@ -1,7 +1,8 @@ // // Copyright 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 // #ifndef MAX287X_HPP_INCLUDED diff --git a/host/lib/usrp/common/recv_packet_demuxer.cpp b/host/lib/usrp/common/recv_packet_demuxer.cpp index 70719314d..62d88d0ec 100644 --- a/host/lib/usrp/common/recv_packet_demuxer.cpp +++ b/host/lib/usrp/common/recv_packet_demuxer.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 "recv_packet_demuxer.hpp" diff --git a/host/lib/usrp/common/recv_packet_demuxer.hpp b/host/lib/usrp/common/recv_packet_demuxer.hpp index 42ffb55d9..d158a919e 100644 --- a/host/lib/usrp/common/recv_packet_demuxer.hpp +++ b/host/lib/usrp/common/recv_packet_demuxer.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_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_HPP diff --git a/host/lib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/usrp/common/recv_packet_demuxer_3000.hpp index ef6273e84..8b0aa9ee0 100644 --- a/host/lib/usrp/common/recv_packet_demuxer_3000.hpp +++ b/host/lib/usrp/common/recv_packet_demuxer_3000.hpp @@ -1,7 +1,8 @@ // // Copyright 2013,2017 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_COMMON_RECV_PACKET_DEMUXER_3000_HPP diff --git a/host/lib/usrp/common/validate_subdev_spec.cpp b/host/lib/usrp/common/validate_subdev_spec.cpp index 16442a053..72e901929 100644 --- a/host/lib/usrp/common/validate_subdev_spec.cpp +++ b/host/lib/usrp/common/validate_subdev_spec.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 "validate_subdev_spec.hpp" diff --git a/host/lib/usrp/common/validate_subdev_spec.hpp b/host/lib/usrp/common/validate_subdev_spec.hpp index 2d833e6b6..f2f3ce035 100644 --- a/host/lib/usrp/common/validate_subdev_spec.hpp +++ b/host/lib/usrp/common/validate_subdev_spec.hpp @@ -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 // #ifndef INCLUDED_LIBUHD_USRP_COMMON_VALIDATE_SUBDEV_SPEC_HPP |