diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:47:10 -0800 | 
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:47:10 -0800 | 
| commit | b0dc9fd6770a003f4bd12ca6706c227c009cc8da (patch) | |
| tree | 0f4d366bf1772c9eb0f8876da295c40d226f4e09 | |
| parent | 57ec3d765a6420cb1200a38991046df78d1e6166 (diff) | |
| download | uhd-b0dc9fd6770a003f4bd12ca6706c227c009cc8da.tar.gz uhd-b0dc9fd6770a003f4bd12ca6706c227c009cc8da.tar.bz2 uhd-b0dc9fd6770a003f4bd12ca6706c227c009cc8da.zip  | |
Move all headers to SPDX format, harmonize license headers
| -rw-r--r-- | host/lib/deps/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x | host/lib/deps/import_rpclib.py | 15 | ||||
| -rwxr-xr-x | host/lib/ic_reg_maps/gen_lmk04828_regs.py | 19 | ||||
| -rw-r--r-- | host/lib/rfnoc/rpc_block_ctrl.hpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/common/lmk04828.cpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/common/lmk04828.hpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/eiscat/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.hpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp | 15 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | host/lib/utils/rpc.hpp | 15 | 
13 files changed, 30 insertions, 170 deletions
diff --git a/host/lib/deps/CMakeLists.txt b/host/lib/deps/CMakeLists.txt index 8f292d4f2..a3858bad8 100644 --- a/host/lib/deps/CMakeLists.txt +++ b/host/lib/deps/CMakeLists.txt @@ -1,19 +1,9 @@  # -# Copyright 2017 Ettus Research (National Instruments) +# Copyright 2017 Ettus Research, a National Instruments Company  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0  # +  IF(ENABLE_MPMD)      ADD_SUBDIRECTORY(rpclib)  ENDIF() diff --git a/host/lib/deps/import_rpclib.py b/host/lib/deps/import_rpclib.py index 2baccab1a..102d66ca8 100755 --- a/host/lib/deps/import_rpclib.py +++ b/host/lib/deps/import_rpclib.py @@ -1,19 +1,8 @@  #!/usr/bin/env python  # -# Copyright 2017 Ettus Research (National Instruments) +# Copyright 2017 Ettus Research, a National Instruments Company  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0  #  """  Tool to import external dependency rpclib into UHD tree diff --git a/host/lib/ic_reg_maps/gen_lmk04828_regs.py b/host/lib/ic_reg_maps/gen_lmk04828_regs.py index 46bf825ad..fd0f03c1c 100755 --- a/host/lib/ic_reg_maps/gen_lmk04828_regs.py +++ b/host/lib/ic_reg_maps/gen_lmk04828_regs.py @@ -1,24 +1,15 @@ -#Copyright 2017 Ettus Research LLC  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# Copyright 2017 Ettus Research, a National Instruments Company  # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0  # +" Generate reg map for LMK04828 synthesizer "  ########################################################################  # Template for raw text data describing registers  # name addr[bit range inclusive] default optional enums  ######################################################################## -REGS_TMPL="""\ +REGS_TMPL = """\  ########################################################################  ## address 0  ######################################################################## @@ -68,7 +59,7 @@ ID_Vendor_MSB            12[7:0]     81  ########################################################################  address13	             13[20:8]    0x00D  ID_Vendor_LSB            13[7:0]     4 -"""  +"""  ########################################################################  # Template for methods in the body of the struct  ######################################################################## diff --git a/host/lib/rfnoc/rpc_block_ctrl.hpp b/host/lib/rfnoc/rpc_block_ctrl.hpp index 99c0c8ce1..b23b07906 100644 --- a/host/lib/rfnoc/rpc_block_ctrl.hpp +++ b/host/lib/rfnoc/rpc_block_ctrl.hpp @@ -1,18 +1,7 @@  // -// Copyright 2017 Ettus Research (National Instruments) +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. +// SPDX-License-Identifier: GPL-3.0  //  #ifndef INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP diff --git a/host/lib/usrp/common/lmk04828.cpp b/host/lib/usrp/common/lmk04828.cpp index edc65d280..c342b1cf8 100644 --- a/host/lib/usrp/common/lmk04828.cpp +++ b/host/lib/usrp/common/lmk04828.cpp @@ -1,18 +1,7 @@  // -// Copyright 2017 Ettus Research LLC +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. +// SPDX-License-Identifier: GPL-3.0  //  #include "lmk04828.hpp" diff --git a/host/lib/usrp/common/lmk04828.hpp b/host/lib/usrp/common/lmk04828.hpp index f44786dad..e911b8d0c 100644 --- a/host/lib/usrp/common/lmk04828.hpp +++ b/host/lib/usrp/common/lmk04828.hpp @@ -1,19 +1,8 @@  // -// Copyright 2017 Ettus Research LLC +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. +// SPDX-License-Identifier: GPL-3.0  // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. -//   #ifndef INCLUDE_LMK04828_HPP  #define INCLUDE_LMK04828_HPP diff --git a/host/lib/usrp/dboard/eiscat/CMakeLists.txt b/host/lib/usrp/dboard/eiscat/CMakeLists.txt index c1ff10b3d..156e139fb 100644 --- a/host/lib/usrp/dboard/eiscat/CMakeLists.txt +++ b/host/lib/usrp/dboard/eiscat/CMakeLists.txt @@ -1,18 +1,7 @@  # -# Copyright 2017 Ettus Research LLC +# Copyright 2017 Ettus Research, a National Instruments Company  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0  #  IF(ENABLE_MPMD AND ENABLE_EISCAT) diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp index 5b10572f7..afbe5d90b 100644 --- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp +++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp @@ -1,18 +1,7 @@  // -// Copyright 2017 Ettus Research (National Instruments Corp.) +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. +// SPDX-License-Identifier: GPL-3.0  //  #include "eiscat_radio_ctrl_impl.hpp" diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.hpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.hpp index 7b54667da..785067f76 100644 --- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.hpp +++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.hpp @@ -1,18 +1,7 @@  // -// Copyright 2017 Ettus Research +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. +// SPDX-License-Identifier: GPL-3.0  //  #ifndef INCLUDED_LIBUHD_RFNOC_EISCAT_RADIO_CTRL_IMPL_HPP diff --git a/host/lib/usrp/dboard/magnesium/CMakeLists.txt b/host/lib/usrp/dboard/magnesium/CMakeLists.txt index 36fff8b66..07d7a0199 100644 --- a/host/lib/usrp/dboard/magnesium/CMakeLists.txt +++ b/host/lib/usrp/dboard/magnesium/CMakeLists.txt @@ -1,18 +1,7 @@  # -# Copyright 2017 Ettus Research LLC +# Copyright 2017 Ettus Research, a National Instruments Company  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0  #  IF(ENABLE_MPMD) diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp index 33c147f53..0659dad14 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp @@ -1,18 +1,7 @@  // -// Copyright 2017 Ettus Research +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. +// SPDX-License-Identifier: GPL-3.0  //  #ifndef INCLUDED_LIBUHD_RFNOC_MAGNESIUM_RADIO_CTRL_IMPL_HPP diff --git a/host/lib/usrp/mpmd/CMakeLists.txt b/host/lib/usrp/mpmd/CMakeLists.txt index e4ce0e316..b873f7a72 100644 --- a/host/lib/usrp/mpmd/CMakeLists.txt +++ b/host/lib/usrp/mpmd/CMakeLists.txt @@ -1,18 +1,7 @@  # -# Copyright 2017 Ettus Research (National Instruments) +# Copyright 2017 Ettus Research, a National Instruments Company  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0  #  IF(ENABLE_MPMD) diff --git a/host/lib/utils/rpc.hpp b/host/lib/utils/rpc.hpp index 9d2645130..1ab7e5f6e 100644 --- a/host/lib/utils/rpc.hpp +++ b/host/lib/utils/rpc.hpp @@ -1,18 +1,7 @@  // -// Copyright 2017 Ettus Research (National Instruments) +// Copyright 2017 Ettus Research, a National Instruments Company  // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. +// SPDX-License-Identifier: GPL-3.0  //  #ifndef INCLUDED_UTILS_RPC_HPP  | 
