diff --git a/src/common/ThreadFunc.h b/src/common/ThreadFunc.h index 63d30b97..867b5fa5 100644 --- a/src/common/ThreadFunc.h +++ b/src/common/ThreadFunc.h @@ -6,10 +6,6 @@ * @package DVM / Common Library * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2023 by Bryan Biedenkapp N2PLL * diff --git a/src/common/dmr/DMRUtils.h b/src/common/dmr/DMRUtils.h index 725f2b19..9cf235a9 100644 --- a/src/common/dmr/DMRUtils.h +++ b/src/common/dmr/DMRUtils.h @@ -6,10 +6,6 @@ * @package DVM / Common Library * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2021 by Bryan Biedenkapp N2PLL * diff --git a/src/common/dmr/SiteData.h b/src/common/dmr/SiteData.h index 1da350f0..c20d216b 100644 --- a/src/common/dmr/SiteData.h +++ b/src/common/dmr/SiteData.h @@ -6,10 +6,6 @@ * @package DVM / Host Server * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2021 by Bryan Biedenkapp N2PLL * diff --git a/src/common/dmr/data/Data.cpp b/src/common/dmr/data/Data.cpp index 855bb3f8..9573977c 100644 --- a/src/common/dmr/data/Data.cpp +++ b/src/common/dmr/data/Data.cpp @@ -11,7 +11,7 @@ // Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) // /* -* Copyright (C) 2015,2016 Jonathan Naylor, G4KLX +* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX * * 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 diff --git a/src/common/dmr/data/Data.h b/src/common/dmr/data/Data.h index 77108a2e..e4a582e2 100644 --- a/src/common/dmr/data/Data.h +++ b/src/common/dmr/data/Data.h @@ -11,7 +11,7 @@ // Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) // /* -* Copyright (C) 2015,2016 by Jonathan Naylor, G4KLX +* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX * * 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 diff --git a/src/common/dmr/data/DataHeader.cpp b/src/common/dmr/data/DataHeader.cpp index 3177c32f..69c5796b 100644 --- a/src/common/dmr/data/DataHeader.cpp +++ b/src/common/dmr/data/DataHeader.cpp @@ -13,7 +13,7 @@ /* * Copyright (C) 2012 by Ian Wraith * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2021,2023 Bryan Biedenkapp N2PLL +* Copyright (C) 2021,2023 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/common/dmr/data/DataHeader.h b/src/common/dmr/data/DataHeader.h index c5f065ac..c1e7b5f1 100644 --- a/src/common/dmr/data/DataHeader.h +++ b/src/common/dmr/data/DataHeader.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2021 Bryan Biedenkapp N2PLL +* Copyright (C) 2021 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/common/dmr/lc/PrivacyLC.h b/src/common/dmr/lc/PrivacyLC.h index f9a492d0..30329e61 100644 --- a/src/common/dmr/lc/PrivacyLC.h +++ b/src/common/dmr/lc/PrivacyLC.h @@ -7,8 +7,7 @@ * */ /* -* Copyright (C) 2021 Bryan Biedenkapp N2PLL -* Copyright (C) 2020-2021 by Bryan Biedenkapp N2PLL +* Copyright (C) 2021 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/common/edac/SHA256.cpp b/src/common/edac/SHA256.cpp index 09c8e014..71580883 100644 --- a/src/common/edac/SHA256.cpp +++ b/src/common/edac/SHA256.cpp @@ -11,7 +11,7 @@ // Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) // /* -* Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. +* Copyright (C) 2005,2006,2008 Free Software Foundation, Inc. * Copyright (C) 2011,2015 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify diff --git a/src/common/edac/SHA256.h b/src/common/edac/SHA256.h index 377e9093..deeec5ab 100644 --- a/src/common/edac/SHA256.h +++ b/src/common/edac/SHA256.h @@ -11,7 +11,7 @@ // Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) // /* -* Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +* Copyright (C) 2005,2006,2008,2009 Free Software Foundation, Inc. * Copyright (C) 2011,2015,2016 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify diff --git a/src/common/network/UDPSocket.cpp b/src/common/network/UDPSocket.cpp index fbc0d52e..589cbafc 100644 --- a/src/common/network/UDPSocket.cpp +++ b/src/common/network/UDPSocket.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2006-2016,2020 by Jonathan Naylor G4KLX -* Copyright (C) 2017-2020,2023 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2024 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/common/network/UDPSocket.h b/src/common/network/UDPSocket.h index 3b932b34..b17db498 100644 --- a/src/common/network/UDPSocket.h +++ b/src/common/network/UDPSocket.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2006-2016,2020 by Jonathan Naylor G4KLX -* Copyright (C) 2023 by Bryan Biedenkapp N2PLL +* Copyright (C) 2017-2024 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/common/nxdn/channel/CAC.cpp b/src/common/nxdn/channel/CAC.cpp index 18f850fe..c391cf7f 100644 --- a/src/common/nxdn/channel/CAC.cpp +++ b/src/common/nxdn/channel/CAC.cpp @@ -6,10 +6,6 @@ * @package DVM / Common Library * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2022 by Bryan Biedenkapp N2PLL * diff --git a/src/common/nxdn/channel/CAC.h b/src/common/nxdn/channel/CAC.h index 5fb6fd38..f87756fb 100644 --- a/src/common/nxdn/channel/CAC.h +++ b/src/common/nxdn/channel/CAC.h @@ -6,10 +6,6 @@ * @package DVM / Common Library * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2022 by Bryan Biedenkapp N2PLL * diff --git a/src/common/nxdn/lc/RCCH.cpp b/src/common/nxdn/lc/RCCH.cpp index 08dacec2..cc1740d3 100644 --- a/src/common/nxdn/lc/RCCH.cpp +++ b/src/common/nxdn/lc/RCCH.cpp @@ -6,10 +6,6 @@ * @package DVM / Common Library * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2022 by Bryan Biedenkapp N2PLL * diff --git a/src/common/nxdn/lc/RCCH.h b/src/common/nxdn/lc/RCCH.h index 1382b5e7..dcfdefa7 100644 --- a/src/common/nxdn/lc/RCCH.h +++ b/src/common/nxdn/lc/RCCH.h @@ -6,10 +6,6 @@ * @package DVM / Common Library * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2022 by Bryan Biedenkapp N2PLL * diff --git a/src/fne/Defines.h b/src/fne/Defines.h index 937a9f83..d251fe07 100644 --- a/src/fne/Defines.h +++ b/src/fne/Defines.h @@ -6,10 +6,6 @@ * @package DVM / Converged FNE Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX * Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL diff --git a/src/fne/FNEMain.cpp b/src/fne/FNEMain.cpp index d822f239..ae25fdf2 100644 --- a/src/fne/FNEMain.cpp +++ b/src/fne/FNEMain.cpp @@ -6,13 +6,8 @@ * @package DVM / Converged FNE Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* -* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2020-2023 by Bryan Biedenkapp N2PLL +* Copyright (C) 2020-2024 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/fne/FNEMain.h b/src/fne/FNEMain.h index d124ba45..cb253c71 100644 --- a/src/fne/FNEMain.h +++ b/src/fne/FNEMain.h @@ -6,13 +6,8 @@ * @package DVM / Converged FNE Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* -* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2020,2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2020-2024 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/host/Defines.h b/src/host/Defines.h index e455e12a..84826dcc 100644 --- a/src/host/Defines.h +++ b/src/host/Defines.h @@ -6,13 +6,8 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* -* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2023 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/host/Host.Config.cpp b/src/host/Host.Config.cpp index c652b21b..9b61c56a 100644 --- a/src/host/Host.Config.cpp +++ b/src/host/Host.Config.cpp @@ -6,10 +6,6 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2017-2023 by Bryan Biedenkapp N2PLL * diff --git a/src/host/Host.DMR.cpp b/src/host/Host.DMR.cpp index 97c9ef90..b0e50033 100644 --- a/src/host/Host.DMR.cpp +++ b/src/host/Host.DMR.cpp @@ -6,10 +6,6 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2017-2023 by Bryan Biedenkapp N2PLL * diff --git a/src/host/Host.NXDN.cpp b/src/host/Host.NXDN.cpp index 80794703..7004b6eb 100644 --- a/src/host/Host.NXDN.cpp +++ b/src/host/Host.NXDN.cpp @@ -6,10 +6,6 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2017-2023 by Bryan Biedenkapp N2PLL * diff --git a/src/host/Host.P25.cpp b/src/host/Host.P25.cpp index b4f6b411..81e0274a 100644 --- a/src/host/Host.P25.cpp +++ b/src/host/Host.P25.cpp @@ -6,10 +6,6 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2017-2023 by Bryan Biedenkapp N2PLL * diff --git a/src/host/dmr/packet/ControlSignaling.cpp b/src/host/dmr/packet/ControlSignaling.cpp index bc5917a9..b0e17eaf 100644 --- a/src/host/dmr/packet/ControlSignaling.cpp +++ b/src/host/dmr/packet/ControlSignaling.cpp @@ -25,16 +25,10 @@ */ #include "Defines.h" #include "common/dmr/acl/AccessControl.h" -#include "common/dmr/data/DataHeader.h" -#include "common/dmr/data/EMB.h" -#include "common/dmr/lc/ShortLC.h" -#include "common/dmr/lc/FullLC.h" #include "common/dmr/lc/CSBK.h" #include "common/dmr/lc/csbk/CSBKFactory.h" #include "common/dmr/SlotType.h" #include "common/dmr/Sync.h" -#include "common/edac/BPTC19696.h" -#include "common/edac/CRC.h" #include "common/Log.h" #include "common/Utils.h" #include "dmr/lc/csbk/CSBK_DVM_GIT_HASH.h" @@ -48,9 +42,6 @@ using namespace dmr::lc::csbk; using namespace dmr::packet; #include -#include -#include -#include // --------------------------------------------------------------------------- // Macros diff --git a/src/host/dmr/packet/Data.cpp b/src/host/dmr/packet/Data.cpp index 4a3f7915..0113f89f 100644 --- a/src/host/dmr/packet/Data.cpp +++ b/src/host/dmr/packet/Data.cpp @@ -25,14 +25,11 @@ */ #include "Defines.h" #include "common/dmr/acl/AccessControl.h" -#include "common/dmr/data/EMB.h" -#include "common/dmr/lc/ShortLC.h" #include "common/dmr/lc/FullLC.h" #include "common/dmr/lc/CSBK.h" #include "common/dmr/SlotType.h" #include "common/dmr/Sync.h" #include "common/edac/BPTC19696.h" -#include "common/edac/CRC.h" #include "common/edac/Trellis.h" #include "common/Log.h" #include "common/Utils.h" @@ -44,9 +41,7 @@ using namespace dmr; using namespace dmr::packet; #include -#include #include -#include // --------------------------------------------------------------------------- // Macros diff --git a/src/host/dmr/packet/Voice.cpp b/src/host/dmr/packet/Voice.cpp index a6913ef6..b0050f40 100644 --- a/src/host/dmr/packet/Voice.cpp +++ b/src/host/dmr/packet/Voice.cpp @@ -25,18 +25,13 @@ */ #include "Defines.h" #include "common/dmr/acl/AccessControl.h" -#include "common/dmr/data/DataHeader.h" #include "common/dmr/data/EMB.h" #include "common/dmr/lc/CSBK.h" -#include "common/dmr/lc/ShortLC.h" #include "common/dmr/lc/FullLC.h" #include "common/dmr/SlotType.h" #include "common/dmr/Sync.h" -#include "common/edac/BPTC19696.h" -#include "common/edac/CRC.h" #include "common/Log.h" #include "common/Utils.h" -#include "dmr/packet/Data.h" #include "dmr/packet/Voice.h" #include "dmr/Slot.h" #include "ActivityLog.h" @@ -45,9 +40,7 @@ using namespace dmr; using namespace dmr::packet; #include -#include #include -#include // --------------------------------------------------------------------------- // Macros diff --git a/src/host/modem/Modem.cpp b/src/host/modem/Modem.cpp index d967ab5e..0e6f906f 100644 --- a/src/host/modem/Modem.cpp +++ b/src/host/modem/Modem.cpp @@ -41,13 +41,7 @@ using namespace modem; -#include -#include #include -#include -#include - -#include // --------------------------------------------------------------------------- // Constants diff --git a/src/host/modem/port/ModemNullPort.cpp b/src/host/modem/port/ModemNullPort.cpp index 29f1b569..24390e27 100644 --- a/src/host/modem/port/ModemNullPort.cpp +++ b/src/host/modem/port/ModemNullPort.cpp @@ -35,9 +35,6 @@ using namespace modem::port; using namespace modem; -#include -#include - const char* HARDWARE = "Null Modem Controller"; // --------------------------------------------------------------------------- diff --git a/src/host/nxdn/packet/ControlSignaling.cpp b/src/host/nxdn/packet/ControlSignaling.cpp index 8f1f85c2..1cc9b702 100644 --- a/src/host/nxdn/packet/ControlSignaling.cpp +++ b/src/host/nxdn/packet/ControlSignaling.cpp @@ -6,10 +6,6 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2022-2024 by Bryan Biedenkapp N2PLL * diff --git a/src/host/nxdn/packet/ControlSignaling.h b/src/host/nxdn/packet/ControlSignaling.h index 438dea2c..59683c0d 100644 --- a/src/host/nxdn/packet/ControlSignaling.h +++ b/src/host/nxdn/packet/ControlSignaling.h @@ -6,10 +6,6 @@ * @package DVM / Host Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2022-2023 by Bryan Biedenkapp N2PLL * diff --git a/src/host/setup/HostSetup.cpp b/src/host/setup/HostSetup.cpp index 84555930..f4b2820b 100644 --- a/src/host/setup/HostSetup.cpp +++ b/src/host/setup/HostSetup.cpp @@ -6,7 +6,13 @@ * @package DVM / Host Software * */ +// +// Based on code from the MMDVMCal project. (https://github.com/g4klx/MMDVMCal) +// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) +// /* +* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX +* Copyright (C) 2017,2018 by Andy Uribe CA6JAU * Copyright (C) 2021-2023 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify diff --git a/src/host/setup/HostSetup.h b/src/host/setup/HostSetup.h index 4d999f4d..fc8a30d7 100644 --- a/src/host/setup/HostSetup.h +++ b/src/host/setup/HostSetup.h @@ -6,7 +6,13 @@ * @package DVM / Host Software * */ +// +// Based on code from the MMDVMCal project. (https://github.com/g4klx/MMDVMCal) +// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) +// /* +* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX +* Copyright (C) 2017,2018 by Andy Uribe CA6JAU * Copyright (C) 2021-2023 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify diff --git a/src/monitor/Defines.h b/src/monitor/Defines.h index dcdc2dc0..dc08fa48 100644 --- a/src/monitor/Defines.h +++ b/src/monitor/Defines.h @@ -6,13 +6,8 @@ * @package DVM / Host Monitor Software * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* -* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2023 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/monitor/MonitorMain.cpp b/src/monitor/MonitorMain.cpp index 5022ef94..df990be6 100644 --- a/src/monitor/MonitorMain.cpp +++ b/src/monitor/MonitorMain.cpp @@ -7,7 +7,7 @@ * */ /* -* Copyright (C) 2023 by Bryan Biedenkapp +* Copyright (C) 2023 by Bryan Biedenkapp N2PLL * * 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 diff --git a/src/remote/Defines.h b/src/remote/Defines.h index c199aff7..bdd3e489 100644 --- a/src/remote/Defines.h +++ b/src/remote/Defines.h @@ -7,7 +7,6 @@ * */ /* -* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX * Copyright (C) 2024 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify diff --git a/src/remote/RESTClient.cpp b/src/remote/RESTClient.cpp index 537254cb..b36ebd6d 100644 --- a/src/remote/RESTClient.cpp +++ b/src/remote/RESTClient.cpp @@ -6,10 +6,6 @@ * @package DVM / Remote Command Client * */ -// -// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost) -// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0) -// /* * Copyright (C) 2023 by Bryan Biedenkapp *