diff --git a/CMakeLists.txt b/CMakeLists.txt index 05508be7..fc1b94ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,11 @@ endif (ENABLE_TESTS) # install(TARGETS dvmhost DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS dvmcmd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -install(FILES configs/config.example.yml configs/fne-config.example.yml configs/iden_table.dat configs/RSSI.dat configs/rid_acl.example.dat configs/talkgroup_rules.example.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) +install(TARGETS dvmfne DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +if (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) +install(TARGETS dvmmon DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +endif (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) +install(FILES configs/config.example.yml configs/fne-config.example.yml configs/monitor-config.example.yml configs/iden_table.dat configs/RSSI.dat configs/rid_acl.example.dat configs/talkgroup_rules.example.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) install(PROGRAMS tools/start-dvm.sh tools/stop-dvm.sh tools/dvm-watchdog.sh tools/stop-watchdog.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(CODE "execute_process(COMMAND bash \"-c\" \"sed -i 's/filePath: ./filePath: \\\\/var\\\\/log\\\\//' /usr/local/etc/config.example.yml\")") install(CODE "execute_process(COMMAND bash \"-c\" \"sed -i 's/activityFilePath: ./activityFilePath: \\\\/var\\\\/log\\\\//' /usr/local/etc/config.example.yml\")") @@ -261,6 +265,7 @@ if (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) COMMAND cp -v dvmhost ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin COMMAND cp -v dvmcmd ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin COMMAND cp -v dvmmon ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin + COMMAND cp -v dvmfne ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin COMMAND cp ../tools/*.sh ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm COMMAND chmod +x ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/*.sh COMMAND cp -v ../configs/*.yml ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm @@ -275,6 +280,7 @@ else() COMMAND touch ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/log/INCLUDE_DIRECTORY COMMAND cp -v dvmhost ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin COMMAND cp -v dvmcmd ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin + COMMAND cp -v dvmfne ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/bin COMMAND cp ../tools/*.sh ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm COMMAND chmod +x ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm/*.sh COMMAND cp -v ../configs/*.yml ${CMAKE_INSTALL_PREFIX_TARBALL}/dvm @@ -298,8 +304,10 @@ add_custom_target(old_install COMMAND install -m 755 dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/bin COMMAND install -m 755 dvmcmd ${CMAKE_LEGACY_INSTALL_PREFIX}/bin COMMAND install -m 755 dvmmon ${CMAKE_LEGACY_INSTALL_PREFIX}/bin + COMMAND install -m 755 dvmfne ${CMAKE_LEGACY_INSTALL_PREFIX}/bin COMMAND install -m 644 ../configs/config.example.yml ${CMAKE_LEGACY_INSTALL_PREFIX}/config.example.yml COMMAND install -m 644 ../configs/fne-config.example.yml ${CMAKE_LEGACY_INSTALL_PREFIX}/fne-config.example.yml + COMMAND install -m 644 ../configs/monitor-config.example.yml ${CMAKE_LEGACY_INSTALL_PREFIX}/monitor-config.example.yml COMMAND install -m 644 ../configs/iden_table.dat ${CMAKE_LEGACY_INSTALL_PREFIX}/iden_table.dat COMMAND install -m 644 ../configs/RSSI.dat ${CMAKE_LEGACY_INSTALL_PREFIX}/RSSI.dat COMMAND install -m 644 ../configs/rid_acl.example.dat ${CMAKE_LEGACY_INSTALL_PREFIX}/rid_acl.dat @@ -321,6 +329,7 @@ add_custom_target(old_install-service COMMAND usermod --groups dialout --append dvmhost || true COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/config.example.yml COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/fne-config.example.yml + COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/monitor-config.example.yml COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/iden_table.dat COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/RSSI.dat COMMAND chown dvmhost:dvmhost ${CMAKE_LEGACY_INSTALL_PREFIX}/rid_acl.dat diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a5daca4a..1716cc92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,8 +7,7 @@ #* #*/ #/* -#* Copyright (C) 2022 by Bryan Biedenkapp N2PLL -#* Copyright (C) 2022 by Natalie Moore +#* Copyright (C) 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 @@ -24,160 +23,80 @@ #* along with this program; if not, write to the Free Software #* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #*/ -# -## dvmhost source/header files -# -file(GLOB dvmhost_SRC +file(GLOB common_SRC # DMR module - "src/dmr/*.h" - "src/dmr/*.cpp" - "src/dmr/acl/*.h" - "src/dmr/acl/*.cpp" - "src/dmr/data/*.h" - "src/dmr/data/*.cpp" - "src/dmr/edac/*.h" - "src/dmr/edac/*.cpp" - "src/dmr/lc/*.h" - "src/dmr/lc/*.cpp" - "src/dmr/lc/csbk/*.h" - "src/dmr/lc/csbk/*.cpp" - "src/dmr/lookups/*.h" - "src/dmr/lookups/*.cpp" - "src/dmr/packet*.h" - "src/dmr/packet/*.cpp" + "src/common/dmr/*.cpp" + "src/common/dmr/acl/*.cpp" + "src/common/dmr/data/*.cpp" + "src/common/dmr/lc/*.cpp" + "src/common/dmr/lc/csbk/*.cpp" + "src/common/dmr/lookups/*.cpp" # P25 module - "src/p25/*.h" - "src/p25/*.cpp" - "src/p25/acl/*.h" - "src/p25/acl/*.cpp" - "src/p25/data/*.h" - "src/p25/data/*.cpp" - "src/p25/dfsi/*.h" - "src/p25/dfsi/*.cpp" - "src/p25/edac/*.h" - "src/p25/edac/*.cpp" - "src/p25/lc/*.h" - "src/p25/lc/*.cpp" - "src/p25/lc/tdulc/*.h" - "src/p25/lc/tdulc/*.cpp" - "src/p25/lc/tsbk/*.h" - "src/p25/lc/tsbk/*.cpp" - "src/p25/lookups/*.h" - "src/p25/lookups/*.cpp" - "src/p25/packet/*.h" - "src/p25/packet/*.cpp" + "src/common/p25/*.cpp" + "src/common/p25/acl/*.cpp" + "src/common/p25/data/*.cpp" + "src/common/p25/dfsi/*.cpp" + "src/common/p25/lc/*.cpp" + "src/common/p25/lc/tdulc/*.cpp" + "src/common/p25/lc/tsbk/*.cpp" + "src/common/p25/lookups/*.cpp" # NXDN module - "src/nxdn/*.h" - "src/nxdn/*.cpp" - "src/nxdn/acl/*.h" - "src/nxdn/acl/*.cpp" - "src/nxdn/channel/*.h" - "src/nxdn/channel/*.cpp" - "src/nxdn/edac/*.h" - "src/nxdn/edac/*.cpp" - "src/nxdn/lc/*.h" - "src/nxdn/lc/*.cpp" - "src/nxdn/lc/rcch/*.h" - "src/nxdn/lc/rcch/*.cpp" - "src/nxdn/packet/*.h" - "src/nxdn/packet/*.cpp" + "src/common/nxdn/*.cpp" + "src/common/nxdn/acl/*.cpp" + "src/common/nxdn/channel/*.cpp" + "src/common/nxdn/edac/*.cpp" + "src/common/nxdn/lc/*.cpp" + "src/common/nxdn/lc/rcch/*.cpp" # Core - "src/edac/*.h" - "src/edac/*.cpp" - "src/edac/rs/*.h" - "src/host/*.h" - "src/host/*.cpp" - "src/host/calibrate/*.h" - "src/host/calibrate/*.cpp" - "src/host/setup/*.h" - "src/host/setup/*.cpp" - "src/host/fne/*.h" - "src/host/fne/*.cpp" - "src/lookups/*.h" - "src/lookups/*.cpp" - "src/modem/*.h" - "src/modem/*.cpp" - "src/modem/port/*.h" - "src/modem/port/*.cpp" - "src/network/*.h" - "src/network/*.cpp" - "src/network/fne/*.h" - "src/network/fne/*.cpp" - "src/network/json/*.h" - "src/network/rest/*.h" - "src/network/rest/*.cpp" - "src/network/rest/http/*.h" - "src/network/rest/http/*.cpp" - "src/remote/RESTClient.cpp" - "src/remote/RESTClient.h" - "src/yaml/*.h" - "src/yaml/*.cpp" - "src/*.h" - "src/*.cpp" + "src/common/edac/*.cpp" + "src/common/lookups/*.cpp" + "src/common/network/*.cpp" + "src/common/network/rest/*.cpp" + "src/common/network/rest/http/*.cpp" + "src/common/yaml/*.cpp" + "src/common/*.cpp" ) -# -## dvmcmd source/header files -# -file(GLOB dvmcmd_SRC - "src/network/UDPSocket.h" - "src/network/UDPSocket.cpp" - "src/network/RESTDefines.h" - "src/network/json/*.h" - "src/network/rest/*.h" - "src/network/rest/*.cpp" - "src/network/rest/http/*.h" - "src/network/rest/http/*.cpp" - "src/remote/*.h" - "src/remote/*.cpp" - "src/edac/SHA256.h" - "src/edac/SHA256.cpp" - "src/Defines.h" - "src/Thread.h" - "src/Thread.cpp" - "src/Log.h" - "src/Log.cpp" - "src/Utils.h" - "src/Utils.cpp" -) +file(GLOB common_INCLUDE + # DMR module + "src/common/dmr/*.h" + "src/common/dmr/acl/*.h" + "src/common/dmr/data/*.h" + "src/common/dmr/lc/*.h" + "src/common/dmr/lc/csbk/*.h" + "src/common/dmr/lookups/*.h" -# -## dvmmon source/header files -# -file(GLOB dvmmon_SRC - "src/lookups/AffiliationLookup.h" - "src/lookups/LookupTable.h" - "src/lookups/IdenTableLookup.h" - "src/lookups/IdenTableLookup.cpp" - "src/modem/Modem.h" - "src/monitor/*.h" - "src/monitor/*.cpp" - "src/network/UDPSocket.h" - "src/network/UDPSocket.cpp" - "src/network/RESTDefines.h" - "src/network/json/*.h" - "src/network/rest/*.h" - "src/network/rest/*.cpp" - "src/network/rest/http/*.h" - "src/network/rest/http/*.cpp" - "src/remote/RESTClient.h" - "src/remote/RESTClient.cpp" - "src/edac/SHA256.h" - "src/edac/SHA256.cpp" - "src/yaml/*.h" - "src/yaml/*.cpp" - "src/Defines.h" - "src/Thread.h" - "src/Thread.cpp" - "src/Timer.h" - "src/Timer.cpp" - "src/Log.h" - "src/Log.cpp" - "src/Utils.h" - "src/Utils.cpp" + # P25 module + "src/common/p25/*.h" + "src/common/p25/acl/*.h" + "src/common/p25/data/*.h" + "src/common/p25/dfsi/*.h" + "src/common/p25/lc/*.h" + "src/common/p25/lc/tdulc/*.h" + "src/common/p25/lc/tsbk/*.h" + "src/common/p25/lookups/*.h" + + # NXDN module + "src/common/nxdn/*.h" + "src/common/nxdn/acl/*.h" + "src/common/nxdn/channel/*.h" + "src/common/nxdn/edac/*.h" + "src/common/nxdn/lc/*.h" + "src/common/nxdn/lc/rcch/*.h" + + # Core + "src/common/edac/*.h" + "src/common/edac/rs/*.h" + "src/common/lookups/*.h" + "src/common/network/*.h" + "src/common/network/json/*.h" + "src/common/network/rest/*.h" + "src/common/network/rest/http/*.h" + "src/common/yaml/*.h" + "src/common/*.h" ) # Digital mode options and other compilation features @@ -314,10 +233,7 @@ if (DEBUG_TRELLIS) add_definitions(-DDEBUG_TRELLIS) endif (DEBUG_TRELLIS) -# -## dvmhost project -# -project(dvmhost) +project(common) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") find_package(Threads REQUIRED) @@ -327,11 +243,6 @@ target_include_directories(asio::asio INTERFACE ${ASIO_INCLUDE_DIR}) target_compile_definitions(asio::asio INTERFACE "ASIO_STANDALONE") target_link_libraries(asio::asio INTERFACE Threads::Threads) -if (ENABLE_SETUP_TUI) - # add finalcut - target_include_directories(finalcut INTERFACE ${FINALCUT_INCLUDE_DIR}) -endif (ENABLE_SETUP_TUI) - # Check if platform-specific functions exist include(CheckCXXSymbolExists) check_cxx_symbol_exists(sendmsg sys/socket.h HAVE_SENDMSG) @@ -350,69 +261,10 @@ if (HAVE_SENDMMSG) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DHAVE_SENDMMSG=1") endif (HAVE_SENDMMSG) -add_executable(dvmhost ${dvmhost_SRC}) -target_include_directories(dvmhost PRIVATE src) -if (ENABLE_SETUP_TUI) - target_link_libraries(dvmhost PRIVATE asio::asio finalcut Threads::Threads util) -else() - target_link_libraries(dvmhost PRIVATE asio::asio Threads::Threads util) -endif (ENABLE_SETUP_TUI) - -set(CPACK_SET_DESTDIR true) -set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local") - -set(CPACK_GENERATOR "DEB") -set(CPACK_PACKAGE_NAME "dvmhost") -set(CPACK_DEBIAN_PACKAGE_NAME "dvmhost") - -set(CPACK_PACKAGE_VENDOR "DVMProject") - -set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "The DVM Host software provides the host computer implementation of a mixed-mode DMR, P25 and/or NXDN or dedicated-mode DMR, P25 or NXDN repeater system that talks to the actual modem hardware. The host software; is the portion of a complete Over-The-Air modem implementation that performs the data processing, decision making and FEC correction for a digital repeater.") -set(CPACK_DEBIAN_PACKAGE_MAINTAINER "DVMProject Authors") -set(CPACK_DEBIAN_PACKAGE_VERSION "3.5.5") -set(CPACK_DEBIAN_PACKAGE_RELEASE "0") -set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/dvmproject") - -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA - "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm") - -set(CPACK_DEBIAN_FILE_NAME ${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb) - -include(CPack) - -# -## dvmcmd project -# -project(dvmcmd) -set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") -find_package(Threads REQUIRED) - -# add ASIO -target_include_directories(asio::asio INTERFACE ${ASIO_INCLUDE_DIR}) -target_compile_definitions(asio::asio INTERFACE "ASIO_STANDALONE") -target_link_libraries(asio::asio INTERFACE Threads::Threads) - -add_executable(dvmcmd ${dvmcmd_SRC}) -target_link_libraries(dvmcmd PRIVATE asio::asio Threads::Threads) -target_include_directories(dvmcmd PRIVATE src) - -# -## dvmmon project -# -if (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) -project(dvmmon) -set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") -find_package(Threads REQUIRED) - -# add ASIO -target_include_directories(asio::asio INTERFACE ${ASIO_INCLUDE_DIR}) -target_compile_definitions(asio::asio INTERFACE "ASIO_STANDALONE") -target_link_libraries(asio::asio INTERFACE Threads::Threads) - -# add finalcut -target_include_directories(finalcut INTERFACE ${FINALCUT_INCLUDE_DIR}) +add_library(common STATIC ${common_SRC} ${common_INCLUDE}) +target_include_directories(common PRIVATE src src/common) -add_executable(dvmmon ${dvmmon_SRC}) -target_link_libraries(dvmmon PRIVATE asio::asio finalcut Threads::Threads) -target_include_directories(dvmmon PRIVATE src) -endif (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) +include(src/host/CMakeLists.txt) +include(src/fne/CMakeLists.txt) +include(src/monitor/CMakeLists.txt) +include(src/remote/CMakeLists.txt) diff --git a/src/AESCrypto.cpp b/src/common/AESCrypto.cpp similarity index 100% rename from src/AESCrypto.cpp rename to src/common/AESCrypto.cpp diff --git a/src/AESCrypto.h b/src/common/AESCrypto.h similarity index 98% rename from src/AESCrypto.h rename to src/common/AESCrypto.h index f196963f..ef09a4db 100644 --- a/src/AESCrypto.h +++ b/src/common/AESCrypto.h @@ -35,7 +35,7 @@ #if !defined(__AES_CRYPTO_H__) #define __AES_CRYPTO_H__ -#include "Defines.h" +#include "common/Defines.h" namespace crypto { diff --git a/src/Clock.cpp b/src/common/Clock.cpp similarity index 100% rename from src/Clock.cpp rename to src/common/Clock.cpp diff --git a/src/Clock.h b/src/common/Clock.h similarity index 97% rename from src/Clock.h rename to src/common/Clock.h index 060ce8e5..63acdd2a 100644 --- a/src/Clock.h +++ b/src/common/Clock.h @@ -21,7 +21,7 @@ #if !defined(__CLOCK_H__) #define __CLOCK_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/Defines.h b/src/common/Defines.h similarity index 98% rename from src/Defines.h rename to src/common/Defines.h index ece91e99..d82a0019 100644 --- a/src/Defines.h +++ b/src/common/Defines.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018-2022 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-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 @@ -28,8 +28,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if !defined(__DEFINES_H__) -#define __DEFINES_H__ +#if !defined(__COMMON_DEFINES_H__) +#define __COMMON_DEFINES_H__ #include @@ -106,10 +106,10 @@ typedef unsigned long long ulong64_t; #define __GIT_VER_HASH__ "00000000" #endif -#define __PROG_NAME__ "Digital Voice Modem (DVM) Host" +#define __PROG_NAME__ "" #define __NET_NAME__ "DVM_DMR_P25" -#define __EXE_NAME__ "dvmhost" -#define __VER__ "D03.56.00 (" __GIT_VER__ ")" +#define __EXE_NAME__ "" +#define __VER__ "D03.60.00-alpha (" __GIT_VER__ ")" #define __BUILD__ __DATE__ " " __TIME__ #define HOST_SW_API @@ -365,4 +365,4 @@ typedef std::unique_ptr UInt8Array; public: __forceinline type& get##propName(void) const { return m_##variableName; } \ __forceinline void set##propName(type& val) { m_##variableName = val; } -#endif // __DEFINES_H__ +#endif // __COMMON_DEFINES_H__ diff --git a/src/Log.cpp b/src/common/Log.cpp similarity index 66% rename from src/Log.cpp rename to src/common/Log.cpp index 33fdc6da..7e56e51b 100644 --- a/src/Log.cpp +++ b/src/common/Log.cpp @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX -* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-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 @@ -29,7 +29,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Log.h" -#include "network/Network.h" +#include "network/BaseNetwork.h" #include @@ -43,6 +43,7 @@ #include #include #include +#include // --------------------------------------------------------------------------- // Constants @@ -50,7 +51,6 @@ #define EOL "\r\n" -const uint32_t ACT_LOG_BUFFER_LEN = 501U; const uint32_t LOG_BUFFER_LEN = 4096U; // --------------------------------------------------------------------------- @@ -59,20 +59,16 @@ const uint32_t LOG_BUFFER_LEN = 4096U; static uint32_t m_fileLevel = 0U; static std::string m_filePath; -static std::string m_actFilePath; static std::string m_fileRoot; -static std::string m_actFileRoot; -static network::Network* m_network; +static network::BaseNetwork* m_network; static FILE* m_fpLog = nullptr; -static FILE* m_actFpLog = nullptr; uint32_t g_logDisplayLevel = 2U; bool g_disableTimeDisplay = false; static struct tm m_tm; -static struct tm m_actTm; static std::ostream m_outStream{std::cerr.rdbuf()}; @@ -82,6 +78,24 @@ static char LEVELS[] = " DMIWEF"; // Global Functions // --------------------------------------------------------------------------- +/// +/// Helper to get the current log file level. +/// +/// +uint32_t CurrentLogFileLevel() { return m_fileLevel; } + +/// +/// Helper to get the current log file path. +/// +/// +std::string LogGetFilePath() { return m_filePath; } + +/// +/// Helper to get the current log file root. +/// +/// +std::string LogGetFileRoot() { return m_fileRoot; } + /// /// Helper to open the detailed log file, file handle. /// @@ -117,38 +131,6 @@ static bool LogOpen() return m_fpLog != nullptr; } -/// -/// Helper to open the activity log file, file handle. -/// -/// True, if log file is opened, otherwise false. -static bool ActivityLogOpen() -{ - if (m_fileLevel == 0U) - return true; - - time_t now; - ::time(&now); - - struct tm* tm = ::gmtime(&now); - - if (tm->tm_mday == m_actTm.tm_mday && tm->tm_mon == m_actTm.tm_mon && tm->tm_year == m_actTm.tm_year) { - if (m_actFpLog != nullptr) - return true; - } - else { - if (m_actFpLog != nullptr) - ::fclose(m_actFpLog); - } - - char filename[200U]; - ::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday); - - m_actFpLog = ::fopen(filename, "a+t"); - m_actTm = *tm; - - return m_actFpLog != nullptr; -} - /// /// Internal helper to set an output stream to direct logging to. /// @@ -158,6 +140,13 @@ void __InternalOutputStream(std::ostream& stream) m_outStream.rdbuf(stream.rdbuf()); } +/// Gets the instance of the Network class to transfer the activity log with. +void* LogGetNetwork() +{ + // NO GOOD, VERY BAD, TERRIBLE HACK + return (void*)m_network; +} + /// /// Sets the instance of the Network class to transfer the activity log with. /// @@ -169,100 +158,7 @@ void LogSetNetwork(void* network) #endif // note: The Network class is passed here as a void so we can avoid including the Network.h // header in Log.h. This is dirty and probably terrible... - m_network = (network::Network*)network; -} - -/// -/// Initializes the activity log. -/// -/// Full-path to the activity log file. -/// Prefix of the activity log file name. -bool ActivityLogInitialise(const std::string& filePath, const std::string& fileRoot) -{ -#if defined(CATCH2_TEST_COMPILATION) - return true; -#endif - m_actFilePath = filePath; - m_actFileRoot = fileRoot; - m_network = nullptr; - - return ::ActivityLogOpen(); -} - -/// -/// Finalizes the activity log. -/// -void ActivityLogFinalise() -{ -#if defined(CATCH2_TEST_COMPILATION) - return; -#endif - if (m_actFpLog != nullptr) - ::fclose(m_actFpLog); -} - -/// -/// Writes a new entry to the activity log. -/// -/// This is a variable argument function. -/// Digital mode (usually P25 or DMR). -/// Flag indicating that the entry was generated from an RF event. -/// Formatted string to write to activity log. -void ActivityLog(const char *mode, const bool sourceRf, const char* msg, ...) -{ -#if defined(CATCH2_TEST_COMPILATION) - return; -#endif - assert(mode != nullptr); - assert(msg != nullptr); - - char buffer[ACT_LOG_BUFFER_LEN]; - struct timeval now; - ::gettimeofday(&now, NULL); - - struct tm* tm = ::gmtime(&now.tv_sec); - - if (strcmp(mode, "") == 0) { - ::sprintf(buffer, "A: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U); - } - else { - ::sprintf(buffer, "A: %04d-%02d-%02d %02d:%02d:%02d.%03lu %s %s ", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U, mode, (sourceRf) ? "RF" : "Net"); - } - - va_list vl; - va_start(vl, msg); - - ::vsnprintf(buffer + ::strlen(buffer), ACT_LOG_BUFFER_LEN - 1U, msg, vl); - - va_end(vl); - - bool ret = ::ActivityLogOpen(); - if (!ret) - return; - - if (m_network != nullptr) { - m_network->writeActLog(buffer); - } - - if (m_fileLevel == 0U) - return; - - ::fprintf(m_actFpLog, "%s\n", buffer); - ::fflush(m_actFpLog); - - if (2U >= m_fileLevel && m_fileLevel != 0U) { - bool ret = ::ActivityLogOpen(); - if (!ret) - return; - - ::fprintf(m_fpLog, "%s\n", buffer); - ::fflush(m_fpLog); - } - - if (2U >= g_logDisplayLevel && g_logDisplayLevel != 0U) { - ::fprintf(stdout, "%s" EOL, buffer); - ::fflush(stdout); - } + m_network = (network::BaseNetwork*)network; } /// diff --git a/src/Log.h b/src/common/Log.h similarity index 86% rename from src/Log.h rename to src/common/Log.h index 6874558c..33f50ca7 100644 --- a/src/Log.h +++ b/src/common/Log.h @@ -12,7 +12,7 @@ // /* * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX -* Copyright (C) 2018-2019 by Bryan Biedenkapp N2PLL +* Copyright (C) 2018-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 @@ -31,7 +31,7 @@ #if !defined(__LOG_H__) #define __LOG_H__ -#include "Defines.h" +#include "common/Defines.h" #include @@ -75,16 +75,19 @@ extern bool g_disableTimeDisplay; /// Internal helper to set an output stream to direct logging to. extern HOST_SW_API void __InternalOutputStream(std::ostream& stream); +/// Helper to get the current log file level. +extern HOST_SW_API uint32_t CurrentLogFileLevel(); + +/// Helper to get the current log file path. +extern HOST_SW_API std::string LogGetFilePath(); +/// Helper to get the current log file root. +extern HOST_SW_API std::string LogGetFileRoot(); + +/// Gets the instance of the Network class to transfer the activity log with. +extern HOST_SW_API void* LogGetNetwork(); /// Sets the instance of the Network class to transfer the activity log with. extern HOST_SW_API void LogSetNetwork(void* network); -/// Initializes the activity log. -extern HOST_SW_API bool ActivityLogInitialise(const std::string& filePath, const std::string& fileRoot); -/// Finalizes the activity log. -extern HOST_SW_API void ActivityLogFinalise(); -/// Writes a new entry to the activity log. -extern HOST_SW_API void ActivityLog(const char* mode, const bool sourceRf, const char* msg, ...); - /// Initializes the diagnostics log. extern HOST_SW_API bool LogInitialise(const std::string& filePath, const std::string& fileRoot, uint32_t fileLevel, uint32_t displayLevel, bool disableTimeDisplay = false); /// Finalizes the diagnostics log. diff --git a/src/RingBuffer.h b/src/common/RingBuffer.h similarity index 99% rename from src/RingBuffer.h rename to src/common/RingBuffer.h index 36022aa0..b978de8e 100644 --- a/src/RingBuffer.h +++ b/src/common/RingBuffer.h @@ -30,8 +30,8 @@ #if !defined(__RING_BUFFER_H__) #define __RING_BUFFER_H__ -#include "Defines.h" -#include "Log.h" +#include "common/Defines.h" +#include "common/Log.h" #include #include diff --git a/src/StopWatch.cpp b/src/common/StopWatch.cpp similarity index 100% rename from src/StopWatch.cpp rename to src/common/StopWatch.cpp diff --git a/src/StopWatch.h b/src/common/StopWatch.h similarity index 98% rename from src/StopWatch.h rename to src/common/StopWatch.h index 92196208..f04cbb70 100644 --- a/src/StopWatch.h +++ b/src/common/StopWatch.h @@ -30,7 +30,7 @@ #if !defined(__STOPWATCH_H__) #define __STOPWATCH_H__ -#include "Defines.h" +#include "common/Defines.h" #include diff --git a/src/Thread.cpp b/src/common/Thread.cpp similarity index 100% rename from src/Thread.cpp rename to src/common/Thread.cpp diff --git a/src/Thread.h b/src/common/Thread.h similarity index 98% rename from src/Thread.h rename to src/common/Thread.h index 40ea4f6e..39161307 100644 --- a/src/Thread.h +++ b/src/common/Thread.h @@ -31,7 +31,7 @@ #if !defined(__THREAD_H__) #define __THREAD_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/ThreadFunc.h b/src/common/ThreadFunc.h similarity index 97% rename from src/ThreadFunc.h rename to src/common/ThreadFunc.h index 94960a12..ff95e37c 100644 --- a/src/ThreadFunc.h +++ b/src/common/ThreadFunc.h @@ -30,8 +30,8 @@ #if !defined(__THREAD_FUNC_H__) #define __THREAD_FUNC_H__ -#include "Defines.h" -#include "Thread.h" +#include "common/Defines.h" +#include "common/Thread.h" #include #include diff --git a/src/Timer.cpp b/src/common/Timer.cpp similarity index 100% rename from src/Timer.cpp rename to src/common/Timer.cpp diff --git a/src/Timer.h b/src/common/Timer.h similarity index 99% rename from src/Timer.h rename to src/common/Timer.h index 9dcb04e9..05f4b721 100644 --- a/src/Timer.h +++ b/src/common/Timer.h @@ -31,7 +31,7 @@ #if !defined(__TIMER_H__) #define __TIMER_H__ -#include "Defines.h" +#include "common/Defines.h" // --------------------------------------------------------------------------- // Class Declaration diff --git a/src/Utils.cpp b/src/common/Utils.cpp similarity index 100% rename from src/Utils.cpp rename to src/common/Utils.cpp diff --git a/src/Utils.h b/src/common/Utils.h similarity index 99% rename from src/Utils.h rename to src/common/Utils.h index 0e732090..f98d6a46 100644 --- a/src/Utils.h +++ b/src/common/Utils.h @@ -26,7 +26,7 @@ #if !defined(__UTILS_H__) #define __UTILS_H__ -#include "Defines.h" +#include "common/Defines.h" #include diff --git a/src/dmr/DMRDefines.h b/src/common/dmr/DMRDefines.h similarity index 99% rename from src/dmr/DMRDefines.h rename to src/common/dmr/DMRDefines.h index 12183805..dc92548a 100644 --- a/src/dmr/DMRDefines.h +++ b/src/common/dmr/DMRDefines.h @@ -31,7 +31,7 @@ #if !defined(__DMR_DEFINES_H__) #define __DMR_DEFINES_H__ -#include "Defines.h" +#include "common/Defines.h" namespace dmr { diff --git a/src/dmr/DMRUtils.h b/src/common/dmr/DMRUtils.h similarity index 98% rename from src/dmr/DMRUtils.h rename to src/common/dmr/DMRUtils.h index afd31a65..68381562 100644 --- a/src/dmr/DMRUtils.h +++ b/src/common/dmr/DMRUtils.h @@ -30,8 +30,8 @@ #if !defined(__DMR_UTILS_H__) #define __DMR_UTILS_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" namespace dmr { diff --git a/src/dmr/SiteData.h b/src/common/dmr/SiteData.h similarity index 98% rename from src/dmr/SiteData.h rename to src/common/dmr/SiteData.h index 3c2553fc..35ccff86 100644 --- a/src/dmr/SiteData.h +++ b/src/common/dmr/SiteData.h @@ -30,9 +30,9 @@ #if !defined(__DMR_SITE_DATA_H__) #define __DMR_SITE_DATA_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" -#include "dmr/DMRUtils.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" +#include "common/dmr/DMRUtils.h" namespace dmr { diff --git a/src/dmr/SlotType.cpp b/src/common/dmr/SlotType.cpp similarity index 96% rename from src/dmr/SlotType.cpp rename to src/common/dmr/SlotType.cpp index 5238515a..ffae0217 100644 --- a/src/dmr/SlotType.cpp +++ b/src/common/dmr/SlotType.cpp @@ -27,9 +27,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "dmr/SlotType.h" -#include "edac/Golay2087.h" +#include "common/Defines.h" +#include "common/dmr/SlotType.h" +#include "common/edac/Golay2087.h" using namespace dmr; diff --git a/src/dmr/SlotType.h b/src/common/dmr/SlotType.h similarity index 98% rename from src/dmr/SlotType.h rename to src/common/dmr/SlotType.h index e1e3f1cd..9d0afeb6 100644 --- a/src/dmr/SlotType.h +++ b/src/common/dmr/SlotType.h @@ -30,7 +30,7 @@ #if !defined(__DMR_SLOT_TYPE_H__) #define __DMR_SLOT_TYPE_H__ -#include "Defines.h" +#include "common/Defines.h" namespace dmr { diff --git a/src/dmr/Sync.cpp b/src/common/dmr/Sync.cpp similarity index 100% rename from src/dmr/Sync.cpp rename to src/common/dmr/Sync.cpp diff --git a/src/dmr/Sync.h b/src/common/dmr/Sync.h similarity index 98% rename from src/dmr/Sync.h rename to src/common/dmr/Sync.h index 0711c4fb..1a44a72c 100644 --- a/src/dmr/Sync.h +++ b/src/common/dmr/Sync.h @@ -30,7 +30,7 @@ #if !defined(__DMR_SYNC_H__) #define __DMR_SYNC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace dmr { diff --git a/src/dmr/acl/AccessControl.cpp b/src/common/dmr/acl/AccessControl.cpp similarity index 100% rename from src/dmr/acl/AccessControl.cpp rename to src/common/dmr/acl/AccessControl.cpp diff --git a/src/dmr/acl/AccessControl.h b/src/common/dmr/acl/AccessControl.h similarity index 95% rename from src/dmr/acl/AccessControl.h rename to src/common/dmr/acl/AccessControl.h index 56153312..9d77273a 100644 --- a/src/dmr/acl/AccessControl.h +++ b/src/common/dmr/acl/AccessControl.h @@ -31,9 +31,9 @@ #if !defined(__DMR_ACL__ACCESS_CONTROL_H__) #define __DMR_ACL__ACCESS_CONTROL_H__ -#include "Defines.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" +#include "common/Defines.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" namespace dmr { diff --git a/src/dmr/data/Data.cpp b/src/common/dmr/data/Data.cpp similarity index 100% rename from src/dmr/data/Data.cpp rename to src/common/dmr/data/Data.cpp diff --git a/src/dmr/data/Data.h b/src/common/dmr/data/Data.h similarity index 97% rename from src/dmr/data/Data.h rename to src/common/dmr/data/Data.h index aba4325a..75581932 100644 --- a/src/dmr/data/Data.h +++ b/src/common/dmr/data/Data.h @@ -25,8 +25,8 @@ #if !defined(__DMR_DATA__DATA_H__) #define __DMR_DATA__DATA_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" namespace dmr { diff --git a/src/dmr/data/DataHeader.cpp b/src/common/dmr/data/DataHeader.cpp similarity index 100% rename from src/dmr/data/DataHeader.cpp rename to src/common/dmr/data/DataHeader.cpp diff --git a/src/dmr/data/DataHeader.h b/src/common/dmr/data/DataHeader.h similarity index 99% rename from src/dmr/data/DataHeader.h rename to src/common/dmr/data/DataHeader.h index 6779340d..048da95d 100644 --- a/src/dmr/data/DataHeader.h +++ b/src/common/dmr/data/DataHeader.h @@ -31,7 +31,7 @@ #if !defined(__DMR_DATA__DATA_HEADER_H__) #define __DMR_DATA__DATA_HEADER_H__ -#include "Defines.h" +#include "common/Defines.h" namespace dmr { diff --git a/src/dmr/data/EMB.cpp b/src/common/dmr/data/EMB.cpp similarity index 100% rename from src/dmr/data/EMB.cpp rename to src/common/dmr/data/EMB.cpp diff --git a/src/dmr/data/EMB.h b/src/common/dmr/data/EMB.h similarity index 98% rename from src/dmr/data/EMB.h rename to src/common/dmr/data/EMB.h index 46baf2ce..5a8cde2f 100644 --- a/src/dmr/data/EMB.h +++ b/src/common/dmr/data/EMB.h @@ -30,7 +30,7 @@ #if !defined(__DMR_DATA__EMB_H__) #define __DMR_DATA__EMB_H__ -#include "Defines.h" +#include "common/Defines.h" namespace dmr { diff --git a/src/dmr/data/EmbeddedData.cpp b/src/common/dmr/data/EmbeddedData.cpp similarity index 100% rename from src/dmr/data/EmbeddedData.cpp rename to src/common/dmr/data/EmbeddedData.cpp diff --git a/src/dmr/data/EmbeddedData.h b/src/common/dmr/data/EmbeddedData.h similarity index 97% rename from src/dmr/data/EmbeddedData.h rename to src/common/dmr/data/EmbeddedData.h index 3cbd8cb9..59b87a28 100644 --- a/src/dmr/data/EmbeddedData.h +++ b/src/common/dmr/data/EmbeddedData.h @@ -30,9 +30,9 @@ #if !defined(__DMR_DATA__EMBEDDED_DATA_H__) #define __DMR_DATA__EMBEDDED_DATA_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" -#include "dmr/lc/LC.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" +#include "common/dmr/lc/LC.h" namespace dmr { diff --git a/src/dmr/lc/CSBK.cpp b/src/common/dmr/lc/CSBK.cpp similarity index 100% rename from src/dmr/lc/CSBK.cpp rename to src/common/dmr/lc/CSBK.cpp diff --git a/src/dmr/lc/CSBK.h b/src/common/dmr/lc/CSBK.h similarity index 98% rename from src/dmr/lc/CSBK.h rename to src/common/dmr/lc/CSBK.h index c93cebc9..5561bba8 100644 --- a/src/dmr/lc/CSBK.h +++ b/src/common/dmr/lc/CSBK.h @@ -31,10 +31,10 @@ #if !defined(__DMR_LC__CSBK_H__) #define __DMR_LC__CSBK_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" -#include "dmr/SiteData.h" -#include "lookups/IdenTableLookup.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" +#include "common/dmr/SiteData.h" +#include "common/lookups/IdenTableLookup.h" namespace dmr { diff --git a/src/dmr/lc/FullLC.cpp b/src/common/dmr/lc/FullLC.cpp similarity index 100% rename from src/dmr/lc/FullLC.cpp rename to src/common/dmr/lc/FullLC.cpp diff --git a/src/dmr/lc/FullLC.h b/src/common/dmr/lc/FullLC.h similarity index 93% rename from src/dmr/lc/FullLC.h rename to src/common/dmr/lc/FullLC.h index c4663914..d6293e02 100644 --- a/src/dmr/lc/FullLC.h +++ b/src/common/dmr/lc/FullLC.h @@ -31,11 +31,11 @@ #if !defined(__DMR_LC__FULL_LC_H__) #define __DMR_LC__FULL_LC_H__ -#include "Defines.h" -#include "dmr/lc/LC.h" -#include "dmr/lc/PrivacyLC.h" -#include "dmr/SlotType.h" -#include "edac/BPTC19696.h" +#include "common/Defines.h" +#include "common/dmr/lc/LC.h" +#include "common/dmr/lc/PrivacyLC.h" +#include "common/dmr/SlotType.h" +#include "common/edac/BPTC19696.h" namespace dmr { diff --git a/src/dmr/lc/LC.cpp b/src/common/dmr/lc/LC.cpp similarity index 100% rename from src/dmr/lc/LC.cpp rename to src/common/dmr/lc/LC.cpp diff --git a/src/dmr/lc/LC.h b/src/common/dmr/lc/LC.h similarity index 98% rename from src/dmr/lc/LC.h rename to src/common/dmr/lc/LC.h index f07efefe..7e365a46 100644 --- a/src/dmr/lc/LC.h +++ b/src/common/dmr/lc/LC.h @@ -31,8 +31,8 @@ #if !defined(__DMR_LC__LC_H__) #define __DMR_LC__LC_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" namespace dmr { diff --git a/src/dmr/lc/PrivacyLC.cpp b/src/common/dmr/lc/PrivacyLC.cpp similarity index 100% rename from src/dmr/lc/PrivacyLC.cpp rename to src/common/dmr/lc/PrivacyLC.cpp diff --git a/src/dmr/lc/PrivacyLC.h b/src/common/dmr/lc/PrivacyLC.h similarity index 97% rename from src/dmr/lc/PrivacyLC.h rename to src/common/dmr/lc/PrivacyLC.h index fa80a344..0d5475b7 100644 --- a/src/dmr/lc/PrivacyLC.h +++ b/src/common/dmr/lc/PrivacyLC.h @@ -27,8 +27,8 @@ #if !defined(__DMR_LC__PRIVACY_LC_H__) #define __DMR_LC__PRIVACY_LC_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" namespace dmr { diff --git a/src/dmr/lc/ShortLC.cpp b/src/common/dmr/lc/ShortLC.cpp similarity index 100% rename from src/dmr/lc/ShortLC.cpp rename to src/common/dmr/lc/ShortLC.cpp diff --git a/src/dmr/lc/ShortLC.h b/src/common/dmr/lc/ShortLC.h similarity index 99% rename from src/dmr/lc/ShortLC.h rename to src/common/dmr/lc/ShortLC.h index 50932cb7..11c7515d 100644 --- a/src/dmr/lc/ShortLC.h +++ b/src/common/dmr/lc/ShortLC.h @@ -30,7 +30,7 @@ #if !defined(__DMR_LC__SHORT_LC_H__) #define __DMR_LC__SHORT_LC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBKFactory.cpp b/src/common/dmr/lc/csbk/CSBKFactory.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBKFactory.cpp rename to src/common/dmr/lc/csbk/CSBKFactory.cpp diff --git a/src/dmr/lc/csbk/CSBKFactory.h b/src/common/dmr/lc/csbk/CSBKFactory.h similarity index 69% rename from src/dmr/lc/csbk/CSBKFactory.h rename to src/common/dmr/lc/csbk/CSBKFactory.h index 4dae6da0..7e6b8087 100644 --- a/src/dmr/lc/csbk/CSBKFactory.h +++ b/src/common/dmr/lc/csbk/CSBKFactory.h @@ -26,29 +26,28 @@ #if !defined(__DMR_LC__CSBK_FACTORY_H__) #define __DMR_LC__CSBK_FACTORY_H__ -#include "Defines.h" +#include "common/Defines.h" -#include "dmr/lc/CSBK.h" -#include "dmr/lc/csbk/CSBK_ACK_RSP.h" -#include "dmr/lc/csbk/CSBK_ALOHA.h" -#include "dmr/lc/csbk/CSBK_BROADCAST.h" -#include "dmr/lc/csbk/CSBK_BSDWNACT.h" -#include "dmr/lc/csbk/CSBK_CALL_ALRT.h" -#include "dmr/lc/csbk/CSBK_DVM_GIT_HASH.h" -#include "dmr/lc/csbk/CSBK_EXT_FNCT.h" -#include "dmr/lc/csbk/CSBK_MAINT.h" -#include "dmr/lc/csbk/CSBK_NACK_RSP.h" -#include "dmr/lc/csbk/CSBK_P_CLEAR.h" -#include "dmr/lc/csbk/CSBK_P_GRANT.h" -#include "dmr/lc/csbk/CSBK_PD_GRANT.h" -#include "dmr/lc/csbk/CSBK_PRECCSBK.h" -#include "dmr/lc/csbk/CSBK_PV_GRANT.h" -#include "dmr/lc/csbk/CSBK_RAND.h" -#include "dmr/lc/csbk/CSBK_RAW.h" -#include "dmr/lc/csbk/CSBK_TD_GRANT.h" -#include "dmr/lc/csbk/CSBK_TV_GRANT.h" -#include "dmr/lc/csbk/CSBK_UU_ANS_RSP.h" -#include "dmr/lc/csbk/CSBK_UU_V_REQ.h" +#include "common/dmr/lc/CSBK.h" +#include "common/dmr/lc/csbk/CSBK_ACK_RSP.h" +#include "common/dmr/lc/csbk/CSBK_ALOHA.h" +#include "common/dmr/lc/csbk/CSBK_BROADCAST.h" +#include "common/dmr/lc/csbk/CSBK_BSDWNACT.h" +#include "common/dmr/lc/csbk/CSBK_CALL_ALRT.h" +#include "common/dmr/lc/csbk/CSBK_EXT_FNCT.h" +#include "common/dmr/lc/csbk/CSBK_MAINT.h" +#include "common/dmr/lc/csbk/CSBK_NACK_RSP.h" +#include "common/dmr/lc/csbk/CSBK_P_CLEAR.h" +#include "common/dmr/lc/csbk/CSBK_P_GRANT.h" +#include "common/dmr/lc/csbk/CSBK_PD_GRANT.h" +#include "common/dmr/lc/csbk/CSBK_PRECCSBK.h" +#include "common/dmr/lc/csbk/CSBK_PV_GRANT.h" +#include "common/dmr/lc/csbk/CSBK_RAND.h" +#include "common/dmr/lc/csbk/CSBK_RAW.h" +#include "common/dmr/lc/csbk/CSBK_TD_GRANT.h" +#include "common/dmr/lc/csbk/CSBK_TV_GRANT.h" +#include "common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h" +#include "common/dmr/lc/csbk/CSBK_UU_V_REQ.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_ACK_RSP.cpp b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_ACK_RSP.cpp rename to src/common/dmr/lc/csbk/CSBK_ACK_RSP.cpp diff --git a/src/dmr/lc/csbk/CSBK_ACK_RSP.h b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_ACK_RSP.h rename to src/common/dmr/lc/csbk/CSBK_ACK_RSP.h index 1f3b715b..ce4065d3 100644 --- a/src/dmr/lc/csbk/CSBK_ACK_RSP.h +++ b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_ACK_RSP_H__) #define __DMR_LC_CSBK__CSBK_ACK_RSP_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_ALOHA.cpp b/src/common/dmr/lc/csbk/CSBK_ALOHA.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_ALOHA.cpp rename to src/common/dmr/lc/csbk/CSBK_ALOHA.cpp diff --git a/src/dmr/lc/csbk/CSBK_ALOHA.h b/src/common/dmr/lc/csbk/CSBK_ALOHA.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_ALOHA.h rename to src/common/dmr/lc/csbk/CSBK_ALOHA.h index f2d937d5..350c7498 100644 --- a/src/dmr/lc/csbk/CSBK_ALOHA.h +++ b/src/common/dmr/lc/csbk/CSBK_ALOHA.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_ALOHA_H__) #define __DMR_LC_CSBK__CSBK_ALOHA_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_BROADCAST.cpp b/src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_BROADCAST.cpp rename to src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp diff --git a/src/dmr/lc/csbk/CSBK_BROADCAST.h b/src/common/dmr/lc/csbk/CSBK_BROADCAST.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_BROADCAST.h rename to src/common/dmr/lc/csbk/CSBK_BROADCAST.h index e8699bd9..f28002ac 100644 --- a/src/dmr/lc/csbk/CSBK_BROADCAST.h +++ b/src/common/dmr/lc/csbk/CSBK_BROADCAST.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_BROADCAST_H__) #define __DMR_LC_CSBK__CSBK_BROADCAST_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_BSDWNACT.cpp b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_BSDWNACT.cpp rename to src/common/dmr/lc/csbk/CSBK_BSDWNACT.cpp diff --git a/src/dmr/lc/csbk/CSBK_BSDWNACT.h b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_BSDWNACT.h rename to src/common/dmr/lc/csbk/CSBK_BSDWNACT.h index b5c71a52..8998b472 100644 --- a/src/dmr/lc/csbk/CSBK_BSDWNACT.h +++ b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_BSDWNACT_H__) #define __DMR_LC_CSBK__CSBK_BSDWNACT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_CALL_ALRT.cpp b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_CALL_ALRT.cpp rename to src/common/dmr/lc/csbk/CSBK_CALL_ALRT.cpp diff --git a/src/dmr/lc/csbk/CSBK_CALL_ALRT.h b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_CALL_ALRT.h rename to src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h index 4378b15c..d492c61c 100644 --- a/src/dmr/lc/csbk/CSBK_CALL_ALRT.h +++ b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_CALL_ALRT_H__) #define __DMR_LC_CSBK__CSBK_CALL_ALRT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_EXT_FNCT.cpp b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_EXT_FNCT.cpp rename to src/common/dmr/lc/csbk/CSBK_EXT_FNCT.cpp diff --git a/src/dmr/lc/csbk/CSBK_EXT_FNCT.h b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_EXT_FNCT.h rename to src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h index 8bb98b7b..78415e7e 100644 --- a/src/dmr/lc/csbk/CSBK_EXT_FNCT.h +++ b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_EXT_FNCT_H__) #define __DMR_LC_CSBK__CSBK_EXT_FNCT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_MAINT.cpp b/src/common/dmr/lc/csbk/CSBK_MAINT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_MAINT.cpp rename to src/common/dmr/lc/csbk/CSBK_MAINT.cpp diff --git a/src/dmr/lc/csbk/CSBK_MAINT.h b/src/common/dmr/lc/csbk/CSBK_MAINT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_MAINT.h rename to src/common/dmr/lc/csbk/CSBK_MAINT.h index 6184f9bd..e0ea4eb3 100644 --- a/src/dmr/lc/csbk/CSBK_MAINT.h +++ b/src/common/dmr/lc/csbk/CSBK_MAINT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_MAINT_H__) #define __DMR_LC_CSBK__CSBK_MAINT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_NACK_RSP.cpp b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_NACK_RSP.cpp rename to src/common/dmr/lc/csbk/CSBK_NACK_RSP.cpp diff --git a/src/dmr/lc/csbk/CSBK_NACK_RSP.h b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_NACK_RSP.h rename to src/common/dmr/lc/csbk/CSBK_NACK_RSP.h index 03b0d969..b49ee3e7 100644 --- a/src/dmr/lc/csbk/CSBK_NACK_RSP.h +++ b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_NACK_RSP_H__) #define __DMR_LC_CSBK__CSBK_NACK_RSP_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_PD_GRANT.cpp b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_PD_GRANT.cpp rename to src/common/dmr/lc/csbk/CSBK_PD_GRANT.cpp diff --git a/src/dmr/lc/csbk/CSBK_PD_GRANT.h b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_PD_GRANT.h rename to src/common/dmr/lc/csbk/CSBK_PD_GRANT.h index 6fe88e6b..47bd1a06 100644 --- a/src/dmr/lc/csbk/CSBK_PD_GRANT.h +++ b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_PD_GRANT_H__) #define __DMR_LC_CSBK__CSBK_PD_GRANT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_PRECCSBK.cpp b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_PRECCSBK.cpp rename to src/common/dmr/lc/csbk/CSBK_PRECCSBK.cpp diff --git a/src/dmr/lc/csbk/CSBK_PRECCSBK.h b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_PRECCSBK.h rename to src/common/dmr/lc/csbk/CSBK_PRECCSBK.h index eaaf60b0..49b5bffa 100644 --- a/src/dmr/lc/csbk/CSBK_PRECCSBK.h +++ b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_PRECCSBK_H__) #define __DMR_LC_CSBK__CSBK_PRECCSBK_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_PV_GRANT.cpp b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_PV_GRANT.cpp rename to src/common/dmr/lc/csbk/CSBK_PV_GRANT.cpp diff --git a/src/dmr/lc/csbk/CSBK_PV_GRANT.h b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_PV_GRANT.h rename to src/common/dmr/lc/csbk/CSBK_PV_GRANT.h index 851a8064..5c33e85d 100644 --- a/src/dmr/lc/csbk/CSBK_PV_GRANT.h +++ b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_PV_GRANT_H__) #define __DMR_LC_CSBK__CSBK_PV_GRANT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_P_CLEAR.cpp b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_P_CLEAR.cpp rename to src/common/dmr/lc/csbk/CSBK_P_CLEAR.cpp diff --git a/src/dmr/lc/csbk/CSBK_P_CLEAR.h b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_P_CLEAR.h rename to src/common/dmr/lc/csbk/CSBK_P_CLEAR.h index 6d63e6a9..79a09c5c 100644 --- a/src/dmr/lc/csbk/CSBK_P_CLEAR.h +++ b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_P_CLEAR_H__) #define __DMR_LC_CSBK__CSBK_P_CLEAR_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_P_GRANT.cpp b/src/common/dmr/lc/csbk/CSBK_P_GRANT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_P_GRANT.cpp rename to src/common/dmr/lc/csbk/CSBK_P_GRANT.cpp diff --git a/src/dmr/lc/csbk/CSBK_P_GRANT.h b/src/common/dmr/lc/csbk/CSBK_P_GRANT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_P_GRANT.h rename to src/common/dmr/lc/csbk/CSBK_P_GRANT.h index 997a1440..7a610cc5 100644 --- a/src/dmr/lc/csbk/CSBK_P_GRANT.h +++ b/src/common/dmr/lc/csbk/CSBK_P_GRANT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_P_GRANT_H__) #define __DMR_LC_CSBK__CSBK_P_GRANT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_RAND.cpp b/src/common/dmr/lc/csbk/CSBK_RAND.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_RAND.cpp rename to src/common/dmr/lc/csbk/CSBK_RAND.cpp diff --git a/src/dmr/lc/csbk/CSBK_RAND.h b/src/common/dmr/lc/csbk/CSBK_RAND.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_RAND.h rename to src/common/dmr/lc/csbk/CSBK_RAND.h index eb73db56..210f989a 100644 --- a/src/dmr/lc/csbk/CSBK_RAND.h +++ b/src/common/dmr/lc/csbk/CSBK_RAND.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_RAND_H__) #define __DMR_LC_CSBK__CSBK_RAND_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_RAW.cpp b/src/common/dmr/lc/csbk/CSBK_RAW.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_RAW.cpp rename to src/common/dmr/lc/csbk/CSBK_RAW.cpp diff --git a/src/dmr/lc/csbk/CSBK_RAW.h b/src/common/dmr/lc/csbk/CSBK_RAW.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_RAW.h rename to src/common/dmr/lc/csbk/CSBK_RAW.h index 74700ff1..60361954 100644 --- a/src/dmr/lc/csbk/CSBK_RAW.h +++ b/src/common/dmr/lc/csbk/CSBK_RAW.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_RAW_H__) #define __DMR_LC_CSBK__CSBK_RAW_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_TD_GRANT.cpp b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_TD_GRANT.cpp rename to src/common/dmr/lc/csbk/CSBK_TD_GRANT.cpp diff --git a/src/dmr/lc/csbk/CSBK_TD_GRANT.h b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_TD_GRANT.h rename to src/common/dmr/lc/csbk/CSBK_TD_GRANT.h index df026ca4..0a8506b7 100644 --- a/src/dmr/lc/csbk/CSBK_TD_GRANT.h +++ b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_TD_GRANT_H__) #define __DMR_LC_CSBK__CSBK_TD_GRANT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_TV_GRANT.cpp b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_TV_GRANT.cpp rename to src/common/dmr/lc/csbk/CSBK_TV_GRANT.cpp diff --git a/src/dmr/lc/csbk/CSBK_TV_GRANT.h b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_TV_GRANT.h rename to src/common/dmr/lc/csbk/CSBK_TV_GRANT.h index d7b3c9b2..559c5773 100644 --- a/src/dmr/lc/csbk/CSBK_TV_GRANT.h +++ b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_TV_GRANT_H__) #define __DMR_LC_CSBK__CSBK_TV_GRANT_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp rename to src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp diff --git a/src/dmr/lc/csbk/CSBK_UU_ANS_RSP.h b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_UU_ANS_RSP.h rename to src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h index 4df27d67..8e629ab9 100644 --- a/src/dmr/lc/csbk/CSBK_UU_ANS_RSP.h +++ b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_UU_ANS_RSP_H__) #define __DMR_LC_CSBK__CSBK_UU_ANS_RSP_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lc/csbk/CSBK_UU_V_REQ.cpp b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.cpp similarity index 100% rename from src/dmr/lc/csbk/CSBK_UU_V_REQ.cpp rename to src/common/dmr/lc/csbk/CSBK_UU_V_REQ.cpp diff --git a/src/dmr/lc/csbk/CSBK_UU_V_REQ.h b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h similarity index 97% rename from src/dmr/lc/csbk/CSBK_UU_V_REQ.h rename to src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h index 67f1b4e3..2e619b88 100644 --- a/src/dmr/lc/csbk/CSBK_UU_V_REQ.h +++ b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h @@ -26,8 +26,8 @@ #if !defined(__DMR_LC_CSBK__CSBK_UU_V_REQ_H__) #define __DMR_LC_CSBK__CSBK_UU_V_REQ_H__ -#include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/Defines.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/edac/AMBEFEC.cpp b/src/common/edac/AMBEFEC.cpp similarity index 100% rename from src/edac/AMBEFEC.cpp rename to src/common/edac/AMBEFEC.cpp diff --git a/src/edac/AMBEFEC.h b/src/common/edac/AMBEFEC.h similarity index 99% rename from src/edac/AMBEFEC.h rename to src/common/edac/AMBEFEC.h index f24c5ea5..3d00f551 100644 --- a/src/edac/AMBEFEC.h +++ b/src/common/edac/AMBEFEC.h @@ -31,7 +31,7 @@ #if !defined(__AMBE_FEC_H__) #define __AMBE_FEC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/BCH.cpp b/src/common/edac/BCH.cpp similarity index 100% rename from src/edac/BCH.cpp rename to src/common/edac/BCH.cpp diff --git a/src/edac/BCH.h b/src/common/edac/BCH.h similarity index 94% rename from src/edac/BCH.h rename to src/common/edac/BCH.h index e0e53100..1fa8f90b 100644 --- a/src/edac/BCH.h +++ b/src/common/edac/BCH.h @@ -30,13 +30,13 @@ #if !defined(__BCH_H__) #define __BCH_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { // --------------------------------------------------------------------------- // Class Declaration - // Implements Bose–Chaudhuri–Hocquenghem codes for protecting P25 NID + // Implements Bose�Chaudhuri�Hocquenghem codes for protecting P25 NID // data. // --------------------------------------------------------------------------- diff --git a/src/edac/BPTC19696.cpp b/src/common/edac/BPTC19696.cpp similarity index 100% rename from src/edac/BPTC19696.cpp rename to src/common/edac/BPTC19696.cpp diff --git a/src/edac/BPTC19696.h b/src/common/edac/BPTC19696.h similarity index 98% rename from src/edac/BPTC19696.h rename to src/common/edac/BPTC19696.h index 71ec50f7..b7ecea5a 100644 --- a/src/edac/BPTC19696.h +++ b/src/common/edac/BPTC19696.h @@ -30,7 +30,7 @@ #if !defined(__BPTC19696_H__) #define __BPTC19696_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/CRC.cpp b/src/common/edac/CRC.cpp similarity index 100% rename from src/edac/CRC.cpp rename to src/common/edac/CRC.cpp diff --git a/src/edac/CRC.h b/src/common/edac/CRC.h similarity index 99% rename from src/edac/CRC.h rename to src/common/edac/CRC.h index 7f74946c..35a3d331 100644 --- a/src/edac/CRC.h +++ b/src/common/edac/CRC.h @@ -31,7 +31,7 @@ #if !defined(__CRC_H__) #define __CRC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/Golay2087.cpp b/src/common/edac/Golay2087.cpp similarity index 100% rename from src/edac/Golay2087.cpp rename to src/common/edac/Golay2087.cpp diff --git a/src/edac/Golay2087.h b/src/common/edac/Golay2087.h similarity index 98% rename from src/edac/Golay2087.h rename to src/common/edac/Golay2087.h index 5974ca8b..f6394fd9 100644 --- a/src/edac/Golay2087.h +++ b/src/common/edac/Golay2087.h @@ -30,7 +30,7 @@ #if !defined(__GOLAY2087_H__) #define __GOLAY2087_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/Golay24128.cpp b/src/common/edac/Golay24128.cpp similarity index 100% rename from src/edac/Golay24128.cpp rename to src/common/edac/Golay24128.cpp diff --git a/src/edac/Golay24128.h b/src/common/edac/Golay24128.h similarity index 98% rename from src/edac/Golay24128.h rename to src/common/edac/Golay24128.h index ac1afbcd..0b454c23 100644 --- a/src/edac/Golay24128.h +++ b/src/common/edac/Golay24128.h @@ -31,7 +31,7 @@ #if !defined(__GOLAY24128_H__) #define __GOLAY24128_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/Hamming.cpp b/src/common/edac/Hamming.cpp similarity index 100% rename from src/edac/Hamming.cpp rename to src/common/edac/Hamming.cpp diff --git a/src/edac/Hamming.h b/src/common/edac/Hamming.h similarity index 99% rename from src/edac/Hamming.h rename to src/common/edac/Hamming.h index 5abe8ca4..3230319c 100644 --- a/src/edac/Hamming.h +++ b/src/common/edac/Hamming.h @@ -30,7 +30,7 @@ #if !defined(__HAMMING_H__) #define __HAMMING_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/QR1676.cpp b/src/common/edac/QR1676.cpp similarity index 100% rename from src/edac/QR1676.cpp rename to src/common/edac/QR1676.cpp diff --git a/src/edac/QR1676.h b/src/common/edac/QR1676.h similarity index 98% rename from src/edac/QR1676.h rename to src/common/edac/QR1676.h index 0b3106c7..5b0de130 100644 --- a/src/edac/QR1676.h +++ b/src/common/edac/QR1676.h @@ -30,7 +30,7 @@ #if !defined(__QR1676_H__) #define __QR1676_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/RS129.cpp b/src/common/edac/RS129.cpp similarity index 100% rename from src/edac/RS129.cpp rename to src/common/edac/RS129.cpp diff --git a/src/edac/RS129.h b/src/common/edac/RS129.h similarity index 98% rename from src/edac/RS129.h rename to src/common/edac/RS129.h index e6aef041..97f0a89f 100644 --- a/src/edac/RS129.h +++ b/src/common/edac/RS129.h @@ -30,7 +30,7 @@ #if !defined(__RS129_H__) #define __RS129_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/RS634717.cpp b/src/common/edac/RS634717.cpp similarity index 100% rename from src/edac/RS634717.cpp rename to src/common/edac/RS634717.cpp diff --git a/src/edac/RS634717.h b/src/common/edac/RS634717.h similarity index 99% rename from src/edac/RS634717.h rename to src/common/edac/RS634717.h index 579ca3b7..8bc9fd2d 100755 --- a/src/edac/RS634717.h +++ b/src/common/edac/RS634717.h @@ -31,7 +31,7 @@ #if !defined(__RS634717_H__) #define __RS634717_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/SHA256.cpp b/src/common/edac/SHA256.cpp similarity index 100% rename from src/edac/SHA256.cpp rename to src/common/edac/SHA256.cpp diff --git a/src/edac/SHA256.h b/src/common/edac/SHA256.h similarity index 99% rename from src/edac/SHA256.h rename to src/common/edac/SHA256.h index b7fd6ec0..42cba1ce 100644 --- a/src/edac/SHA256.h +++ b/src/common/edac/SHA256.h @@ -31,7 +31,7 @@ #if !defined(__SHA256_H__) #define __SHA256_H__ -#include "Defines.h" +#include "common/Defines.h" #include diff --git a/src/edac/Trellis.cpp b/src/common/edac/Trellis.cpp similarity index 100% rename from src/edac/Trellis.cpp rename to src/common/edac/Trellis.cpp diff --git a/src/edac/Trellis.h b/src/common/edac/Trellis.h similarity index 99% rename from src/edac/Trellis.h rename to src/common/edac/Trellis.h index 78c5abfe..59e9adf3 100644 --- a/src/edac/Trellis.h +++ b/src/common/edac/Trellis.h @@ -25,7 +25,7 @@ #if !defined(__EDAC__TRELLIS_H__) #define __EDAC__TRELLIS_H__ -#include "Defines.h" +#include "common/Defines.h" namespace edac { diff --git a/src/edac/rs/RS.h b/src/common/edac/rs/RS.h similarity index 99% rename from src/edac/rs/RS.h rename to src/common/edac/rs/RS.h index 9cb2e371..9ac0a00c 100755 --- a/src/edac/rs/RS.h +++ b/src/common/edac/rs/RS.h @@ -79,8 +79,8 @@ #if !defined(__RS_H__) #define __RS_H__ -#include "Defines.h" -#include "Log.h" +#include "common/Defines.h" +#include "common/Log.h" #include #include diff --git a/src/lookups/AffiliationLookup.cpp b/src/common/lookups/AffiliationLookup.cpp similarity index 100% rename from src/lookups/AffiliationLookup.cpp rename to src/common/lookups/AffiliationLookup.cpp diff --git a/src/lookups/AffiliationLookup.h b/src/common/lookups/AffiliationLookup.h similarity index 99% rename from src/lookups/AffiliationLookup.h rename to src/common/lookups/AffiliationLookup.h index 7a507f57..67b7f63b 100644 --- a/src/lookups/AffiliationLookup.h +++ b/src/common/lookups/AffiliationLookup.h @@ -26,8 +26,8 @@ #if !defined(__AFFILIATION_LOOKUP_H__) #define __AFFILIATION_LOOKUP_H__ -#include "Defines.h" -#include "Timer.h" +#include "common/Defines.h" +#include "common/Timer.h" #include #include diff --git a/src/lookups/IdenTableLookup.cpp b/src/common/lookups/IdenTableLookup.cpp similarity index 100% rename from src/lookups/IdenTableLookup.cpp rename to src/common/lookups/IdenTableLookup.cpp diff --git a/src/lookups/IdenTableLookup.h b/src/common/lookups/IdenTableLookup.h similarity index 98% rename from src/lookups/IdenTableLookup.h rename to src/common/lookups/IdenTableLookup.h index f7bcad63..41777647 100644 --- a/src/lookups/IdenTableLookup.h +++ b/src/common/lookups/IdenTableLookup.h @@ -26,9 +26,9 @@ #if !defined(__IDEN_TABLE_LOOKUP_H__) #define __IDEN_TABLE_LOOKUP_H__ -#include "Defines.h" -#include "lookups/LookupTable.h" -#include "Thread.h" +#include "common/Defines.h" +#include "common/lookups/LookupTable.h" +#include "common/Thread.h" #include #include diff --git a/src/lookups/LookupTable.h b/src/common/lookups/LookupTable.h similarity index 98% rename from src/lookups/LookupTable.h rename to src/common/lookups/LookupTable.h index a915d8b2..ea470051 100644 --- a/src/lookups/LookupTable.h +++ b/src/common/lookups/LookupTable.h @@ -30,10 +30,10 @@ #pragma warning(disable : 4834) // [[nodiscard]] warning -- we don't care about this here #endif -#include "Defines.h" -#include "Log.h" -#include "Thread.h" -#include "Timer.h" +#include "common/Defines.h" +#include "common/Log.h" +#include "common/Thread.h" +#include "common/Timer.h" #include #include diff --git a/src/lookups/RSSIInterpolator.cpp b/src/common/lookups/RSSIInterpolator.cpp similarity index 100% rename from src/lookups/RSSIInterpolator.cpp rename to src/common/lookups/RSSIInterpolator.cpp diff --git a/src/lookups/RSSIInterpolator.h b/src/common/lookups/RSSIInterpolator.h similarity index 98% rename from src/lookups/RSSIInterpolator.h rename to src/common/lookups/RSSIInterpolator.h index 57ea335e..0111261a 100644 --- a/src/lookups/RSSIInterpolator.h +++ b/src/common/lookups/RSSIInterpolator.h @@ -30,7 +30,7 @@ #if !defined(__RSSI_INTERPOLATOR_H__) #define __RSSI_INTERPOLATOR_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/lookups/RadioIdLookup.cpp b/src/common/lookups/RadioIdLookup.cpp similarity index 100% rename from src/lookups/RadioIdLookup.cpp rename to src/common/lookups/RadioIdLookup.cpp diff --git a/src/lookups/RadioIdLookup.h b/src/common/lookups/RadioIdLookup.h similarity index 97% rename from src/lookups/RadioIdLookup.h rename to src/common/lookups/RadioIdLookup.h index d909ff56..97607031 100644 --- a/src/lookups/RadioIdLookup.h +++ b/src/common/lookups/RadioIdLookup.h @@ -31,9 +31,9 @@ #if !defined(__RADIO_ID_LOOKUP_H__) #define __RADIO_ID_LOOKUP_H__ -#include "Defines.h" -#include "lookups/LookupTable.h" -#include "Thread.h" +#include "common/Defines.h" +#include "common/lookups/LookupTable.h" +#include "common/Thread.h" #include #include diff --git a/src/lookups/TalkgroupRulesLookup.cpp b/src/common/lookups/TalkgroupRulesLookup.cpp similarity index 100% rename from src/lookups/TalkgroupRulesLookup.cpp rename to src/common/lookups/TalkgroupRulesLookup.cpp diff --git a/src/lookups/TalkgroupRulesLookup.h b/src/common/lookups/TalkgroupRulesLookup.h similarity index 98% rename from src/lookups/TalkgroupRulesLookup.h rename to src/common/lookups/TalkgroupRulesLookup.h index 03ad0f11..ec3efa55 100644 --- a/src/lookups/TalkgroupRulesLookup.h +++ b/src/common/lookups/TalkgroupRulesLookup.h @@ -26,10 +26,10 @@ #if !defined(__TALKGROUP_RULES_LOOKUP_H__) #define __TALKGROUP_RULES_LOOKUP_H__ -#include "Defines.h" -#include "lookups/LookupTable.h" -#include "Thread.h" -#include "yaml/Yaml.h" +#include "common/Defines.h" +#include "common/lookups/LookupTable.h" +#include "common/Thread.h" +#include "common/yaml/Yaml.h" #include #include diff --git a/src/network/BaseNetwork.cpp b/src/common/network/BaseNetwork.cpp similarity index 100% rename from src/network/BaseNetwork.cpp rename to src/common/network/BaseNetwork.cpp diff --git a/src/network/BaseNetwork.h b/src/common/network/BaseNetwork.h similarity index 95% rename from src/network/BaseNetwork.h rename to src/common/network/BaseNetwork.h index 08f941cf..1a99fe02 100644 --- a/src/network/BaseNetwork.h +++ b/src/common/network/BaseNetwork.h @@ -31,24 +31,24 @@ #if !defined(__BASE_NETWORK_H__) #define __BASE_NETWORK_H__ -#include "Defines.h" -#include "dmr/DMRDefines.h" -#include "p25/P25Defines.h" -#include "nxdn/NXDNDefines.h" -#include "dmr/data/Data.h" -#include "p25/data/DataHeader.h" -#include "p25/data/LowSpeedData.h" -#include "p25/dfsi/DFSIDefines.h" -#include "p25/dfsi/LC.h" -#include "p25/lc/LC.h" -#include "p25/lc/TSBK.h" -#include "p25/lc/TDULC.h" -#include "p25/Audio.h" -#include "nxdn/lc/RTCH.h" -#include "network/FrameQueue.h" -#include "network/UDPSocket.h" -#include "RingBuffer.h" -#include "Timer.h" +#include "common/Defines.h" +#include "common/dmr/DMRDefines.h" +#include "common/p25/P25Defines.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/dmr/data/Data.h" +#include "common/p25/data/DataHeader.h" +#include "common/p25/data/LowSpeedData.h" +#include "common/p25/dfsi/DFSIDefines.h" +#include "common/p25/dfsi/LC.h" +#include "common/p25/lc/LC.h" +#include "common/p25/lc/TSBK.h" +#include "common/p25/lc/TDULC.h" +#include "common/p25/Audio.h" +#include "common/nxdn/lc/RTCH.h" +#include "common/network/FrameQueue.h" +#include "common/network/UDPSocket.h" +#include "common/RingBuffer.h" +#include "common/Timer.h" #include #include diff --git a/src/network/FrameQueue.cpp b/src/common/network/FrameQueue.cpp similarity index 100% rename from src/network/FrameQueue.cpp rename to src/common/network/FrameQueue.cpp diff --git a/src/network/FrameQueue.h b/src/common/network/FrameQueue.h similarity index 93% rename from src/network/FrameQueue.h rename to src/common/network/FrameQueue.h index 37de81d4..2058a264 100644 --- a/src/network/FrameQueue.h +++ b/src/common/network/FrameQueue.h @@ -26,11 +26,11 @@ #if !defined(__FRAME_QUEUE_H__) #define __FRAME_QUEUE_H__ -#include "Defines.h" -#include "network/UDPSocket.h" -#include "network/RTPHeader.h" -#include "network/RTPExtensionHeader.h" -#include "network/RTPFNEHeader.h" +#include "common/Defines.h" +#include "common/network/UDPSocket.h" +#include "common/network/RTPHeader.h" +#include "common/network/RTPExtensionHeader.h" +#include "common/network/RTPFNEHeader.h" namespace network { diff --git a/src/network/RTPExtensionHeader.cpp b/src/common/network/RTPExtensionHeader.cpp similarity index 100% rename from src/network/RTPExtensionHeader.cpp rename to src/common/network/RTPExtensionHeader.cpp diff --git a/src/network/RTPExtensionHeader.h b/src/common/network/RTPExtensionHeader.h similarity index 97% rename from src/network/RTPExtensionHeader.h rename to src/common/network/RTPExtensionHeader.h index e681153c..aca943d3 100644 --- a/src/network/RTPExtensionHeader.h +++ b/src/common/network/RTPExtensionHeader.h @@ -26,7 +26,7 @@ #if !defined(__RTP_EXTENSION_HEADER_H__) #define __RTP_EXTENSION_HEADER_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/network/RTPFNEHeader.cpp b/src/common/network/RTPFNEHeader.cpp similarity index 96% rename from src/network/RTPFNEHeader.cpp rename to src/common/network/RTPFNEHeader.cpp index 9ad134c8..1fff7e16 100644 --- a/src/network/RTPFNEHeader.cpp +++ b/src/common/network/RTPFNEHeader.cpp @@ -24,7 +24,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "modem/Modem.h" #include "network/RTPFNEHeader.h" using namespace network::frame; @@ -70,7 +69,7 @@ bool RTPFNEHeader::decode(const uint8_t* data) return false; } - if (m_payloadType != modem::DVM_FRAME_START) { + if (m_payloadType != DVM_FRAME_START) { return false; } @@ -92,7 +91,7 @@ void RTPFNEHeader::encode(uint8_t* data) { assert(data != nullptr); - m_payloadType = modem::DVM_FRAME_START; + m_payloadType = DVM_FRAME_START; m_payloadLength = RTP_FNE_HEADER_LENGTH_EXT_LEN; RTPExtensionHeader::encode(data); diff --git a/src/network/RTPFNEHeader.h b/src/common/network/RTPFNEHeader.h similarity index 89% rename from src/network/RTPFNEHeader.h rename to src/common/network/RTPFNEHeader.h index 9f7547ab..3b5d95b3 100644 --- a/src/network/RTPFNEHeader.h +++ b/src/common/network/RTPFNEHeader.h @@ -26,8 +26,8 @@ #if !defined(__RTP_FNE_HEADER_H__) #define __RTP_FNE_HEADER_H__ -#include "Defines.h" -#include "network/RTPExtensionHeader.h" +#include "common/Defines.h" +#include "common/network/RTPExtensionHeader.h" #include #include @@ -44,6 +44,12 @@ namespace network { namespace frame { + // --------------------------------------------------------------------------- + // Constants + // --------------------------------------------------------------------------- + + const uint8_t DVM_FRAME_START = 0xFEU; + // --------------------------------------------------------------------------- // Class Declaration // Represents the FNE RTP Extension header. diff --git a/src/network/RTPHeader.cpp b/src/common/network/RTPHeader.cpp similarity index 100% rename from src/network/RTPHeader.cpp rename to src/common/network/RTPHeader.cpp diff --git a/src/network/RTPHeader.h b/src/common/network/RTPHeader.h similarity index 98% rename from src/network/RTPHeader.h rename to src/common/network/RTPHeader.h index 072ea14b..7b9a9b81 100644 --- a/src/network/RTPHeader.h +++ b/src/common/network/RTPHeader.h @@ -26,7 +26,7 @@ #if !defined(__RTP_HEADER_H__) #define __RTP_HEADER_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/network/UDPSocket.cpp b/src/common/network/UDPSocket.cpp similarity index 100% rename from src/network/UDPSocket.cpp rename to src/common/network/UDPSocket.cpp diff --git a/src/network/UDPSocket.h b/src/common/network/UDPSocket.h similarity index 99% rename from src/network/UDPSocket.h rename to src/common/network/UDPSocket.h index 87edd6ee..ca399828 100644 --- a/src/network/UDPSocket.h +++ b/src/common/network/UDPSocket.h @@ -31,7 +31,7 @@ #if !defined(__UDP_SOCKET_H__) #define __UDP_SOCKET_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/network/json/json.h b/src/common/network/json/json.h similarity index 99% rename from src/network/json/json.h rename to src/common/network/json/json.h index 3fd28600..dc4326af 100644 --- a/src/network/json/json.h +++ b/src/common/network/json/json.h @@ -41,7 +41,7 @@ #if !defined(__JSON_H__) #define __JSON_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/network/rest/RequestDispatcher.h b/src/common/network/rest/RequestDispatcher.h similarity index 99% rename from src/network/rest/RequestDispatcher.h rename to src/common/network/rest/RequestDispatcher.h index 400dea98..7fec497d 100644 --- a/src/network/rest/RequestDispatcher.h +++ b/src/common/network/rest/RequestDispatcher.h @@ -26,9 +26,9 @@ #if !defined(__REST__DISPATCHER_H__) #define __REST__DISPATCHER_H__ -#include "Defines.h" -#include "network/rest/http/HTTPPayload.h" -#include "Log.h" +#include "common/Defines.h" +#include "common/network/rest/http/HTTPPayload.h" +#include "common/Log.h" #include #include diff --git a/src/network/rest/http/ClientConnection.h b/src/common/network/rest/http/ClientConnection.h similarity index 97% rename from src/network/rest/http/ClientConnection.h rename to src/common/network/rest/http/ClientConnection.h index 05ede2e4..3730c70e 100644 --- a/src/network/rest/http/ClientConnection.h +++ b/src/common/network/rest/http/ClientConnection.h @@ -37,11 +37,11 @@ #if !defined(__REST_HTTP__CLIENT_CONNECTION_H__) #define __REST_HTTP__CLIENT_CONNECTION_H__ -#include "Defines.h" -#include "network/rest/http/HTTPLexer.h" -#include "network/rest/http/HTTPPayload.h" -#include "Log.h" -#include "Utils.h" +#include "common/Defines.h" +#include "common/network/rest/http/HTTPLexer.h" +#include "common/network/rest/http/HTTPPayload.h" +#include "common/Log.h" +#include "common/Utils.h" #include #include diff --git a/src/network/rest/http/HTTPClient.h b/src/common/network/rest/http/HTTPClient.h similarity index 97% rename from src/network/rest/http/HTTPClient.h rename to src/common/network/rest/http/HTTPClient.h index 474d4998..068911a8 100644 --- a/src/network/rest/http/HTTPClient.h +++ b/src/common/network/rest/http/HTTPClient.h @@ -32,10 +32,10 @@ #if !defined(__REST_HTTP__HTTP_CLIENT_H__) #define __REST_HTTP__HTTP_CLIENT_H__ -#include "Defines.h" -#include "network/rest/http/ClientConnection.h" -#include "network/rest/http/HTTPRequestHandler.h" -#include "Thread.h" +#include "common/Defines.h" +#include "common/network/rest/http/ClientConnection.h" +#include "common/network/rest/http/HTTPRequestHandler.h" +#include "common/Thread.h" #include diff --git a/src/network/rest/http/HTTPHeaders.h b/src/common/network/rest/http/HTTPHeaders.h similarity index 99% rename from src/network/rest/http/HTTPHeaders.h rename to src/common/network/rest/http/HTTPHeaders.h index b4666c79..cf876130 100644 --- a/src/network/rest/http/HTTPHeaders.h +++ b/src/common/network/rest/http/HTTPHeaders.h @@ -37,8 +37,8 @@ #if !defined(__REST_HTTP__HTTP_HEADERS_H__) #define __REST_HTTP__HTTP_HEADERS_H__ -#include "Defines.h" -#include "Log.h" +#include "common/Defines.h" +#include "common/Log.h" #include #include diff --git a/src/network/rest/http/HTTPLexer.cpp b/src/common/network/rest/http/HTTPLexer.cpp similarity index 100% rename from src/network/rest/http/HTTPLexer.cpp rename to src/common/network/rest/http/HTTPLexer.cpp diff --git a/src/network/rest/http/HTTPLexer.h b/src/common/network/rest/http/HTTPLexer.h similarity index 99% rename from src/network/rest/http/HTTPLexer.h rename to src/common/network/rest/http/HTTPLexer.h index c4cf1bcf..0c588694 100644 --- a/src/network/rest/http/HTTPLexer.h +++ b/src/common/network/rest/http/HTTPLexer.h @@ -37,7 +37,7 @@ #if !defined(__REST_HTTP__HTTP_LEXER_H__) #define __REST_HTTP__HTTP_LEXER_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/network/rest/http/HTTPPayload.cpp b/src/common/network/rest/http/HTTPPayload.cpp similarity index 100% rename from src/network/rest/http/HTTPPayload.cpp rename to src/common/network/rest/http/HTTPPayload.cpp diff --git a/src/network/rest/http/HTTPPayload.h b/src/common/network/rest/http/HTTPPayload.h similarity index 97% rename from src/network/rest/http/HTTPPayload.h rename to src/common/network/rest/http/HTTPPayload.h index 95db1648..49205e4a 100644 --- a/src/network/rest/http/HTTPPayload.h +++ b/src/common/network/rest/http/HTTPPayload.h @@ -37,9 +37,9 @@ #if !defined(__REST_HTTP__HTTP_REPLY_H__) #define __REST_HTTP__HTTP_REPLY_H__ -#include "Defines.h" -#include "network/json/json.h" -#include "network/rest/http/HTTPHeaders.h" +#include "common/Defines.h" +#include "common/network/json/json.h" +#include "common/network/rest/http/HTTPHeaders.h" #include #include diff --git a/src/network/rest/http/HTTPRequestHandler.cpp b/src/common/network/rest/http/HTTPRequestHandler.cpp similarity index 100% rename from src/network/rest/http/HTTPRequestHandler.cpp rename to src/common/network/rest/http/HTTPRequestHandler.cpp diff --git a/src/network/rest/http/HTTPRequestHandler.h b/src/common/network/rest/http/HTTPRequestHandler.h similarity index 99% rename from src/network/rest/http/HTTPRequestHandler.h rename to src/common/network/rest/http/HTTPRequestHandler.h index a3793f09..143bb642 100644 --- a/src/network/rest/http/HTTPRequestHandler.h +++ b/src/common/network/rest/http/HTTPRequestHandler.h @@ -37,7 +37,7 @@ #if !defined(__REST_HTTP__HTTP_REQUEST_HANDLER_H__) #define __REST_HTTP__HTTP_REQUEST_HANDLER_H__ -#include "Defines.h" +#include "common/Defines.h" #include diff --git a/src/network/rest/http/HTTPServer.h b/src/common/network/rest/http/HTTPServer.h similarity index 96% rename from src/network/rest/http/HTTPServer.h rename to src/common/network/rest/http/HTTPServer.h index 8966b8d7..051544ec 100644 --- a/src/network/rest/http/HTTPServer.h +++ b/src/common/network/rest/http/HTTPServer.h @@ -37,10 +37,10 @@ #if !defined(__REST_HTTP__HTTP_SERVER_H__) #define __REST_HTTP__HTTP_SERVER_H__ -#include "Defines.h" -#include "network/rest/http/ServerConnection.h" -#include "network/rest/http/ServerConnectionManager.h" -#include "network/rest/http/HTTPRequestHandler.h" +#include "common/Defines.h" +#include "common/network/rest/http/ServerConnection.h" +#include "common/network/rest/http/ServerConnectionManager.h" +#include "common/network/rest/http/HTTPRequestHandler.h" #include diff --git a/src/network/rest/http/ServerConnection.h b/src/common/network/rest/http/ServerConnection.h similarity index 98% rename from src/network/rest/http/ServerConnection.h rename to src/common/network/rest/http/ServerConnection.h index 107efca5..faa6e8cc 100644 --- a/src/network/rest/http/ServerConnection.h +++ b/src/common/network/rest/http/ServerConnection.h @@ -37,11 +37,11 @@ #if !defined(__REST_HTTP__SERVER_CONNECTION_H__) #define __REST_HTTP__SERVER_CONNECTION_H__ -#include "Defines.h" -#include "network/rest/http/HTTPLexer.h" -#include "network/rest/http/HTTPPayload.h" -#include "Log.h" -#include "Utils.h" +#include "common/Defines.h" +#include "common/network/rest/http/HTTPLexer.h" +#include "common/network/rest/http/HTTPPayload.h" +#include "common/Log.h" +#include "common/Utils.h" #include #include diff --git a/src/network/rest/http/ServerConnectionManager.h b/src/common/network/rest/http/ServerConnectionManager.h similarity index 99% rename from src/network/rest/http/ServerConnectionManager.h rename to src/common/network/rest/http/ServerConnectionManager.h index 379fbfaa..53d7f297 100644 --- a/src/network/rest/http/ServerConnectionManager.h +++ b/src/common/network/rest/http/ServerConnectionManager.h @@ -37,7 +37,7 @@ #if !defined(__REST_HTTP__SERVER_CONNECTION_MANAGER_H__) #define __REST_HTTP__SERVER_CONNECTION_MANAGER_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/nxdn/NXDNDefines.h b/src/common/nxdn/NXDNDefines.h similarity index 99% rename from src/nxdn/NXDNDefines.h rename to src/common/nxdn/NXDNDefines.h index 56f15cb7..e3b3c38f 100644 --- a/src/nxdn/NXDNDefines.h +++ b/src/common/nxdn/NXDNDefines.h @@ -31,7 +31,7 @@ #if !defined(__NXDN_DEFINES_H__) #define __NXDN_DEFINES_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/NXDNUtils.cpp b/src/common/nxdn/NXDNUtils.cpp similarity index 100% rename from src/nxdn/NXDNUtils.cpp rename to src/common/nxdn/NXDNUtils.cpp diff --git a/src/nxdn/NXDNUtils.h b/src/common/nxdn/NXDNUtils.h similarity index 98% rename from src/nxdn/NXDNUtils.h rename to src/common/nxdn/NXDNUtils.h index b139910b..a00dbadc 100644 --- a/src/nxdn/NXDNUtils.h +++ b/src/common/nxdn/NXDNUtils.h @@ -31,7 +31,7 @@ #if !defined(__NXDN_UTILS_H__) #define __NXDN_UTILS_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/SiteData.h b/src/common/nxdn/SiteData.h similarity index 99% rename from src/nxdn/SiteData.h rename to src/common/nxdn/SiteData.h index a73ba749..43a92e11 100644 --- a/src/nxdn/SiteData.h +++ b/src/common/nxdn/SiteData.h @@ -30,8 +30,8 @@ #if !defined(__NXDN_SITE_DATA_H__) #define __NXDN_SITE_DATA_H__ -#include "Defines.h" -#include "nxdn/NXDNDefines.h" +#include "common/Defines.h" +#include "common/nxdn/NXDNDefines.h" namespace nxdn { diff --git a/src/nxdn/Sync.cpp b/src/common/nxdn/Sync.cpp similarity index 100% rename from src/nxdn/Sync.cpp rename to src/common/nxdn/Sync.cpp diff --git a/src/nxdn/Sync.h b/src/common/nxdn/Sync.h similarity index 98% rename from src/nxdn/Sync.h rename to src/common/nxdn/Sync.h index 0ff682be..b2545571 100644 --- a/src/nxdn/Sync.h +++ b/src/common/nxdn/Sync.h @@ -30,7 +30,7 @@ #if !defined(__NXDN_SYNC_H__) #define __NXDN_SYNC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/acl/AccessControl.cpp b/src/common/nxdn/acl/AccessControl.cpp similarity index 100% rename from src/nxdn/acl/AccessControl.cpp rename to src/common/nxdn/acl/AccessControl.cpp diff --git a/src/nxdn/acl/AccessControl.h b/src/common/nxdn/acl/AccessControl.h similarity index 95% rename from src/nxdn/acl/AccessControl.h rename to src/common/nxdn/acl/AccessControl.h index db57664e..bffa0bb2 100644 --- a/src/nxdn/acl/AccessControl.h +++ b/src/common/nxdn/acl/AccessControl.h @@ -31,9 +31,9 @@ #if !defined(__NXDN_ACL__ACCESS_CONTROL_H__) #define __NXDN_ACL__ACCESS_CONTROL_H__ -#include "Defines.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" +#include "common/Defines.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" namespace nxdn { diff --git a/src/nxdn/channel/CAC.cpp b/src/common/nxdn/channel/CAC.cpp similarity index 100% rename from src/nxdn/channel/CAC.cpp rename to src/common/nxdn/channel/CAC.cpp diff --git a/src/nxdn/channel/CAC.h b/src/common/nxdn/channel/CAC.h similarity index 99% rename from src/nxdn/channel/CAC.h rename to src/common/nxdn/channel/CAC.h index 75b3d6cc..1e22a71f 100644 --- a/src/nxdn/channel/CAC.h +++ b/src/common/nxdn/channel/CAC.h @@ -30,7 +30,7 @@ #if !defined(__NXDN_CHANNEL__CAC_H__) #define __NXDN_CHANNEL__CAC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/channel/FACCH1.cpp b/src/common/nxdn/channel/FACCH1.cpp similarity index 100% rename from src/nxdn/channel/FACCH1.cpp rename to src/common/nxdn/channel/FACCH1.cpp diff --git a/src/nxdn/channel/FACCH1.h b/src/common/nxdn/channel/FACCH1.h similarity index 98% rename from src/nxdn/channel/FACCH1.h rename to src/common/nxdn/channel/FACCH1.h index ea2137c8..d9265016 100644 --- a/src/nxdn/channel/FACCH1.h +++ b/src/common/nxdn/channel/FACCH1.h @@ -30,7 +30,7 @@ #if !defined(__NXDN_CHANNEL__FACCH1_H__) #define __NXDN_CHANNEL__FACCH1_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/channel/LICH.cpp b/src/common/nxdn/channel/LICH.cpp similarity index 100% rename from src/nxdn/channel/LICH.cpp rename to src/common/nxdn/channel/LICH.cpp diff --git a/src/nxdn/channel/LICH.h b/src/common/nxdn/channel/LICH.h similarity index 99% rename from src/nxdn/channel/LICH.h rename to src/common/nxdn/channel/LICH.h index 08a9d0db..085558a4 100644 --- a/src/nxdn/channel/LICH.h +++ b/src/common/nxdn/channel/LICH.h @@ -31,7 +31,7 @@ #if !defined(__NXDN_CHANNEL__LICH_H__) #define __NXDN_CHANNEL__LICH_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/channel/SACCH.cpp b/src/common/nxdn/channel/SACCH.cpp similarity index 100% rename from src/nxdn/channel/SACCH.cpp rename to src/common/nxdn/channel/SACCH.cpp diff --git a/src/nxdn/channel/SACCH.h b/src/common/nxdn/channel/SACCH.h similarity index 99% rename from src/nxdn/channel/SACCH.h rename to src/common/nxdn/channel/SACCH.h index 5c17c608..eda8f457 100644 --- a/src/nxdn/channel/SACCH.h +++ b/src/common/nxdn/channel/SACCH.h @@ -31,7 +31,7 @@ #if !defined(__NXDN_CHANNEL__SACCH_H__) #define __NXDN_CHANNEL__SACCH_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/channel/UDCH.cpp b/src/common/nxdn/channel/UDCH.cpp similarity index 100% rename from src/nxdn/channel/UDCH.cpp rename to src/common/nxdn/channel/UDCH.cpp diff --git a/src/nxdn/channel/UDCH.h b/src/common/nxdn/channel/UDCH.h similarity index 99% rename from src/nxdn/channel/UDCH.h rename to src/common/nxdn/channel/UDCH.h index 81049685..676fe4f2 100644 --- a/src/nxdn/channel/UDCH.h +++ b/src/common/nxdn/channel/UDCH.h @@ -31,7 +31,7 @@ #if !defined(__NXDN_CHANNEL__UDCH_H__) #define __NXDN_CHANNEL__UDCH_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/edac/Convolution.cpp b/src/common/nxdn/edac/Convolution.cpp similarity index 100% rename from src/nxdn/edac/Convolution.cpp rename to src/common/nxdn/edac/Convolution.cpp diff --git a/src/nxdn/edac/Convolution.h b/src/common/nxdn/edac/Convolution.h similarity index 98% rename from src/nxdn/edac/Convolution.h rename to src/common/nxdn/edac/Convolution.h index ff10d493..3d4057e9 100644 --- a/src/nxdn/edac/Convolution.h +++ b/src/common/nxdn/edac/Convolution.h @@ -31,7 +31,7 @@ #if !defined(__NXDN_EDAC__CONVOLUTION_H__) #define __NXDN_EDAC__CONVOLUTION_H__ -#include "Defines.h" +#include "common/Defines.h" #include diff --git a/src/nxdn/lc/PacketInformation.cpp b/src/common/nxdn/lc/PacketInformation.cpp similarity index 100% rename from src/nxdn/lc/PacketInformation.cpp rename to src/common/nxdn/lc/PacketInformation.cpp diff --git a/src/nxdn/lc/PacketInformation.h b/src/common/nxdn/lc/PacketInformation.h similarity index 99% rename from src/nxdn/lc/PacketInformation.h rename to src/common/nxdn/lc/PacketInformation.h index c916126b..660322c0 100644 --- a/src/nxdn/lc/PacketInformation.h +++ b/src/common/nxdn/lc/PacketInformation.h @@ -26,7 +26,7 @@ #if !defined(__NXDN_LC__PACKET_INFORMATION_H__) #define __NXDN_LC__PACKET_INFORMATION_H__ -#include "Defines.h" +#include "common/Defines.h" namespace nxdn { diff --git a/src/nxdn/lc/RCCH.cpp b/src/common/nxdn/lc/RCCH.cpp similarity index 100% rename from src/nxdn/lc/RCCH.cpp rename to src/common/nxdn/lc/RCCH.cpp diff --git a/src/nxdn/lc/RCCH.h b/src/common/nxdn/lc/RCCH.h similarity index 97% rename from src/nxdn/lc/RCCH.h rename to src/common/nxdn/lc/RCCH.h index c8b8e6a1..4d42f102 100644 --- a/src/nxdn/lc/RCCH.h +++ b/src/common/nxdn/lc/RCCH.h @@ -30,10 +30,10 @@ #if !defined(__NXDN_LC__RCCH_H__) #define __NXDN_LC__RCCH_H__ -#include "Defines.h" -#include "nxdn/lc/PacketInformation.h" -#include "nxdn/SiteData.h" -#include "lookups/IdenTableLookup.h" +#include "common/Defines.h" +#include "common/nxdn/lc/PacketInformation.h" +#include "common/nxdn/SiteData.h" +#include "common/lookups/IdenTableLookup.h" namespace nxdn { diff --git a/src/nxdn/lc/RTCH.cpp b/src/common/nxdn/lc/RTCH.cpp similarity index 100% rename from src/nxdn/lc/RTCH.cpp rename to src/common/nxdn/lc/RTCH.cpp diff --git a/src/nxdn/lc/RTCH.h b/src/common/nxdn/lc/RTCH.h similarity index 98% rename from src/nxdn/lc/RTCH.h rename to src/common/nxdn/lc/RTCH.h index 23a5c8cf..d387598c 100644 --- a/src/nxdn/lc/RTCH.h +++ b/src/common/nxdn/lc/RTCH.h @@ -31,8 +31,8 @@ #if !defined(__NXDN_LC__RTCH_H__) #define __NXDN_LC__RTCH_H__ -#include "Defines.h" -#include "nxdn/lc/PacketInformation.h" +#include "common/Defines.h" +#include "common/nxdn/lc/PacketInformation.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h index c8895eb6..7d5e9909 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_DCALL_HDR_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_DCALL_HDR_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h index e17a79e8..15bbe9b8 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_DST_ID_INFO_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_DST_ID_INFO_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h index 0c3904d8..cab66b47 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_GRP_REG_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_GRP_REG_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h index 6230735e..8ed2f06b 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_IDLE_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_IDLE_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_REG.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h index 3f849ffc..1272472f 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_REG_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_REG_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h index f16fb12d..bfe43966 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_REG_C_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_REG_C_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h index 786d3737..fffe5aa0 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_REG_COMM_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_REG_COMM_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h similarity index 98% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h index 8c0b9407..5acc7dd3 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_SITE_INFO_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_SITE_INFO_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h index 45adaea7..18f299ae 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_SRV_INFO_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_SRV_INFO_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h index fd150667..530f7a93 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_VCALL_ASSGN_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_VCALL_ASSGN_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp similarity index 100% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp diff --git a/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h similarity index 97% rename from src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h rename to src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h index 868a34bb..b363ecf6 100644 --- a/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h +++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h @@ -26,8 +26,8 @@ #if !defined(__NXDN_LC_RCCH__MESSAGE_TYPE_VCALL_CONN_H__) #define __NXDN_LC_RCCH__MESSAGE_TYPE_VCALL_CONN_H__ -#include "Defines.h" -#include "nxdn/lc/RCCH.h" +#include "common/Defines.h" +#include "common/nxdn/lc/RCCH.h" namespace nxdn { diff --git a/src/nxdn/lc/rcch/RCCHFactory.cpp b/src/common/nxdn/lc/rcch/RCCHFactory.cpp similarity index 100% rename from src/nxdn/lc/rcch/RCCHFactory.cpp rename to src/common/nxdn/lc/rcch/RCCHFactory.cpp diff --git a/src/nxdn/lc/rcch/RCCHFactory.h b/src/common/nxdn/lc/rcch/RCCHFactory.h similarity index 76% rename from src/nxdn/lc/rcch/RCCHFactory.h rename to src/common/nxdn/lc/rcch/RCCHFactory.h index 0dd83549..fc71cc5e 100644 --- a/src/nxdn/lc/rcch/RCCHFactory.h +++ b/src/common/nxdn/lc/rcch/RCCHFactory.h @@ -26,20 +26,20 @@ #if !defined(__NXDN_LC__RCCH_FACTORY_H__) #define __NXDN_LC__RCCH_FACTORY_H__ -#include "Defines.h" +#include "common/Defines.h" -#include "nxdn/lc/RCCH.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_REG.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h" -#include "nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h" +#include "common/nxdn/lc/RCCH.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h" +#include "common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h" namespace nxdn { diff --git a/src/p25/Audio.cpp b/src/common/p25/Audio.cpp similarity index 100% rename from src/p25/Audio.cpp rename to src/common/p25/Audio.cpp diff --git a/src/p25/Audio.h b/src/common/p25/Audio.h similarity index 97% rename from src/p25/Audio.h rename to src/common/p25/Audio.h index 45ae363e..ab063573 100644 --- a/src/p25/Audio.h +++ b/src/common/p25/Audio.h @@ -30,8 +30,8 @@ #if !defined(__P25_AUDIO_H__) #define __P25_AUDIO_H__ -#include "Defines.h" -#include "edac/AMBEFEC.h" +#include "common/Defines.h" +#include "common/edac/AMBEFEC.h" namespace p25 { diff --git a/src/p25/NID.cpp b/src/common/p25/NID.cpp similarity index 100% rename from src/p25/NID.cpp rename to src/common/p25/NID.cpp diff --git a/src/p25/NID.h b/src/common/p25/NID.h similarity index 98% rename from src/p25/NID.h rename to src/common/p25/NID.h index 3261d662..794c95a3 100644 --- a/src/p25/NID.h +++ b/src/common/p25/NID.h @@ -31,7 +31,7 @@ #if !defined(__P25_NID_H__) #define __P25_NID_H__ -#include "Defines.h" +#include "common/Defines.h" namespace p25 { diff --git a/src/p25/P25Defines.h b/src/common/p25/P25Defines.h similarity index 99% rename from src/p25/P25Defines.h rename to src/common/p25/P25Defines.h index 9d686d56..769dd8f2 100644 --- a/src/p25/P25Defines.h +++ b/src/common/p25/P25Defines.h @@ -31,7 +31,7 @@ #if !defined(__P25_DEFINES_H__) #define __P25_DEFINES_H__ -#include "Defines.h" +#include "common/Defines.h" namespace p25 { diff --git a/src/p25/P25Utils.cpp b/src/common/p25/P25Utils.cpp similarity index 100% rename from src/p25/P25Utils.cpp rename to src/common/p25/P25Utils.cpp diff --git a/src/p25/P25Utils.h b/src/common/p25/P25Utils.h similarity index 99% rename from src/p25/P25Utils.h rename to src/common/p25/P25Utils.h index e20d221b..00dfc023 100644 --- a/src/p25/P25Utils.h +++ b/src/common/p25/P25Utils.h @@ -31,7 +31,7 @@ #if !defined(__P25_UTILS_H__) #define __P25_UTILS_H__ -#include "Defines.h" +#include "common/Defines.h" namespace p25 { diff --git a/src/p25/SiteData.h b/src/common/p25/SiteData.h similarity index 99% rename from src/p25/SiteData.h rename to src/common/p25/SiteData.h index bfb3059d..1977cb1d 100644 --- a/src/p25/SiteData.h +++ b/src/common/p25/SiteData.h @@ -26,9 +26,9 @@ #if !defined(__P25_SITE_DATA_H__) #define __P25_SITE_DATA_H__ -#include "Defines.h" -#include "p25/P25Defines.h" -#include "p25/P25Utils.h" +#include "common/Defines.h" +#include "common/p25/P25Defines.h" +#include "common/p25/P25Utils.h" #include diff --git a/src/p25/Sync.cpp b/src/common/p25/Sync.cpp similarity index 100% rename from src/p25/Sync.cpp rename to src/common/p25/Sync.cpp diff --git a/src/p25/Sync.h b/src/common/p25/Sync.h similarity index 98% rename from src/p25/Sync.h rename to src/common/p25/Sync.h index c056b485..d5896db7 100644 --- a/src/p25/Sync.h +++ b/src/common/p25/Sync.h @@ -30,7 +30,7 @@ #if !defined(__P25_SYNC_H__) #define __P25_SYNC_H__ -#include "Defines.h" +#include "common/Defines.h" namespace p25 { diff --git a/src/p25/acl/AccessControl.cpp b/src/common/p25/acl/AccessControl.cpp similarity index 100% rename from src/p25/acl/AccessControl.cpp rename to src/common/p25/acl/AccessControl.cpp diff --git a/src/p25/acl/AccessControl.h b/src/common/p25/acl/AccessControl.h similarity index 95% rename from src/p25/acl/AccessControl.h rename to src/common/p25/acl/AccessControl.h index 81e62c1c..09a804e8 100644 --- a/src/p25/acl/AccessControl.h +++ b/src/common/p25/acl/AccessControl.h @@ -31,9 +31,9 @@ #if !defined(__P25_ACL__ACCESS_CONTROL_H__) #define __P25_ACL__ACCESS_CONTROL_H__ -#include "Defines.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" +#include "common/Defines.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" namespace p25 { diff --git a/src/p25/data/DataBlock.cpp b/src/common/p25/data/DataBlock.cpp similarity index 100% rename from src/p25/data/DataBlock.cpp rename to src/common/p25/data/DataBlock.cpp diff --git a/src/p25/data/DataBlock.h b/src/common/p25/data/DataBlock.h similarity index 96% rename from src/p25/data/DataBlock.h rename to src/common/p25/data/DataBlock.h index 42abc70a..6cfdddcd 100644 --- a/src/p25/data/DataBlock.h +++ b/src/common/p25/data/DataBlock.h @@ -26,9 +26,9 @@ #if !defined(__P25_DATA__DATA_BLOCK_H__) #define __P25_DATA__DATA_BLOCK_H__ -#include "Defines.h" -#include "p25/data/DataHeader.h" -#include "edac/Trellis.h" +#include "common/Defines.h" +#include "common/p25/data/DataHeader.h" +#include "common/edac/Trellis.h" #include diff --git a/src/p25/data/DataHeader.cpp b/src/common/p25/data/DataHeader.cpp similarity index 100% rename from src/p25/data/DataHeader.cpp rename to src/common/p25/data/DataHeader.cpp diff --git a/src/p25/data/DataHeader.h b/src/common/p25/data/DataHeader.h similarity index 98% rename from src/p25/data/DataHeader.h rename to src/common/p25/data/DataHeader.h index 42aab9ac..a0d94811 100644 --- a/src/p25/data/DataHeader.h +++ b/src/common/p25/data/DataHeader.h @@ -26,8 +26,8 @@ #if !defined(__P25_DATA__DATA_HEADER_H__) #define __P25_DATA__DATA_HEADER_H__ -#include "Defines.h" -#include "edac/Trellis.h" +#include "common/Defines.h" +#include "common/edac/Trellis.h" #include diff --git a/src/p25/data/LowSpeedData.cpp b/src/common/p25/data/LowSpeedData.cpp similarity index 100% rename from src/p25/data/LowSpeedData.cpp rename to src/common/p25/data/LowSpeedData.cpp diff --git a/src/p25/data/LowSpeedData.h b/src/common/p25/data/LowSpeedData.h similarity index 98% rename from src/p25/data/LowSpeedData.h rename to src/common/p25/data/LowSpeedData.h index 09c5b8c0..52096ac1 100644 --- a/src/p25/data/LowSpeedData.h +++ b/src/common/p25/data/LowSpeedData.h @@ -31,7 +31,7 @@ #if !defined(__P25_DATA__LOW_SPEED_DATA_H__) #define __P25_DATA__LOW_SPEED_DATA_H__ -#include "Defines.h" +#include "common/Defines.h" namespace p25 { diff --git a/src/p25/dfsi/DFSIDefines.h b/src/common/p25/dfsi/DFSIDefines.h similarity index 99% rename from src/p25/dfsi/DFSIDefines.h rename to src/common/p25/dfsi/DFSIDefines.h index e5091830..dcbbd58a 100644 --- a/src/p25/dfsi/DFSIDefines.h +++ b/src/common/p25/dfsi/DFSIDefines.h @@ -26,7 +26,7 @@ #if !defined(__P25_DFSI_DEFINES_H__) #define __P25_DFSI_DEFINES_H__ -#include "Defines.h" +#include "common/Defines.h" // Frame Type String(s) #define P25_DFSI_SS_STR "P25_DFSI_START_STOP (Start/Stop)" diff --git a/src/p25/dfsi/LC.cpp b/src/common/p25/dfsi/LC.cpp similarity index 100% rename from src/p25/dfsi/LC.cpp rename to src/common/p25/dfsi/LC.cpp diff --git a/src/p25/dfsi/LC.h b/src/common/p25/dfsi/LC.h similarity index 95% rename from src/p25/dfsi/LC.h rename to src/common/p25/dfsi/LC.h index 5cb176ef..05dab202 100644 --- a/src/p25/dfsi/LC.h +++ b/src/common/p25/dfsi/LC.h @@ -26,11 +26,11 @@ #if !defined(__P25_DFSI__LC_H__) #define __P25_DFSI__LC_H__ -#include "Defines.h" -#include "p25/data/LowSpeedData.h" -#include "p25/lc/LC.h" -#include "p25/lc/TSBK.h" -#include "edac/RS634717.h" +#include "common/Defines.h" +#include "common/p25/data/LowSpeedData.h" +#include "common/p25/lc/LC.h" +#include "common/p25/lc/TSBK.h" +#include "common/edac/RS634717.h" #include diff --git a/src/p25/lc/AMBT.cpp b/src/common/p25/lc/AMBT.cpp similarity index 99% rename from src/p25/lc/AMBT.cpp rename to src/common/p25/lc/AMBT.cpp index cbd1098c..a8139e47 100644 --- a/src/p25/lc/AMBT.cpp +++ b/src/common/p25/lc/AMBT.cpp @@ -27,7 +27,6 @@ #include "p25/P25Defines.h" #include "p25/lc/AMBT.h" #include "edac/CRC.h" -#include "HostMain.h" #include "Log.h" #include "Utils.h" diff --git a/src/p25/lc/AMBT.h b/src/common/p25/lc/AMBT.h similarity index 95% rename from src/p25/lc/AMBT.h rename to src/common/p25/lc/AMBT.h index 05a9afbd..ca01ef6d 100644 --- a/src/p25/lc/AMBT.h +++ b/src/common/p25/lc/AMBT.h @@ -26,10 +26,10 @@ #if !defined(__P25_LC__AMBT_H__) #define __P25_LC__AMBT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" -#include "p25/data/DataHeader.h" -#include "p25/data/DataBlock.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" +#include "common/p25/data/DataHeader.h" +#include "common/p25/data/DataBlock.h" namespace p25 { diff --git a/src/p25/lc/LC.cpp b/src/common/p25/lc/LC.cpp similarity index 100% rename from src/p25/lc/LC.cpp rename to src/common/p25/lc/LC.cpp diff --git a/src/p25/lc/LC.h b/src/common/p25/lc/LC.h similarity index 97% rename from src/p25/lc/LC.h rename to src/common/p25/lc/LC.h index 38e08ed8..edcbc6ea 100644 --- a/src/p25/lc/LC.h +++ b/src/common/p25/lc/LC.h @@ -31,11 +31,11 @@ #if !defined(__P25_LC__LC_H__) #define __P25_LC__LC_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" -#include "p25/lc/TDULC.h" -#include "p25/SiteData.h" -#include "edac/RS634717.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" +#include "common/p25/lc/TDULC.h" +#include "common/p25/SiteData.h" +#include "common/edac/RS634717.h" #include diff --git a/src/p25/lc/TDULC.cpp b/src/common/p25/lc/TDULC.cpp similarity index 100% rename from src/p25/lc/TDULC.cpp rename to src/common/p25/lc/TDULC.cpp diff --git a/src/p25/lc/TDULC.h b/src/common/p25/lc/TDULC.h similarity index 95% rename from src/p25/lc/TDULC.h rename to src/common/p25/lc/TDULC.h index 7b7a4740..92598720 100644 --- a/src/p25/lc/TDULC.h +++ b/src/common/p25/lc/TDULC.h @@ -26,13 +26,13 @@ #if !defined(__P25_LC__TDULC_H__) #define __P25_LC__TDULC_H__ -#include "Defines.h" -#include "p25/P25Defines.h" -#include "p25/lc/LC.h" -#include "p25/lc/TSBK.h" -#include "p25/SiteData.h" -#include "edac/RS634717.h" -#include "lookups/IdenTableLookup.h" +#include "common/Defines.h" +#include "common/p25/P25Defines.h" +#include "common/p25/lc/LC.h" +#include "common/p25/lc/TSBK.h" +#include "common/p25/SiteData.h" +#include "common/edac/RS634717.h" +#include "common/lookups/IdenTableLookup.h" #include diff --git a/src/p25/lc/TSBK.cpp b/src/common/p25/lc/TSBK.cpp similarity index 100% rename from src/p25/lc/TSBK.cpp rename to src/common/p25/lc/TSBK.cpp diff --git a/src/p25/lc/TSBK.h b/src/common/p25/lc/TSBK.h similarity index 96% rename from src/p25/lc/TSBK.h rename to src/common/p25/lc/TSBK.h index d6bf5190..3e0510e2 100644 --- a/src/p25/lc/TSBK.h +++ b/src/common/p25/lc/TSBK.h @@ -26,13 +26,13 @@ #if !defined(__P25_LC__TSBK_H__) #define __P25_LC__TSBK_H__ -#include "Defines.h" -#include "edac/Trellis.h" -#include "p25/lc/LC.h" -#include "p25/lc/TDULC.h" -#include "p25/SiteData.h" -#include "edac/RS634717.h" -#include "lookups/IdenTableLookup.h" +#include "common/Defines.h" +#include "common/edac/Trellis.h" +#include "common/p25/lc/LC.h" +#include "common/p25/lc/TDULC.h" +#include "common/p25/SiteData.h" +#include "common/edac/RS634717.h" +#include "common/lookups/IdenTableLookup.h" #include diff --git a/src/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp rename to src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp diff --git a/src/p25/lc/tdulc/LC_ADJ_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h similarity index 98% rename from src/p25/lc/tdulc/LC_ADJ_STS_BCAST.h rename to src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h index 0caa673f..a33281e1 100644 --- a/src/p25/lc/tdulc/LC_ADJ_STS_BCAST.h +++ b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_ADJ_STS_BCAST_H__) #define __P25_LC_TSBK__LC_ADJ_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_CALL_TERM.cpp b/src/common/p25/lc/tdulc/LC_CALL_TERM.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_CALL_TERM.cpp rename to src/common/p25/lc/tdulc/LC_CALL_TERM.cpp diff --git a/src/p25/lc/tdulc/LC_CALL_TERM.h b/src/common/p25/lc/tdulc/LC_CALL_TERM.h similarity index 97% rename from src/p25/lc/tdulc/LC_CALL_TERM.h rename to src/common/p25/lc/tdulc/LC_CALL_TERM.h index 15f9753e..ea0664c2 100644 --- a/src/p25/lc/tdulc/LC_CALL_TERM.h +++ b/src/common/p25/lc/tdulc/LC_CALL_TERM.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_CALL_TERM_H__) #define __P25_LC_TSBK__LC_CALL_TERM_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_CONV_FALLBACK.cpp b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_CONV_FALLBACK.cpp rename to src/common/p25/lc/tdulc/LC_CONV_FALLBACK.cpp diff --git a/src/p25/lc/tdulc/LC_CONV_FALLBACK.h b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h similarity index 97% rename from src/p25/lc/tdulc/LC_CONV_FALLBACK.h rename to src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h index 9c011a18..24c33734 100644 --- a/src/p25/lc/tdulc/LC_CONV_FALLBACK.h +++ b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_CONV_FALLBACK_H__) #define __P25_LC_TSBK__LC_CONV_FALLBACK_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_FAILSOFT.cpp b/src/common/p25/lc/tdulc/LC_FAILSOFT.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_FAILSOFT.cpp rename to src/common/p25/lc/tdulc/LC_FAILSOFT.cpp diff --git a/src/p25/lc/tdulc/LC_FAILSOFT.h b/src/common/p25/lc/tdulc/LC_FAILSOFT.h similarity index 97% rename from src/p25/lc/tdulc/LC_FAILSOFT.h rename to src/common/p25/lc/tdulc/LC_FAILSOFT.h index 5d06a86f..a3adbb10 100644 --- a/src/p25/lc/tdulc/LC_FAILSOFT.h +++ b/src/common/p25/lc/tdulc/LC_FAILSOFT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_FAILSOFT_H__) #define __P25_LC_TSBK__LC_FAILSOFT_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_GROUP.cpp b/src/common/p25/lc/tdulc/LC_GROUP.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_GROUP.cpp rename to src/common/p25/lc/tdulc/LC_GROUP.cpp diff --git a/src/p25/lc/tdulc/LC_GROUP.h b/src/common/p25/lc/tdulc/LC_GROUP.h similarity index 97% rename from src/p25/lc/tdulc/LC_GROUP.h rename to src/common/p25/lc/tdulc/LC_GROUP.h index cc5769cb..ee36ecca 100644 --- a/src/p25/lc/tdulc/LC_GROUP.h +++ b/src/common/p25/lc/tdulc/LC_GROUP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_GROUP_H__) #define __P25_LC_TSBK__LC_GROUP_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_GROUP_UPDT.cpp b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_GROUP_UPDT.cpp rename to src/common/p25/lc/tdulc/LC_GROUP_UPDT.cpp diff --git a/src/p25/lc/tdulc/LC_GROUP_UPDT.h b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h similarity index 97% rename from src/p25/lc/tdulc/LC_GROUP_UPDT.h rename to src/common/p25/lc/tdulc/LC_GROUP_UPDT.h index d23b5835..52c34fe7 100644 --- a/src/p25/lc/tdulc/LC_GROUP_UPDT.h +++ b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_GROUP_UPDT_H__) #define __P25_LC_TSBK__LC_GROUP_UPDT_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_IDEN_UP.cpp b/src/common/p25/lc/tdulc/LC_IDEN_UP.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_IDEN_UP.cpp rename to src/common/p25/lc/tdulc/LC_IDEN_UP.cpp diff --git a/src/p25/lc/tdulc/LC_IDEN_UP.h b/src/common/p25/lc/tdulc/LC_IDEN_UP.h similarity index 97% rename from src/p25/lc/tdulc/LC_IDEN_UP.h rename to src/common/p25/lc/tdulc/LC_IDEN_UP.h index e6f71df2..b944f649 100644 --- a/src/p25/lc/tdulc/LC_IDEN_UP.h +++ b/src/common/p25/lc/tdulc/LC_IDEN_UP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_IDEN_UP_H__) #define __P25_LC_TSBK__LC_IDEN_UP_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_NET_STS_BCAST.cpp b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_NET_STS_BCAST.cpp rename to src/common/p25/lc/tdulc/LC_NET_STS_BCAST.cpp diff --git a/src/p25/lc/tdulc/LC_NET_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h similarity index 97% rename from src/p25/lc/tdulc/LC_NET_STS_BCAST.h rename to src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h index 6bbfdbdb..ae239c4d 100644 --- a/src/p25/lc/tdulc/LC_NET_STS_BCAST.h +++ b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_NET_STS_BCAST_H__) #define __P25_LC_TSBK__LC_NET_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_PRIVATE.cpp b/src/common/p25/lc/tdulc/LC_PRIVATE.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_PRIVATE.cpp rename to src/common/p25/lc/tdulc/LC_PRIVATE.cpp diff --git a/src/p25/lc/tdulc/LC_PRIVATE.h b/src/common/p25/lc/tdulc/LC_PRIVATE.h similarity index 97% rename from src/p25/lc/tdulc/LC_PRIVATE.h rename to src/common/p25/lc/tdulc/LC_PRIVATE.h index 0de38d96..5f41bfc5 100644 --- a/src/p25/lc/tdulc/LC_PRIVATE.h +++ b/src/common/p25/lc/tdulc/LC_PRIVATE.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_PRIVATE_H__) #define __P25_LC_TSBK__LC_PRIVATE_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp rename to src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp diff --git a/src/p25/lc/tdulc/LC_RFSS_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h similarity index 97% rename from src/p25/lc/tdulc/LC_RFSS_STS_BCAST.h rename to src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h index 023522a6..051db5e7 100644 --- a/src/p25/lc/tdulc/LC_RFSS_STS_BCAST.h +++ b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_RFSS_STS_BCAST_H__) #define __P25_LC_TSBK__LC_RFSS_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp rename to src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp diff --git a/src/p25/lc/tdulc/LC_SYS_SRV_BCAST.h b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h similarity index 97% rename from src/p25/lc/tdulc/LC_SYS_SRV_BCAST.h rename to src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h index 2879df8a..abdae0f7 100644 --- a/src/p25/lc/tdulc/LC_SYS_SRV_BCAST.h +++ b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_SYS_SRV_BCAST_H__) #define __P25_LC_TSBK__LC_SYS_SRV_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp similarity index 100% rename from src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp rename to src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp diff --git a/src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h similarity index 97% rename from src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h rename to src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h index 18ab0850..497fefba 100644 --- a/src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h +++ b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__LC_TEL_INT_VCH_USER_H__) #define __P25_LC_TSBK__LC_TEL_INT_VCH_USER_H__ -#include "Defines.h" -#include "p25/lc/TDULC.h" +#include "common/Defines.h" +#include "common/p25/lc/TDULC.h" namespace p25 { diff --git a/src/p25/lc/tdulc/TDULCFactory.cpp b/src/common/p25/lc/tdulc/TDULCFactory.cpp similarity index 100% rename from src/p25/lc/tdulc/TDULCFactory.cpp rename to src/common/p25/lc/tdulc/TDULCFactory.cpp diff --git a/src/p25/lc/tdulc/TDULCFactory.h b/src/common/p25/lc/tdulc/TDULCFactory.h similarity index 76% rename from src/p25/lc/tdulc/TDULCFactory.h rename to src/common/p25/lc/tdulc/TDULCFactory.h index ac193038..8c6cc6fd 100644 --- a/src/p25/lc/tdulc/TDULCFactory.h +++ b/src/common/p25/lc/tdulc/TDULCFactory.h @@ -26,23 +26,23 @@ #if !defined(__P25_LC__TDULC_FACTORY_H__) #define __P25_LC__TDULC_FACTORY_H__ -#include "Defines.h" -#include "edac/RS634717.h" +#include "common/Defines.h" +#include "common/edac/RS634717.h" -#include "p25/lc/TDULC.h" -#include "p25/lc/tdulc/LC_ADJ_STS_BCAST.h" -#include "p25/lc/tdulc/LC_CALL_TERM.h" -#include "p25/lc/tdulc/LC_CONV_FALLBACK.h" -#include "p25/lc/tdulc/LC_GROUP_UPDT.h" -#include "p25/lc/tdulc/LC_GROUP.h" -#include "p25/lc/tdulc/LC_IDEN_UP.h" -#include "p25/lc/tdulc/LC_NET_STS_BCAST.h" -#include "p25/lc/tdulc/LC_PRIVATE.h" -#include "p25/lc/tdulc/LC_RFSS_STS_BCAST.h" -#include "p25/lc/tdulc/LC_SYS_SRV_BCAST.h" -#include "p25/lc/tdulc/LC_TEL_INT_VCH_USER.h" +#include "common/p25/lc/TDULC.h" +#include "common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h" +#include "common/p25/lc/tdulc/LC_CALL_TERM.h" +#include "common/p25/lc/tdulc/LC_CONV_FALLBACK.h" +#include "common/p25/lc/tdulc/LC_GROUP_UPDT.h" +#include "common/p25/lc/tdulc/LC_GROUP.h" +#include "common/p25/lc/tdulc/LC_IDEN_UP.h" +#include "common/p25/lc/tdulc/LC_NET_STS_BCAST.h" +#include "common/p25/lc/tdulc/LC_PRIVATE.h" +#include "common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h" +#include "common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h" +#include "common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h" -#include "p25/lc/tdulc/LC_FAILSOFT.h" +#include "common/p25/lc/tdulc/LC_FAILSOFT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_ACK_RSP.cpp b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_ACK_RSP.cpp rename to src/common/p25/lc/tsbk/IOSP_ACK_RSP.cpp diff --git a/src/p25/lc/tsbk/IOSP_ACK_RSP.h b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_ACK_RSP.h rename to src/common/p25/lc/tsbk/IOSP_ACK_RSP.h index 8741d12e..9598dfa2 100644 --- a/src/p25/lc/tsbk/IOSP_ACK_RSP.h +++ b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_ACK_RSP_H__) #define __P25_LC_TSBK__IOSP_ACK_RSP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_CALL_ALRT.cpp b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_CALL_ALRT.cpp rename to src/common/p25/lc/tsbk/IOSP_CALL_ALRT.cpp diff --git a/src/p25/lc/tsbk/IOSP_CALL_ALRT.h b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_CALL_ALRT.h rename to src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h index ea4d6dde..2854ae96 100644 --- a/src/p25/lc/tsbk/IOSP_CALL_ALRT.h +++ b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_CALL_ALRT_H__) #define __P25_LC_TSBK__IOSP_CALL_ALRT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_EXT_FNCT.cpp b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_EXT_FNCT.cpp rename to src/common/p25/lc/tsbk/IOSP_EXT_FNCT.cpp diff --git a/src/p25/lc/tsbk/IOSP_EXT_FNCT.h b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_EXT_FNCT.h rename to src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h index dc8f54d3..2a4fcd9b 100644 --- a/src/p25/lc/tsbk/IOSP_EXT_FNCT.h +++ b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_EXT_FNCT_H__) #define __P25_LC_TSBK__IOSP_EXT_FNCT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_GRP_AFF.cpp b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_GRP_AFF.cpp rename to src/common/p25/lc/tsbk/IOSP_GRP_AFF.cpp diff --git a/src/p25/lc/tsbk/IOSP_GRP_AFF.h b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_GRP_AFF.h rename to src/common/p25/lc/tsbk/IOSP_GRP_AFF.h index e93d8924..c9d81d75 100644 --- a/src/p25/lc/tsbk/IOSP_GRP_AFF.h +++ b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_GRP_AFF_H__) #define __P25_LC_TSBK__IOSP_GRP_AFF_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_GRP_VCH.cpp b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_GRP_VCH.cpp rename to src/common/p25/lc/tsbk/IOSP_GRP_VCH.cpp diff --git a/src/p25/lc/tsbk/IOSP_GRP_VCH.h b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_GRP_VCH.h rename to src/common/p25/lc/tsbk/IOSP_GRP_VCH.h index c041bc35..7ed59380 100644 --- a/src/p25/lc/tsbk/IOSP_GRP_VCH.h +++ b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_GRP_VCH_H__) #define __P25_LC_TSBK__IOSP_GRP_VCH_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_MSG_UPDT.cpp b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_MSG_UPDT.cpp rename to src/common/p25/lc/tsbk/IOSP_MSG_UPDT.cpp diff --git a/src/p25/lc/tsbk/IOSP_MSG_UPDT.h b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_MSG_UPDT.h rename to src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h index cdc3491b..d4ac5e30 100644 --- a/src/p25/lc/tsbk/IOSP_MSG_UPDT.h +++ b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_MSG_UPDT_H__) #define __P25_LC_TSBK__IOSP_MSG_UPDT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_RAD_MON.cpp b/src/common/p25/lc/tsbk/IOSP_RAD_MON.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_RAD_MON.cpp rename to src/common/p25/lc/tsbk/IOSP_RAD_MON.cpp diff --git a/src/p25/lc/tsbk/IOSP_RAD_MON.h b/src/common/p25/lc/tsbk/IOSP_RAD_MON.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_RAD_MON.h rename to src/common/p25/lc/tsbk/IOSP_RAD_MON.h index 166dfae6..4df24653 100644 --- a/src/p25/lc/tsbk/IOSP_RAD_MON.h +++ b/src/common/p25/lc/tsbk/IOSP_RAD_MON.h @@ -27,8 +27,8 @@ #if !defined(__P25_LC_TSBK__IOSP_RAD_MON_H__) #define __P25_LC_TSBK__IOSP_RAD_MON_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_STS_UPDT.cpp b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_STS_UPDT.cpp rename to src/common/p25/lc/tsbk/IOSP_STS_UPDT.cpp diff --git a/src/p25/lc/tsbk/IOSP_STS_UPDT.h b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_STS_UPDT.h rename to src/common/p25/lc/tsbk/IOSP_STS_UPDT.h index 2b472ba3..ac478d3b 100644 --- a/src/p25/lc/tsbk/IOSP_STS_UPDT.h +++ b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_STS_UPDT_H__) #define __P25_LC_TSBK__IOSP_STS_UPDT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_UU_ANS.cpp b/src/common/p25/lc/tsbk/IOSP_UU_ANS.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_UU_ANS.cpp rename to src/common/p25/lc/tsbk/IOSP_UU_ANS.cpp diff --git a/src/p25/lc/tsbk/IOSP_UU_ANS.h b/src/common/p25/lc/tsbk/IOSP_UU_ANS.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_UU_ANS.h rename to src/common/p25/lc/tsbk/IOSP_UU_ANS.h index a6e313dd..2ef37741 100644 --- a/src/p25/lc/tsbk/IOSP_UU_ANS.h +++ b/src/common/p25/lc/tsbk/IOSP_UU_ANS.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_UU_ANS_H__) #define __P25_LC_TSBK__IOSP_UU_ANS_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_UU_VCH.cpp b/src/common/p25/lc/tsbk/IOSP_UU_VCH.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_UU_VCH.cpp rename to src/common/p25/lc/tsbk/IOSP_UU_VCH.cpp diff --git a/src/p25/lc/tsbk/IOSP_UU_VCH.h b/src/common/p25/lc/tsbk/IOSP_UU_VCH.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_UU_VCH.h rename to src/common/p25/lc/tsbk/IOSP_UU_VCH.h index 6f778f8d..e35b9c5f 100644 --- a/src/p25/lc/tsbk/IOSP_UU_VCH.h +++ b/src/common/p25/lc/tsbk/IOSP_UU_VCH.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_UU_VCH_H__) #define __P25_LC_TSBK__IOSP_UU_VCH_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/IOSP_U_REG.cpp b/src/common/p25/lc/tsbk/IOSP_U_REG.cpp similarity index 100% rename from src/p25/lc/tsbk/IOSP_U_REG.cpp rename to src/common/p25/lc/tsbk/IOSP_U_REG.cpp diff --git a/src/p25/lc/tsbk/IOSP_U_REG.h b/src/common/p25/lc/tsbk/IOSP_U_REG.h similarity index 97% rename from src/p25/lc/tsbk/IOSP_U_REG.h rename to src/common/p25/lc/tsbk/IOSP_U_REG.h index 051f0c65..0d1fd2aa 100644 --- a/src/p25/lc/tsbk/IOSP_U_REG.h +++ b/src/common/p25/lc/tsbk/IOSP_U_REG.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__IOSP_U_REG_H__) #define __P25_LC_TSBK__IOSP_U_REG_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp rename to src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp diff --git a/src/p25/lc/tsbk/ISP_AUTH_FNE_RST.h b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h similarity index 97% rename from src/p25/lc/tsbk/ISP_AUTH_FNE_RST.h rename to src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h index 05ea2c80..64f4ed08 100644 --- a/src/p25/lc/tsbk/ISP_AUTH_FNE_RST.h +++ b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_AUTH_FNE_RST_H__) #define __P25_LC_TSBK__ISP_AUTH_FNE_RST_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_AUTH_RESP.cpp b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_AUTH_RESP.cpp rename to src/common/p25/lc/tsbk/ISP_AUTH_RESP.cpp diff --git a/src/p25/lc/tsbk/ISP_AUTH_RESP.h b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h similarity index 97% rename from src/p25/lc/tsbk/ISP_AUTH_RESP.h rename to src/common/p25/lc/tsbk/ISP_AUTH_RESP.h index d4a8bd2d..f81dae40 100644 --- a/src/p25/lc/tsbk/ISP_AUTH_RESP.h +++ b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_AUTH_RESP_H__) #define __P25_LC_TSBK__ISP_AUTH_RESP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp rename to src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp diff --git a/src/p25/lc/tsbk/ISP_AUTH_SU_DMD.h b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h similarity index 97% rename from src/p25/lc/tsbk/ISP_AUTH_SU_DMD.h rename to src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h index 79038469..4e11b842 100644 --- a/src/p25/lc/tsbk/ISP_AUTH_SU_DMD.h +++ b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_AUTH_SU_DMD_H__) #define __P25_LC_TSBK__ISP_AUTH_SU_DMD_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp rename to src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp diff --git a/src/p25/lc/tsbk/ISP_CAN_SRV_REQ.h b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h similarity index 97% rename from src/p25/lc/tsbk/ISP_CAN_SRV_REQ.h rename to src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h index 372f8305..378bb594 100644 --- a/src/p25/lc/tsbk/ISP_CAN_SRV_REQ.h +++ b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_CAN_SRV_REQ_H__) #define __P25_LC_TSBK__ISP_CAN_SRV_REQ_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp rename to src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp diff --git a/src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h similarity index 97% rename from src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h rename to src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h index 8c0404d4..5df034b4 100644 --- a/src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h +++ b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_EMERG_ALRM_REQ_H__) #define __P25_LC_TSBK__ISP_EMERG_ALRM_REQ_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp rename to src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp diff --git a/src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h similarity index 97% rename from src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h rename to src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h index 9a36f6d6..a84c1d57 100644 --- a/src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h +++ b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_GRP_AFF_Q_RSP_H__) #define __P25_LC_TSBK__ISP_GRP_AFF_Q_RSP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp rename to src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp diff --git a/src/p25/lc/tsbk/ISP_LOC_REG_REQ.h b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h similarity index 97% rename from src/p25/lc/tsbk/ISP_LOC_REG_REQ.h rename to src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h index 5a6e9c2e..7030de70 100644 --- a/src/p25/lc/tsbk/ISP_LOC_REG_REQ.h +++ b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_LOC_REG_REQ_H__) #define __P25_LC_TSBK__ISP_LOC_REG_REQ_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp rename to src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp diff --git a/src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h similarity index 97% rename from src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h rename to src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h index d588c566..becb381d 100644 --- a/src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h +++ b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_SNDCP_CH_REQ_H__) #define __P25_LC_TSBK__ISP_SNDCP_CH_REQ_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp similarity index 100% rename from src/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp rename to src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp diff --git a/src/p25/lc/tsbk/ISP_U_DEREG_REQ.h b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h similarity index 97% rename from src/p25/lc/tsbk/ISP_U_DEREG_REQ.h rename to src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h index ccf8e533..f7054ff4 100644 --- a/src/p25/lc/tsbk/ISP_U_DEREG_REQ.h +++ b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__ISP_U_DEREG_REQ_H__) #define __P25_LC_TSBK__ISP_U_DEREG_REQ_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp b/src/common/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp rename to src/common/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp diff --git a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h b/src/common/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h similarity index 97% rename from src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h rename to src/common/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h index 3e49a0a1..7ef3cf30 100644 --- a/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h +++ b/src/common/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_IOSP_ACK_RSP_H__) #define __P25_LC_TSBK__MBT_IOSP_ACK_RSP_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp b/src/common/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp rename to src/common/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp diff --git a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h b/src/common/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h similarity index 97% rename from src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h rename to src/common/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h index 6b281950..92f58f8b 100644 --- a/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h +++ b/src/common/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_IOSP_CALL_ALRT_H__) #define __P25_LC_TSBK__MBT_IOSP_CALL_ALRT_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp b/src/common/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp rename to src/common/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp diff --git a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h b/src/common/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h similarity index 97% rename from src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h rename to src/common/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h index c144c37a..d23fa332 100644 --- a/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h +++ b/src/common/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_IOSP_EXT_FNCT_H__) #define __P25_LC_TSBK__MBT_IOSP_EXT_FNCT_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp b/src/common/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp rename to src/common/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp diff --git a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h b/src/common/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h similarity index 97% rename from src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h rename to src/common/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h index 640a828f..c63bd021 100644 --- a/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h +++ b/src/common/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_IOSP_GRP_AFF_H__) #define __P25_LC_TSBK__MBT_IOSP_GRP_AFF_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp b/src/common/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp rename to src/common/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp diff --git a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h b/src/common/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h similarity index 97% rename from src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h rename to src/common/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h index afae7e39..ac217cee 100644 --- a/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h +++ b/src/common/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_IOSP_MSG_UPDT_H__) #define __P25_LC_TSBK__MBT_IOSP_MSG_UPDT_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp b/src/common/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp rename to src/common/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp diff --git a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h b/src/common/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h similarity index 97% rename from src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h rename to src/common/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h index 1abe5b84..78d0312c 100644 --- a/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h +++ b/src/common/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_IOSP_STS_UPDT_H__) #define __P25_LC_TSBK__MBT_IOSP_STS_UPDT_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp b/src/common/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp rename to src/common/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h b/src/common/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h similarity index 98% rename from src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h rename to src/common/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h index 9b6551a8..11f97a31 100644 --- a/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h +++ b/src/common/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_ISP_AUTH_RESP_M_H__) #define __P25_LC_TSBK__MBT_ISP_AUTH_RESP_M_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp b/src/common/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp rename to src/common/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp diff --git a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h b/src/common/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h similarity index 97% rename from src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h rename to src/common/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h index 7b9e756c..89f9f7d5 100644 --- a/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h +++ b/src/common/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_ISP_AUTH_SU_DMD_H__) #define __P25_LC_TSBK__MBT_ISP_AUTH_SU_DMD_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp b/src/common/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp rename to src/common/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp diff --git a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h b/src/common/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h similarity index 97% rename from src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h rename to src/common/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h index 231130dd..8e7e1f3b 100644 --- a/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h +++ b/src/common/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_ISP_CAN_SRV_REQ_H__) #define __P25_LC_TSBK__MBT_ISP_CAN_SRV_REQ_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp b/src/common/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp rename to src/common/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp diff --git a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h b/src/common/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h similarity index 98% rename from src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h rename to src/common/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h index e3efdfa2..b5fb3474 100644 --- a/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h +++ b/src/common/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_OSP_ADJ_STS_BCAST_H__) #define __P25_LC_TSBK__MBT_OSP_ADJ_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp b/src/common/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp rename to src/common/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp diff --git a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h b/src/common/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h similarity index 98% rename from src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h rename to src/common/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h index 7e8e0fcd..e5cac476 100644 --- a/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h +++ b/src/common/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_OSP_AUTH_DMD_H__) #define __P25_LC_TSBK__MBT_OSP_AUTH_DMD_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp b/src/common/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp rename to src/common/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp diff --git a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h b/src/common/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h similarity index 97% rename from src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h rename to src/common/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h index d250313c..2f61d7e1 100644 --- a/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h +++ b/src/common/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_OSP_NET_STS_BCAST_H__) #define __P25_LC_TSBK__MBT_OSP_NET_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp b/src/common/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp rename to src/common/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp diff --git a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h b/src/common/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h similarity index 97% rename from src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h rename to src/common/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h index d1af71d7..59c21788 100644 --- a/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h +++ b/src/common/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__MBT_OSP_RFSS_STS_BCAST_H__) #define __P25_LC_TSBK__MBT_OSP_RFSS_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/AMBT.h" +#include "common/Defines.h" +#include "common/p25/lc/AMBT.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp rename to src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp diff --git a/src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h similarity index 98% rename from src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h rename to src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h index 4cccf37c..83863f18 100644 --- a/src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h +++ b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_ADJ_STS_BCAST_H__) #define __P25_LC_TSBK__OSP_ADJ_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp rename to src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp diff --git a/src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h similarity index 97% rename from src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h rename to src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h index 49075e75..3b419cb2 100644 --- a/src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h +++ b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_AUTH_FNE_RESP_H__) #define __P25_LC_TSBK__OSP_AUTH_FNE_RESP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_DENY_RSP.cpp b/src/common/p25/lc/tsbk/OSP_DENY_RSP.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_DENY_RSP.cpp rename to src/common/p25/lc/tsbk/OSP_DENY_RSP.cpp diff --git a/src/p25/lc/tsbk/OSP_DENY_RSP.h b/src/common/p25/lc/tsbk/OSP_DENY_RSP.h similarity index 97% rename from src/p25/lc/tsbk/OSP_DENY_RSP.h rename to src/common/p25/lc/tsbk/OSP_DENY_RSP.h index cf8318db..4c958fb5 100644 --- a/src/p25/lc/tsbk/OSP_DENY_RSP.h +++ b/src/common/p25/lc/tsbk/OSP_DENY_RSP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_DENY_RSP_H__) #define __P25_LC_TSBK__OSP_DENY_RSP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp rename to src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp diff --git a/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h similarity index 97% rename from src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h rename to src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h index fbeb6324..1ab79bd5 100644 --- a/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h +++ b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_LC_CALL_TERM_H__) #define __P25_LC_TSBK__OSP_LC_CALL_TERM_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp rename to src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp diff --git a/src/p25/lc/tsbk/OSP_GRP_AFF_Q.h b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h similarity index 97% rename from src/p25/lc/tsbk/OSP_GRP_AFF_Q.h rename to src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h index 454ce393..0915bb21 100644 --- a/src/p25/lc/tsbk/OSP_GRP_AFF_Q.h +++ b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_GRP_AFF_Q_H__) #define __P25_LC_TSBK__OSP_GRP_AFF_Q_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp rename to src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp diff --git a/src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h similarity index 97% rename from src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h rename to src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h index ef8519e1..0823f723 100644 --- a/src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h +++ b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_GRP_VCH_GRANT_UPD_H__) #define __P25_LC_TSBK__OSP_GRP_VCH_GRANT_UPD_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_IDEN_UP.cpp b/src/common/p25/lc/tsbk/OSP_IDEN_UP.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_IDEN_UP.cpp rename to src/common/p25/lc/tsbk/OSP_IDEN_UP.cpp diff --git a/src/p25/lc/tsbk/OSP_IDEN_UP.h b/src/common/p25/lc/tsbk/OSP_IDEN_UP.h similarity index 97% rename from src/p25/lc/tsbk/OSP_IDEN_UP.h rename to src/common/p25/lc/tsbk/OSP_IDEN_UP.h index 0859e9b6..e03a1fd5 100644 --- a/src/p25/lc/tsbk/OSP_IDEN_UP.h +++ b/src/common/p25/lc/tsbk/OSP_IDEN_UP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_IDEN_UP_H__) #define __P25_LC_TSBK__OSP_IDEN_UP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp rename to src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp diff --git a/src/p25/lc/tsbk/OSP_IDEN_UP_VU.h b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h similarity index 97% rename from src/p25/lc/tsbk/OSP_IDEN_UP_VU.h rename to src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h index e251b0c1..c461f761 100644 --- a/src/p25/lc/tsbk/OSP_IDEN_UP_VU.h +++ b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_IDEN_UP_VU_H__) #define __P25_LC_TSBK__OSP_IDEN_UP_VU_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp rename to src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp diff --git a/src/p25/lc/tsbk/OSP_LOC_REG_RSP.h b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h similarity index 97% rename from src/p25/lc/tsbk/OSP_LOC_REG_RSP.h rename to src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h index 04cf4d05..645a05d5 100644 --- a/src/p25/lc/tsbk/OSP_LOC_REG_RSP.h +++ b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_LOC_REG_RSP_H__) #define __P25_LC_TSBK__OSP_LOC_REG_RSP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp rename to src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp diff --git a/src/p25/lc/tsbk/OSP_MOT_CC_BSI.h b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h similarity index 97% rename from src/p25/lc/tsbk/OSP_MOT_CC_BSI.h rename to src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h index c0629c30..ec2b9aed 100644 --- a/src/p25/lc/tsbk/OSP_MOT_CC_BSI.h +++ b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_MOT_CC_BSI_H__) #define __P25_LC_TSBK__OSP_MOT_CC_BSI_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_ADD.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h similarity index 97% rename from src/p25/lc/tsbk/OSP_MOT_GRG_ADD.h rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h index 3b3e1301..84130915 100644 --- a/src/p25/lc/tsbk/OSP_MOT_GRG_ADD.h +++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_MOT_GRG_ADD_H__) #define __P25_LC_TSBK__OSP_MOT_GRG_ADD_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_DEL.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h similarity index 97% rename from src/p25/lc/tsbk/OSP_MOT_GRG_DEL.h rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h index 82b7c19c..584d6bd2 100644 --- a/src/p25/lc/tsbk/OSP_MOT_GRG_DEL.h +++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_MOT_GRG_DEL_H__) #define __P25_LC_TSBK__OSP_MOT_GRG_DEL_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h similarity index 97% rename from src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h index 130515af..c0891ad0 100644 --- a/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h +++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_MOT_GRG_VCH_GRANT_H__) #define __P25_LC_TSBK__OSP_MOT_GRG_VCH_GRANT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp diff --git a/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h similarity index 97% rename from src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h rename to src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h index cfe044c6..8d53bdd8 100644 --- a/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h +++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_MOT_GRG_VCH_UPD_H__) #define __P25_LC_TSBK__OSP_MOT_GRG_VCH_UPD_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp rename to src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp diff --git a/src/p25/lc/tsbk/OSP_MOT_PSH_CCH.h b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h similarity index 97% rename from src/p25/lc/tsbk/OSP_MOT_PSH_CCH.h rename to src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h index 3310625c..320c7eaa 100644 --- a/src/p25/lc/tsbk/OSP_MOT_PSH_CCH.h +++ b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_MOT_PSH_CCH_H__) #define __P25_LC_TSBK__OSP_MOT_PSH_CCH_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp rename to src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp diff --git a/src/p25/lc/tsbk/OSP_NET_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h similarity index 97% rename from src/p25/lc/tsbk/OSP_NET_STS_BCAST.h rename to src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h index f01211ec..bfee0bf3 100644 --- a/src/p25/lc/tsbk/OSP_NET_STS_BCAST.h +++ b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_NET_STS_BCAST_H__) #define __P25_LC_TSBK__OSP_NET_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_QUE_RSP.cpp b/src/common/p25/lc/tsbk/OSP_QUE_RSP.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_QUE_RSP.cpp rename to src/common/p25/lc/tsbk/OSP_QUE_RSP.cpp diff --git a/src/p25/lc/tsbk/OSP_QUE_RSP.h b/src/common/p25/lc/tsbk/OSP_QUE_RSP.h similarity index 97% rename from src/p25/lc/tsbk/OSP_QUE_RSP.h rename to src/common/p25/lc/tsbk/OSP_QUE_RSP.h index 79e80619..6693fc1e 100644 --- a/src/p25/lc/tsbk/OSP_QUE_RSP.h +++ b/src/common/p25/lc/tsbk/OSP_QUE_RSP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_QUE_RSP_H__) #define __P25_LC_TSBK__OSP_QUE_RSP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp rename to src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp diff --git a/src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h similarity index 97% rename from src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h rename to src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h index 03a98d7a..1a143351 100644 --- a/src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h +++ b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_RFSS_STS_BCAST_H__) #define __P25_LC_TSBK__OSP_RFSS_STS_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_SCCB.cpp b/src/common/p25/lc/tsbk/OSP_SCCB.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_SCCB.cpp rename to src/common/p25/lc/tsbk/OSP_SCCB.cpp diff --git a/src/p25/lc/tsbk/OSP_SCCB.h b/src/common/p25/lc/tsbk/OSP_SCCB.h similarity index 97% rename from src/p25/lc/tsbk/OSP_SCCB.h rename to src/common/p25/lc/tsbk/OSP_SCCB.h index e81a1267..c1f519ed 100644 --- a/src/p25/lc/tsbk/OSP_SCCB.h +++ b/src/common/p25/lc/tsbk/OSP_SCCB.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_SCCB_H__) #define __P25_LC_TSBK__OSP_SCCB_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_SCCB_EXP.cpp b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_SCCB_EXP.cpp rename to src/common/p25/lc/tsbk/OSP_SCCB_EXP.cpp diff --git a/src/p25/lc/tsbk/OSP_SCCB_EXP.h b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h similarity index 97% rename from src/p25/lc/tsbk/OSP_SCCB_EXP.h rename to src/common/p25/lc/tsbk/OSP_SCCB_EXP.h index 151f3c44..72f31e2b 100644 --- a/src/p25/lc/tsbk/OSP_SCCB_EXP.h +++ b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_SCCB_EXP_H__) #define __P25_LC_TSBK__OSP_SCCB_EXP_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp rename to src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp diff --git a/src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h similarity index 97% rename from src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h rename to src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h index 81792a65..314740cd 100644 --- a/src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_SNDCP_CH_ANN_H__) #define __P25_LC_TSBK__OSP_SNDCP_CH_ANN_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp rename to src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp diff --git a/src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h similarity index 97% rename from src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h rename to src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h index 2f115530..d1ab30c8 100644 --- a/src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_SNDCP_CH_GNT_H__) #define __P25_LC_TSBK__OSP_SNDCP_CH_GNT_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_SYNC_BCAST.cpp b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_SYNC_BCAST.cpp rename to src/common/p25/lc/tsbk/OSP_SYNC_BCAST.cpp diff --git a/src/p25/lc/tsbk/OSP_SYNC_BCAST.h b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h similarity index 97% rename from src/p25/lc/tsbk/OSP_SYNC_BCAST.h rename to src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h index 70807eb4..b9c1e11d 100644 --- a/src/p25/lc/tsbk/OSP_SYNC_BCAST.h +++ b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_SYNC_BCAST_H__) #define __P25_LC_TSBK__OSP_SYNC_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp rename to src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp diff --git a/src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h similarity index 97% rename from src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h rename to src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h index 728df9a9..a442939f 100644 --- a/src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h +++ b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_SYS_SRV_BCAST_H__) #define __P25_LC_TSBK__OSP_SYS_SRV_BCAST_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp rename to src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp diff --git a/src/p25/lc/tsbk/OSP_TIME_DATE_ANN.h b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h similarity index 97% rename from src/p25/lc/tsbk/OSP_TIME_DATE_ANN.h rename to src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h index 04240899..60410c1c 100644 --- a/src/p25/lc/tsbk/OSP_TIME_DATE_ANN.h +++ b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_TIME_DATE_ANN_H__) #define __P25_LC_TSBK__OSP_TIME_DATE_ANN_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_TSBK_RAW.cpp b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_TSBK_RAW.cpp rename to src/common/p25/lc/tsbk/OSP_TSBK_RAW.cpp diff --git a/src/p25/lc/tsbk/OSP_TSBK_RAW.h b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h similarity index 97% rename from src/p25/lc/tsbk/OSP_TSBK_RAW.h rename to src/common/p25/lc/tsbk/OSP_TSBK_RAW.h index 0d50501b..066066ed 100644 --- a/src/p25/lc/tsbk/OSP_TSBK_RAW.h +++ b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_TSBK_RAW_H__) #define __P25_LC_TSBK__OSP_TSBK_RAW_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.cpp b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.cpp rename to src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.cpp diff --git a/src/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h similarity index 97% rename from src/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h rename to src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h index a618902f..89b6ac02 100644 --- a/src/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h +++ b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_UU_VCH_GRANT_UPD_H__) #define __P25_LC_TSBK__OSP_UU_VCH_GRANT_UPD_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp rename to src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp diff --git a/src/p25/lc/tsbk/OSP_U_DEREG_ACK.h b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h similarity index 97% rename from src/p25/lc/tsbk/OSP_U_DEREG_ACK.h rename to src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h index 1f7fe7b2..d88c4f68 100644 --- a/src/p25/lc/tsbk/OSP_U_DEREG_ACK.h +++ b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_U_DEREG_ACK_H__) #define __P25_LC_TSBK__OSP_U_DEREG_ACK_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/OSP_U_REG_CMD.cpp b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.cpp similarity index 100% rename from src/p25/lc/tsbk/OSP_U_REG_CMD.cpp rename to src/common/p25/lc/tsbk/OSP_U_REG_CMD.cpp diff --git a/src/p25/lc/tsbk/OSP_U_REG_CMD.h b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h similarity index 97% rename from src/p25/lc/tsbk/OSP_U_REG_CMD.h rename to src/common/p25/lc/tsbk/OSP_U_REG_CMD.h index af116dc9..1f79c2d4 100644 --- a/src/p25/lc/tsbk/OSP_U_REG_CMD.h +++ b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h @@ -26,8 +26,8 @@ #if !defined(__P25_LC_TSBK__OSP_U_REG_CMD_H__) #define __P25_LC_TSBK__OSP_U_REG_CMD_H__ -#include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lc/tsbk/TSBKFactory.cpp b/src/common/p25/lc/tsbk/TSBKFactory.cpp similarity index 100% rename from src/p25/lc/tsbk/TSBKFactory.cpp rename to src/common/p25/lc/tsbk/TSBKFactory.cpp diff --git a/src/common/p25/lc/tsbk/TSBKFactory.h b/src/common/p25/lc/tsbk/TSBKFactory.h new file mode 100644 index 00000000..2a5fbde6 --- /dev/null +++ b/src/common/p25/lc/tsbk/TSBKFactory.h @@ -0,0 +1,137 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @package DVM / Host Software +* +*/ +/* +* Copyright (C) 2022 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 +* the Free Software Foundation; either version 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__P25_LC__TSBK_FACTORY_H__) +#define __P25_LC__TSBK_FACTORY_H__ + +#include "common/Defines.h" + +#include "common/edac/Trellis.h" + +#include "common/p25/lc/TSBK.h" +#include "common/p25/lc/tsbk/IOSP_ACK_RSP.h" +#include "common/p25/lc/tsbk/IOSP_CALL_ALRT.h" +#include "common/p25/lc/tsbk/IOSP_EXT_FNCT.h" +#include "common/p25/lc/tsbk/IOSP_GRP_AFF.h" +#include "common/p25/lc/tsbk/IOSP_GRP_VCH.h" +#include "common/p25/lc/tsbk/IOSP_MSG_UPDT.h" +#include "common/p25/lc/tsbk/IOSP_RAD_MON.h" +#include "common/p25/lc/tsbk/IOSP_STS_UPDT.h" +#include "common/p25/lc/tsbk/IOSP_U_REG.h" +#include "common/p25/lc/tsbk/IOSP_UU_ANS.h" +#include "common/p25/lc/tsbk/IOSP_UU_VCH.h" +#include "common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h" +#include "common/p25/lc/tsbk/ISP_AUTH_RESP.h" +#include "common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h" +#include "common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h" +#include "common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h" +#include "common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h" +#include "common/p25/lc/tsbk/ISP_LOC_REG_REQ.h" +#include "common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h" +#include "common/p25/lc/tsbk/ISP_U_DEREG_REQ.h" +#include "common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h" +#include "common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h" +#include "common/p25/lc/tsbk/OSP_DENY_RSP.h" +#include "common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h" +#include "common/p25/lc/tsbk/OSP_GRP_AFF_Q.h" +#include "common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h" +#include "common/p25/lc/tsbk/OSP_IDEN_UP_VU.h" +#include "common/p25/lc/tsbk/OSP_IDEN_UP.h" +#include "common/p25/lc/tsbk/OSP_LOC_REG_RSP.h" +#include "common/p25/lc/tsbk/OSP_MOT_CC_BSI.h" +#include "common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h" +#include "common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h" +#include "common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h" +#include "common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h" +#include "common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h" +#include "common/p25/lc/tsbk/OSP_NET_STS_BCAST.h" +#include "common/p25/lc/tsbk/OSP_QUE_RSP.h" +#include "common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h" +#include "common/p25/lc/tsbk/OSP_SCCB_EXP.h" +#include "common/p25/lc/tsbk/OSP_SCCB.h" +#include "common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h" +#include "common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h" +#include "common/p25/lc/tsbk/OSP_SYNC_BCAST.h" +#include "common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h" +#include "common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h" +#include "common/p25/lc/tsbk/OSP_TSBK_RAW.h" +#include "common/p25/lc/tsbk/OSP_U_DEREG_ACK.h" +#include "common/p25/lc/tsbk/OSP_U_REG_CMD.h" +#include "common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h" + +#include "common/p25/lc/AMBT.h" +#include "common/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h" +#include "common/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h" +#include "common/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h" +#include "common/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h" +#include "common/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h" +#include "common/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h" +#include "common/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h" +#include "common/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h" +#include "common/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h" +#include "common/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h" +#include "common/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h" +#include "common/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h" +#include "common/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h" + +namespace p25 +{ + namespace lc + { + namespace tsbk + { + // --------------------------------------------------------------------------- + // Class Declaration + // Helper class to instantiate an instance of a TSBK. + // --------------------------------------------------------------------------- + + class HOST_SW_API TSBKFactory { + public: + /// Initializes a new instance of the TSBKFactory class. + TSBKFactory(); + /// Finalizes a instance of the TSBKFactory class. + ~TSBKFactory(); + + /// Create an instance of a TSBK. + static std::unique_ptr createTSBK(const uint8_t* data, bool rawTSBK = false); + /// Create an instance of a AMBT. + static std::unique_ptr createAMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks); + + /// Sets the flag indicating CRC-errors should be warnings and not errors. + static void setWarnCRC(bool warnCRC) { m_warnCRC = warnCRC; } + + private: + static bool m_warnCRC; + + /// + static std::unique_ptr decode(TSBK* tsbk, const uint8_t* data, bool rawTSBK = false); + /// + static std::unique_ptr decode(AMBT* ambt, const data::DataHeader& dataHeader, const data::DataBlock* blocks); + }; + } // namespace tsbk + } // namespace lc +} // namespace p25 + +#endif // __P25_LC__TSBK_FACTORY_H__ diff --git a/src/yaml/Yaml.cpp b/src/common/yaml/Yaml.cpp similarity index 100% rename from src/yaml/Yaml.cpp rename to src/common/yaml/Yaml.cpp diff --git a/src/yaml/Yaml.h b/src/common/yaml/Yaml.h similarity index 99% rename from src/yaml/Yaml.h rename to src/common/yaml/Yaml.h index 1303b55b..6de6fb84 100644 --- a/src/yaml/Yaml.h +++ b/src/common/yaml/Yaml.h @@ -43,7 +43,7 @@ #if !defined(__YAML_H__) #define __YAML_H__ -#include "Defines.h" +#include "common/Defines.h" #include #include diff --git a/src/fne/CMakeLists.txt b/src/fne/CMakeLists.txt new file mode 100644 index 00000000..9b8f5671 --- /dev/null +++ b/src/fne/CMakeLists.txt @@ -0,0 +1,40 @@ +#/** +#* Digital Voice Modem - Host Software +#* GPLv2 Open Source. Use is subject to license terms. +#* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +#* +#* @package DVM / Host Software +#* +#*/ +#/* +#* Copyright (C) 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 +#* the Free Software Foundation; either version 2 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, write to the Free Software +#* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#*/ +file(GLOB dvmfne_SRC + "src/host/network/Network.h" + "src/host/network/Network.cpp" + "src/fne/network/fne/*.h" + "src/fne/network/fne/*.cpp" + "src/fne/network/*.h" + "src/fne/network/*.cpp" + "src/fne/*.h" + "src/fne/*.cpp" +) + +project(dvmfne) +add_executable(dvmfne ${common_INCLUDE} ${dvmfne_SRC}) +target_link_libraries(dvmfne PRIVATE common asio::asio Threads::Threads) +target_include_directories(dvmfne PRIVATE src src/host src/fne) diff --git a/src/fne/Defines.h b/src/fne/Defines.h new file mode 100644 index 00000000..9d9633a8 --- /dev/null +++ b/src/fne/Defines.h @@ -0,0 +1,50 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @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 +* +* 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 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__DEFINES_H__) +#define __DEFINES_H__ + +#include "common/Defines.h" + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#undef __PROG_NAME__ +#define __PROG_NAME__ "Digital Voice Modem (DVM) Conference FNE" +#undef __EXE_NAME__ +#define __EXE_NAME__ "dvmfne" + +#undef DEFAULT_CONF_FILE +#define DEFAULT_CONF_FILE "fne-config.yml" +#undef DEFAULT_LOCK_FILE +#define DEFAULT_LOCK_FILE "/tmp/dvmfne.lock" + +#endif // __DEFINES_H__ diff --git a/src/fne/FNEMain.cpp b/src/fne/FNEMain.cpp new file mode 100644 index 00000000..3f75de15 --- /dev/null +++ b/src/fne/FNEMain.cpp @@ -0,0 +1,271 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @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) 2020-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 +* the Free Software Foundation; either version 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#include "Defines.h" +#include "common/Log.h" +#include "FNEMain.h" +#include "HostFNE.h" + +using namespace network; +using namespace lookups; + +#include +#include +#include + +#include +#include +#include +#include +#include + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#if defined(ENABLE_DMR) +#define DESCR_DMR "DMR, " +#else +#define DESCR_DMR "" +#endif +#if defined(ENABLE_P25) +#define DESCR_P25 "P25, " +#else +#define DESCR_P25 "" +#endif +#if defined(ENABLE_NXDN) +#define DESCR_NXDN "NXDN, " +#else +#define DESCR_NXDN "" +#endif + +// --------------------------------------------------------------------------- +// Macros +// --------------------------------------------------------------------------- + +#define IS(s) (::strcmp(argv[i], s) == 0) + +// --------------------------------------------------------------------------- +// Global Variables +// --------------------------------------------------------------------------- + +int g_signal = 0; +std::string g_progExe = std::string(__EXE_NAME__); +std::string g_iniFile = std::string(DEFAULT_CONF_FILE); +std::string g_lockFile = std::string(DEFAULT_LOCK_FILE); + +bool g_foreground = false; +bool g_killed = false; + +uint8_t* g_gitHashBytes = nullptr; + +// --------------------------------------------------------------------------- +// Global Functions +// --------------------------------------------------------------------------- + +#if !defined(CATCH2_TEST_COMPILATION) +/// +/// Internal signal handler. +/// +/// +static void sigHandler(int signum) +{ + g_signal = signum; + g_killed = true; +} +#endif + +/// +/// Helper to print a fatal error message and exit. +/// +/// This is a variable argument function. +/// Message. +void fatal(const char* msg, ...) +{ + char buffer[400U]; + ::memset(buffer, 0x20U, 400U); + + va_list vl; + va_start(vl, msg); + + ::vsprintf(buffer, msg, vl); + + va_end(vl); + + ::fprintf(stderr, "%s: %s\n", g_progExe.c_str(), buffer); + exit(EXIT_FAILURE); +} + +/// +/// Helper to pring usage the command line arguments. (And optionally an error.) +/// +/// Error message. +/// Error message arguments. +void usage(const char* message, const char* arg) +{ + ::fprintf(stdout, __PROG_NAME__ " %s (" DESCR_DMR DESCR_P25 DESCR_NXDN "CW Id, Network) (built %s)\n", __VER__, __BUILD__); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n\n"); + if (message != nullptr) { + ::fprintf(stderr, "%s: ", g_progExe.c_str()); + ::fprintf(stderr, message, arg); + ::fprintf(stderr, "\n\n"); + } + + ::fprintf(stdout, + "usage: %s [-vhf]" + "[-c ]" + "\n\n" + " -v show version information\n" + " -h show this screen\n" + " -f foreground mode\n" + "\n" + " -c specifies the configuration file to use\n" + "\n" + " -- stop handling options\n", + g_progExe.c_str()); + exit(EXIT_FAILURE); +} + +/// +/// Helper to validate the command line arguments. +/// +/// Argument count. +/// Array of argument strings. +/// Count of remaining unprocessed arguments. +int checkArgs(int argc, char* argv[]) +{ + int i, p = 0; + + // iterate through arguments + for (i = 1; i <= argc; i++) + { + if (argv[i] == nullptr) { + break; + } + + if (*argv[i] != '-') { + continue; + } + else if (IS("--")) { + ++p; + break; + } + else if (IS("-c")) { + if (argc-- <= 0) + usage("error: %s", "must specify the configuration file to use"); + g_iniFile = std::string(argv[++i]); + + if (g_iniFile == "") + usage("error: %s", "configuration file cannot be blank!"); + + p += 2; + } + else if (IS("-v")) { + ::fprintf(stdout, __PROG_NAME__ " %s (" DESCR_DMR DESCR_P25 DESCR_NXDN "CW Id, Network) (built %s)\n", __VER__, __BUILD__); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n"); + if (argc == 2) + exit(EXIT_SUCCESS); + } + else if (IS("-h")) { + usage(nullptr, nullptr); + if (argc == 2) + exit(EXIT_SUCCESS); + } + else { + usage("unrecognized option `%s'", argv[i]); + } + } + + if (p < 0 || p > argc) { + p = 0; + } + + return ++p; +} + +// --------------------------------------------------------------------------- +// Program Entry Point +// --------------------------------------------------------------------------- +#if !defined(CATCH2_TEST_COMPILATION) +int main(int argc, char** argv) +{ + g_gitHashBytes = new uint8_t[4U]; + ::memset(g_gitHashBytes, 0x00U, 4U); + + uint32_t hash = ::strtoul(__GIT_VER_HASH__, 0, 16); + __SET_UINT32(hash, g_gitHashBytes, 0U); + + if (argv[0] != nullptr && *argv[0] != 0) + g_progExe = std::string(argv[0]); + + if (argc > 1) { + // check arguments + int i = checkArgs(argc, argv); + if (i < argc) { + argc -= i; + argv += i; + } + else { + argc--; + argv++; + } + } + + ::signal(SIGINT, sigHandler); + ::signal(SIGTERM, sigHandler); + ::signal(SIGHUP, sigHandler); + + int ret = 0; + + do { + g_signal = 0; + g_killed = false; + + HostFNE *fne = new HostFNE(g_iniFile); + ret = fne->run(); + delete fne; + + if (g_signal == 2) + ::LogInfoEx(LOG_HOST, "Exited on receipt of SIGINT"); + + if (g_signal == 15) + ::LogInfoEx(LOG_HOST, "Exited on receipt of SIGTERM"); + + if (g_signal == 1) + ::LogInfoEx(LOG_HOST, "Restarting on receipt of SIGHUP"); + } while (g_signal == 1); + + ::LogFinalise(); + + return ret; +} +#endif \ No newline at end of file diff --git a/src/fne/FNEMain.h b/src/fne/FNEMain.h new file mode 100644 index 00000000..e9fd0ec3 --- /dev/null +++ b/src/fne/FNEMain.h @@ -0,0 +1,54 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @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) 2020,2022 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 +* the Free Software Foundation; either version 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__FNE_MAIN_H__) +#define __FNE_MAIN_H__ + +#include "Defines.h" + +#include + +// --------------------------------------------------------------------------- +// Externs +// --------------------------------------------------------------------------- + +extern int g_signal; +extern std::string g_progExe; +extern std::string g_iniFile; +extern std::string g_lockFile; + +extern bool g_foreground; +extern bool g_killed; + +extern uint8_t* g_gitHashBytes; + +extern HOST_SW_API void fatal(const char* msg, ...); + +#endif // __FNE_MAIN_H__ diff --git a/src/host/fne/HostFNE.cpp b/src/fne/HostFNE.cpp similarity index 96% rename from src/host/fne/HostFNE.cpp rename to src/fne/HostFNE.cpp index 94c14e2c..90b143b2 100644 --- a/src/host/fne/HostFNE.cpp +++ b/src/fne/HostFNE.cpp @@ -24,16 +24,16 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/network/UDPSocket.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Thread.h" +#include "common/Utils.h" #include "network/fne/TagDMRData.h" #include "network/fne/TagP25Data.h" #include "network/fne/TagNXDNData.h" -#include "network/UDPSocket.h" -#include "host/fne/HostFNE.h" -#include "HostMain.h" -#include "Log.h" -#include "StopWatch.h" -#include "Thread.h" -#include "Utils.h" +#include "HostFNE.h" +#include "FNEMain.h" using namespace network; using namespace lookups; @@ -120,11 +120,6 @@ int HostFNE::run() ::fatal("unable to open the log file\n"); } - ret = ::ActivityLogInitialise(logConf["activityFilePath"].as(), logConf["fileRoot"].as()); - if (!ret) { - ::fatal("unable to open the activity log file\n"); - } - // handle POSIX process forking if (m_daemon) { // create new process @@ -132,12 +127,10 @@ int HostFNE::run() if (pid == -1) { ::fprintf(stderr, "%s: Couldn't fork() , exiting\n", g_progExe.c_str()); ::LogFinalise(); - ::ActivityLogFinalise(); return EXIT_FAILURE; } else if (pid != 0) { ::LogFinalise(); - ::ActivityLogFinalise(); exit(EXIT_SUCCESS); } @@ -145,7 +138,6 @@ int HostFNE::run() if (::setsid() == -1) { ::fprintf(stderr, "%s: Couldn't setsid(), exiting\n", g_progExe.c_str()); ::LogFinalise(); - ::ActivityLogFinalise(); return EXIT_FAILURE; } @@ -153,7 +145,6 @@ int HostFNE::run() if (::chdir("/") == -1) { ::fprintf(stderr, "%s: Couldn't cd /, exiting\n", g_progExe.c_str()); ::LogFinalise(); - ::ActivityLogFinalise(); return EXIT_FAILURE; } diff --git a/src/host/fne/HostFNE.h b/src/fne/HostFNE.h similarity index 94% rename from src/host/fne/HostFNE.h rename to src/fne/HostFNE.h index 88182cad..4876f4eb 100644 --- a/src/host/fne/HostFNE.h +++ b/src/fne/HostFNE.h @@ -27,12 +27,12 @@ #define __HOST_FNE_H__ #include "Defines.h" -#include "network/Network.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/yaml/Yaml.h" +#include "common/Timer.h" #include "network/FNENetwork.h" -#include "Timer.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" -#include "yaml/Yaml.h" +#include "host/network/Network.h" #include #include diff --git a/src/network/FNENetwork.cpp b/src/fne/network/FNENetwork.cpp similarity index 99% rename from src/network/FNENetwork.cpp rename to src/fne/network/FNENetwork.cpp index c6cd0f91..bc808b2d 100644 --- a/src/network/FNENetwork.cpp +++ b/src/fne/network/FNENetwork.cpp @@ -24,16 +24,16 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "edac/SHA256.h" -#include "host/fne/HostFNE.h" +#include "common/edac/SHA256.h" +#include "common/network/json/json.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Utils.h" #include "network/FNENetwork.h" #include "network/fne/TagDMRData.h" #include "network/fne/TagP25Data.h" #include "network/fne/TagNXDNData.h" -#include "network/json/json.h" -#include "Log.h" -#include "StopWatch.h" -#include "Utils.h" +#include "HostFNE.h" using namespace network; using namespace network::fne; @@ -544,7 +544,7 @@ void FNENetwork::clock(uint32_t ms) std::stringstream ss; ss << peerId << " " << payload; - ::ActivityLog("", false, ss.str().c_str()); + ::Log(9999U, nullptr, "%s", ss.str().c_str()); } else { writePeerNAK(peerId, TAG_TRANSFER_ACT_LOG); diff --git a/src/network/FNENetwork.h b/src/fne/network/FNENetwork.h similarity index 98% rename from src/network/FNENetwork.h rename to src/fne/network/FNENetwork.h index 6dfd1cf3..7a26832a 100644 --- a/src/network/FNENetwork.h +++ b/src/fne/network/FNENetwork.h @@ -27,11 +27,11 @@ #define __FNE_NETWORK_H__ #include "Defines.h" -#include "network/BaseNetwork.h" -#include "network/Network.h" -#include "network/json/json.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" +#include "common/network/BaseNetwork.h" +#include "common/network/json/json.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "host/network/Network.h" #include #include diff --git a/src/network/fne/TagDMRData.cpp b/src/fne/network/fne/TagDMRData.cpp similarity index 99% rename from src/network/fne/TagDMRData.cpp rename to src/fne/network/fne/TagDMRData.cpp index 8bfe3e49..eecf9eac 100644 --- a/src/network/fne/TagDMRData.cpp +++ b/src/fne/network/fne/TagDMRData.cpp @@ -24,13 +24,13 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "host/fne/HostFNE.h" +#include "common/Clock.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Utils.h" #include "network/FNENetwork.h" #include "network/fne/TagDMRData.h" -#include "Clock.h" -#include "Log.h" -#include "StopWatch.h" -#include "Utils.h" +#include "HostFNE.h" using namespace system_clock; using namespace network; diff --git a/src/network/fne/TagDMRData.h b/src/fne/network/fne/TagDMRData.h similarity index 97% rename from src/network/fne/TagDMRData.h rename to src/fne/network/fne/TagDMRData.h index 69fe4602..60cb3137 100644 --- a/src/network/fne/TagDMRData.h +++ b/src/fne/network/fne/TagDMRData.h @@ -27,9 +27,9 @@ #define __FNE__TAG_DMR_DATA_H__ #include "Defines.h" -#include "Clock.h" -#include "dmr/DMRDefines.h" -#include "dmr/data/Data.h" +#include "common/dmr/DMRDefines.h" +#include "common/dmr/data/Data.h" +#include "common/Clock.h" #include "network/FNENetwork.h" #include diff --git a/src/network/fne/TagNXDNData.cpp b/src/fne/network/fne/TagNXDNData.cpp similarity index 98% rename from src/network/fne/TagNXDNData.cpp rename to src/fne/network/fne/TagNXDNData.cpp index 4fe24033..02c2f954 100644 --- a/src/network/fne/TagNXDNData.cpp +++ b/src/fne/network/fne/TagNXDNData.cpp @@ -24,14 +24,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "nxdn/NXDNDefines.h" -#include "host/fne/HostFNE.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/Clock.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Utils.h" #include "network/FNENetwork.h" #include "network/fne/TagNXDNData.h" -#include "Clock.h" -#include "Log.h" -#include "StopWatch.h" -#include "Utils.h" +#include "HostFNE.h" using namespace system_clock; using namespace network; diff --git a/src/network/fne/TagNXDNData.h b/src/fne/network/fne/TagNXDNData.h similarity index 97% rename from src/network/fne/TagNXDNData.h rename to src/fne/network/fne/TagNXDNData.h index b6afaef4..109de55e 100644 --- a/src/network/fne/TagNXDNData.h +++ b/src/fne/network/fne/TagNXDNData.h @@ -27,10 +27,10 @@ #define __FNE__TAG_NXDN_DATA_H__ #include "Defines.h" -#include "Clock.h" +#include "common/Clock.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/lc/RTCH.h" #include "network/FNENetwork.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/lc/RTCH.h" #include diff --git a/src/network/fne/TagP25Data.cpp b/src/fne/network/fne/TagP25Data.cpp similarity index 98% rename from src/network/fne/TagP25Data.cpp rename to src/fne/network/fne/TagP25Data.cpp index fecac383..8b79dc2d 100644 --- a/src/network/fne/TagP25Data.cpp +++ b/src/fne/network/fne/TagP25Data.cpp @@ -24,14 +24,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "host/fne/HostFNE.h" +#include "common/Clock.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Thread.h" +#include "common/Utils.h" #include "network/FNENetwork.h" #include "network/fne/TagP25Data.h" -#include "Clock.h" -#include "Log.h" -#include "StopWatch.h" -#include "Thread.h" -#include "Utils.h" +#include "HostFNE.h" using namespace system_clock; using namespace network; diff --git a/src/network/fne/TagP25Data.h b/src/fne/network/fne/TagP25Data.h similarity index 91% rename from src/network/fne/TagP25Data.h rename to src/fne/network/fne/TagP25Data.h index 509daa0f..a3bfe800 100644 --- a/src/network/fne/TagP25Data.h +++ b/src/fne/network/fne/TagP25Data.h @@ -27,16 +27,16 @@ #define __FNE__TAG_P25_DATA_H__ #include "Defines.h" -#include "Clock.h" +#include "common/Clock.h" +#include "common/p25/P25Defines.h" +#include "common/p25/data/DataHeader.h" +#include "common/p25/data/LowSpeedData.h" +#include "common/p25/dfsi/DFSIDefines.h" +#include "common/p25/dfsi/LC.h" +#include "common/p25/lc/LC.h" +#include "common/p25/lc/TSBK.h" +#include "common/p25/lc/TDULC.h" #include "network/FNENetwork.h" -#include "p25/P25Defines.h" -#include "p25/data/DataHeader.h" -#include "p25/data/LowSpeedData.h" -#include "p25/dfsi/DFSIDefines.h" -#include "p25/dfsi/LC.h" -#include "p25/lc/LC.h" -#include "p25/lc/TSBK.h" -#include "p25/lc/TDULC.h" #include diff --git a/src/host/ActivityLog.cpp b/src/host/ActivityLog.cpp new file mode 100644 index 00000000..de188ea1 --- /dev/null +++ b/src/host/ActivityLog.cpp @@ -0,0 +1,180 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @package DVM / Host Software +* +*/ +/* +* Copyright (C) 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 +* the Free Software Foundation; either version 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#include "ActivityLog.h" +#include "common/network/BaseNetwork.h" +#include "common/Log.h" // for CurrentLogFileLevel() and LogGetNetwork() + +#include + +#if defined(CATCH2_TEST_COMPILATION) +#include +#endif + +#include +#include +#include +#include +#include +#include + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#define EOL "\r\n" + +const uint32_t ACT_LOG_BUFFER_LEN = 501U; + +// --------------------------------------------------------------------------- +// Global Variables +// --------------------------------------------------------------------------- + +static std::string m_actFilePath; +static std::string m_actFileRoot; + +static FILE* m_actFpLog = nullptr; + +static struct tm m_actTm; + +// --------------------------------------------------------------------------- +// Global Functions +// --------------------------------------------------------------------------- + +/// +/// Helper to open the activity log file, file handle. +/// +/// True, if log file is opened, otherwise false. +static bool ActivityLogOpen() +{ + if (CurrentLogFileLevel() == 0U) + return true; + + time_t now; + ::time(&now); + + struct tm* tm = ::gmtime(&now); + + if (tm->tm_mday == m_actTm.tm_mday && tm->tm_mon == m_actTm.tm_mon && tm->tm_year == m_actTm.tm_year) { + if (m_actFpLog != nullptr) + return true; + } + else { + if (m_actFpLog != nullptr) + ::fclose(m_actFpLog); + } + + char filename[200U]; + ::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", LogGetFilePath().c_str(), LogGetFileRoot().c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday); + + m_actFpLog = ::fopen(filename, "a+t"); + m_actTm = *tm; + + return m_actFpLog != nullptr; +} + +/// +/// Initializes the activity log. +/// +/// Full-path to the activity log file. +/// Prefix of the activity log file name. +bool ActivityLogInitialise(const std::string& filePath, const std::string& fileRoot) +{ +#if defined(CATCH2_TEST_COMPILATION) + return true; +#endif + m_actFilePath = filePath; + m_actFileRoot = fileRoot; + + return ::ActivityLogOpen(); +} + +/// +/// Finalizes the activity log. +/// +void ActivityLogFinalise() +{ +#if defined(CATCH2_TEST_COMPILATION) + return; +#endif + if (m_actFpLog != nullptr) + ::fclose(m_actFpLog); +} + +/// +/// Writes a new entry to the activity log. +/// +/// This is a variable argument function. +/// Digital mode (usually P25 or DMR). +/// Flag indicating that the entry was generated from an RF event. +/// Formatted string to write to activity log. +void ActivityLog(const char *mode, const bool sourceRf, const char* msg, ...) +{ +#if defined(CATCH2_TEST_COMPILATION) + return; +#endif + assert(mode != nullptr); + assert(msg != nullptr); + + char buffer[ACT_LOG_BUFFER_LEN]; + struct timeval now; + ::gettimeofday(&now, NULL); + + struct tm* tm = ::gmtime(&now.tv_sec); + + if (strcmp(mode, "") == 0) { + ::sprintf(buffer, "A: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U); + } + else { + ::sprintf(buffer, "A: %04d-%02d-%02d %02d:%02d:%02d.%03lu %s %s ", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U, mode, (sourceRf) ? "RF" : "Net"); + } + + va_list vl; + va_start(vl, msg); + + ::vsnprintf(buffer + ::strlen(buffer), ACT_LOG_BUFFER_LEN - 1U, msg, vl); + + va_end(vl); + + bool ret = ::ActivityLogOpen(); + if (!ret) + return; + + if (LogGetNetwork() != nullptr) { + network::BaseNetwork* network = (network::BaseNetwork*)LogGetNetwork();; + network->writeActLog(buffer); + } + + if (CurrentLogFileLevel() == 0U) + return; + + ::fprintf(m_actFpLog, "%s\n", buffer); + ::fflush(m_actFpLog); + + if (2U >= g_logDisplayLevel && g_logDisplayLevel != 0U) { + ::fprintf(stdout, "%s" EOL, buffer); + ::fflush(stdout); + } +} diff --git a/src/host/ActivityLog.h b/src/host/ActivityLog.h new file mode 100644 index 00000000..20bdf6ca --- /dev/null +++ b/src/host/ActivityLog.h @@ -0,0 +1,44 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @package DVM / Host Software +* +*/ +/* +* Copyright (C) 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 +* the Free Software Foundation; either version 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__ACTIVITY_LOG_H__) +#define __ACTIVITY_LOG_H__ + +#include "Defines.h" + +#include + +// --------------------------------------------------------------------------- +// Global Functions +// --------------------------------------------------------------------------- + +/// Initializes the activity log. +extern HOST_SW_API bool ActivityLogInitialise(const std::string& filePath, const std::string& fileRoot); +/// Finalizes the activity log. +extern HOST_SW_API void ActivityLogFinalise(); +/// Writes a new entry to the activity log. +extern HOST_SW_API void ActivityLog(const char* mode, const bool sourceRf, const char* msg, ...); + +#endif // __ACTIVITY_LOG_H__ diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt new file mode 100644 index 00000000..e7d96e7f --- /dev/null +++ b/src/host/CMakeLists.txt @@ -0,0 +1,105 @@ +#/** +#* Digital Voice Modem - Host Software +#* GPLv2 Open Source. Use is subject to license terms. +#* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +#* +#* @package DVM / Host Software +#* +#*/ +#/* +#* Copyright (C) 2022 by Bryan Biedenkapp N2PLL +#* Copyright (C) 2022 by Natalie Moore +#* +#* 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 2 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, write to the Free Software +#* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#*/ +file(GLOB dvmhost_SRC + # DMR module + "src/host/dmr/*.h" + "src/host/dmr/*.cpp" + "src/host/dmr/lc/csbk/*.h" + "src/host/dmr/lc/csbk/*.cpp" + "src/host/dmr/lookups/*.h" + "src/host/dmr/lookups/*.cpp" + "src/host/dmr/packet*.h" + "src/host/dmr/packet/*.cpp" + + # P25 module + "src/host/p25/*.h" + "src/host/p25/*.cpp" + "src/host/p25/lc/tsbk/*.h" + "src/host/p25/lc/tsbk/*.cpp" + "src/host/p25/lookups/*.h" + "src/host/p25/lookups/*.cpp" + "src/host/p25/packet/*.h" + "src/host/p25/packet/*.cpp" + + # NXDN module + "src/host/nxdn/*.h" + "src/host/nxdn/*.cpp" + "src/host/nxdn/packet/*.h" + "src/host/nxdn/packet/*.cpp" + + # Core + "src/host/*.h" + "src/host/*.cpp" + "src/host/calibrate/*.h" + "src/host/calibrate/*.cpp" + "src/host/setup/*.h" + "src/host/setup/*.cpp" + "src/host/modem/*.h" + "src/host/modem/*.cpp" + "src/host/modem/port/*.h" + "src/host/modem/port/*.cpp" + "src/host/network/*.h" + "src/host/network/*.cpp" + "src/remote/RESTClient.cpp" + "src/remote/RESTClient.h" +) + +project(dvmhost) +if (ENABLE_SETUP_TUI) + # add finalcut + target_include_directories(finalcut INTERFACE ${FINALCUT_INCLUDE_DIR}) +endif (ENABLE_SETUP_TUI) + +add_executable(dvmhost ${common_INCLUDE} ${dvmhost_SRC}) +if (ENABLE_SETUP_TUI) + target_link_libraries(dvmhost PRIVATE common asio::asio finalcut Threads::Threads util) +else() + target_link_libraries(dvmhost PRIVATE common asio::asio Threads::Threads util) +endif (ENABLE_SETUP_TUI) +target_include_directories(dvmhost PRIVATE src src/host) + +set(CPACK_SET_DESTDIR true) +set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local") + +set(CPACK_GENERATOR "DEB") +set(CPACK_PACKAGE_NAME "dvmhost") +set(CPACK_DEBIAN_PACKAGE_NAME "dvmhost") + +set(CPACK_PACKAGE_VENDOR "DVMProject") + +set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "The DVM Host software provides the host computer implementation of a mixed-mode DMR, P25 and/or NXDN or dedicated-mode DMR, P25 or NXDN repeater system that talks to the actual modem hardware. The host software; is the portion of a complete Over-The-Air modem implementation that performs the data processing, decision making and FEC correction for a digital repeater.") +set(CPACK_DEBIAN_PACKAGE_MAINTAINER "DVMProject Authors") +set(CPACK_DEBIAN_PACKAGE_VERSION "3.5.5") +set(CPACK_DEBIAN_PACKAGE_RELEASE "0") +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/dvmproject") + +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA + "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm") + +set(CPACK_DEBIAN_FILE_NAME ${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb) + +include(CPack) diff --git a/src/host/Defines.h b/src/host/Defines.h new file mode 100644 index 00000000..e455e12a --- /dev/null +++ b/src/host/Defines.h @@ -0,0 +1,45 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @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 +* +* 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 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__DEFINES_H__) +#define __DEFINES_H__ + +#include "common/Defines.h" + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#undef __PROG_NAME__ +#define __PROG_NAME__ "Digital Voice Modem (DVM) Host" +#undef __EXE_NAME__ +#define __EXE_NAME__ "dvmhost" + +#endif // __DEFINES_H__ diff --git a/src/host/Host.Config.cpp b/src/host/Host.Config.cpp index 7bf33f1b..734e5329 100644 --- a/src/host/Host.Config.cpp +++ b/src/host/Host.Config.cpp @@ -28,12 +28,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/network/UDPSocket.h" #include "modem/port/ModemNullPort.h" #include "modem/port/UARTPort.h" #include "modem/port/PseudoPTYPort.h" #include "modem/port/UDPPort.h" -#include "network/UDPSocket.h" -#include "host/Host.h" +#include "Host.h" #include "HostMain.h" using namespace network; diff --git a/src/host/Host.DMR.cpp b/src/host/Host.DMR.cpp index a8113860..97c9ef90 100644 --- a/src/host/Host.DMR.cpp +++ b/src/host/Host.DMR.cpp @@ -28,7 +28,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "host/Host.h" +#include "Host.h" using namespace modem; diff --git a/src/host/Host.NXDN.cpp b/src/host/Host.NXDN.cpp index 28fc529c..80794703 100644 --- a/src/host/Host.NXDN.cpp +++ b/src/host/Host.NXDN.cpp @@ -28,7 +28,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "host/Host.h" +#include "Host.h" using namespace modem; diff --git a/src/host/Host.P25.cpp b/src/host/Host.P25.cpp index 6c61dca4..b4f6b411 100644 --- a/src/host/Host.P25.cpp +++ b/src/host/Host.P25.cpp @@ -28,7 +28,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "host/Host.h" +#include "Host.h" #include "HostMain.h" using namespace modem; diff --git a/src/host/Host.cpp b/src/host/Host.cpp index bb0bd9cb..81a89655 100644 --- a/src/host/Host.cpp +++ b/src/host/Host.cpp @@ -30,16 +30,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "dmr/DMRUtils.h" -#include "p25/P25Utils.h" -#include "lookups/RSSIInterpolator.h" +#include "common/dmr/DMRUtils.h" +#include "common/p25/P25Utils.h" +#include "common/lookups/RSSIInterpolator.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Thread.h" +#include "common/ThreadFunc.h" +#include "common/Utils.h" #include "host/Host.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "StopWatch.h" -#include "Thread.h" -#include "ThreadFunc.h" -#include "Utils.h" using namespace modem; using namespace lookups; diff --git a/src/host/Host.h b/src/host/Host.h index e500cbf7..6bd73607 100644 --- a/src/host/Host.h +++ b/src/host/Host.h @@ -32,18 +32,18 @@ #define __HOST_H__ #include "Defines.h" +#include "common/Timer.h" +#include "common/lookups/AffiliationLookup.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/yaml/Yaml.h" #include "dmr/Control.h" #include "p25/Control.h" #include "nxdn/Control.h" #include "network/Network.h" #include "network/RESTAPI.h" #include "modem/Modem.h" -#include "Timer.h" -#include "lookups/AffiliationLookup.h" -#include "lookups/IdenTableLookup.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" -#include "yaml/Yaml.h" #include #include diff --git a/src/HostMain.cpp b/src/host/HostMain.cpp similarity index 90% rename from src/HostMain.cpp rename to src/host/HostMain.cpp index 485b52b3..02b742b9 100644 --- a/src/HostMain.cpp +++ b/src/host/HostMain.cpp @@ -29,12 +29,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/Log.h" #include "HostMain.h" -#include "host/Host.h" -#include "host/calibrate/HostCal.h" -#include "host/setup/HostSetup.h" -#include "host/fne/HostFNE.h" -#include "Log.h" +#include "Host.h" +#include "calibrate/HostCal.h" +#include "setup/HostSetup.h" +#include "ActivityLog.h" using namespace network; using namespace modem; @@ -83,7 +83,6 @@ using namespace lookups; int g_signal = 0; bool g_calibrate = false; bool g_setup = false; -bool g_fne = false; std::string g_progExe = std::string(__EXE_NAME__); std::string g_iniFile = std::string(DEFAULT_CONF_FILE); std::string g_lockFile = std::string(DEFAULT_LOCK_FILE); @@ -163,7 +162,6 @@ void usage(const char* message, const char* arg) #else "[--cal]" #endif - "[--fne]" "[-c ]" "[--remote [-a
] [-p ]]" "\n\n" @@ -177,8 +175,6 @@ void usage(const char* message, const char* arg) #else " --cal old calibration mode\n" #endif - "\n" - " --fne fixed network equipment mode (conference bridge)\n" "\n" " -c specifies the configuration file to use\n" "\n" @@ -231,9 +227,6 @@ int checkArgs(int argc, char* argv[]) g_calibrate = true; #endif // defined(ENABLE_SETUP_TUI) } - else if (IS("--fne")) { - g_fne = true; - } else if (IS("-c")) { if (argc-- <= 0) usage("error: %s", "must specify the configuration file to use"); @@ -269,7 +262,7 @@ int checkArgs(int argc, char* argv[]) } else if (IS("-v")) { ::fprintf(stdout, __PROG_NAME__ " %s (" DESCR_DMR DESCR_P25 DESCR_NXDN "CW Id, Network) (built %s)\n", __VER__, __BUILD__); - ::fprintf(stdout, "Copyright (c) 2017-2023 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n"); if (argc == 2) exit(EXIT_SUCCESS); @@ -329,35 +322,28 @@ int main(int argc, char** argv) g_signal = 0; g_killed = false; - if (g_fne) { - HostFNE *fne = new HostFNE(g_iniFile); - ret = fne->run(); - delete fne; - } - else { - if (g_calibrate || g_setup) { + if (g_calibrate || g_setup) { #if defined(ENABLE_SETUP_TUI) - if (g_setup) { - HostSetup* setup = new HostSetup(g_iniFile); - ret = setup->run(argc, argv); - delete setup; - } - else { - HostCal* cal = new HostCal(g_iniFile); - ret = cal->run(argc, argv); - delete cal; - } -#else + if (g_setup) { + HostSetup* setup = new HostSetup(g_iniFile); + ret = setup->run(argc, argv); + delete setup; + } + else { HostCal* cal = new HostCal(g_iniFile); ret = cal->run(argc, argv); delete cal; -#endif // defined(ENABLE_SETUP_TUI) - } - else { - Host* host = new Host(g_iniFile); - ret = host->run(); - delete host; } +#else + HostCal* cal = new HostCal(g_iniFile); + ret = cal->run(argc, argv); + delete cal; +#endif // defined(ENABLE_SETUP_TUI) + } + else { + Host* host = new Host(g_iniFile); + ret = host->run(); + delete host; } if (g_signal == 2) diff --git a/src/HostMain.h b/src/host/HostMain.h similarity index 100% rename from src/HostMain.h rename to src/host/HostMain.h diff --git a/src/host/calibrate/HostCal.cpp b/src/host/calibrate/HostCal.cpp index 056050ff..bdabf908 100644 --- a/src/host/calibrate/HostCal.cpp +++ b/src/host/calibrate/HostCal.cpp @@ -29,10 +29,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "host/calibrate/HostCal.h" +#include "calibrate/HostCal.h" #include "modem/Modem.h" #include "HostMain.h" -#include "Log.h" +#include "common/Log.h" using namespace modem; using namespace lookups; diff --git a/src/dmr/Control.cpp b/src/host/dmr/Control.cpp similarity index 99% rename from src/dmr/Control.cpp rename to src/host/dmr/Control.cpp index 3f0812df..3b964a85 100644 --- a/src/dmr/Control.cpp +++ b/src/host/dmr/Control.cpp @@ -24,11 +24,11 @@ * GNU General Public License for more details. */ #include "Defines.h" +#include "common/dmr/acl/AccessControl.h" +#include "common/dmr/lc/CSBK.h" +#include "common/dmr/lc/csbk/CSBKFactory.h" +#include "common/Log.h" #include "dmr/Control.h" -#include "dmr/acl/AccessControl.h" -#include "dmr/lc/CSBK.h" -#include "dmr/lc/csbk/CSBKFactory.h" -#include "Log.h" using namespace dmr; diff --git a/src/dmr/Control.h b/src/host/dmr/Control.h similarity index 96% rename from src/dmr/Control.h rename to src/host/dmr/Control.h index f9e6a417..905f012f 100644 --- a/src/dmr/Control.h +++ b/src/host/dmr/Control.h @@ -32,16 +32,16 @@ #define __DMR_CONTROL_H__ #include "Defines.h" -#include "dmr/data/Data.h" +#include "common/dmr/data/Data.h" +#include "common/lookups/RSSIInterpolator.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/yaml/Yaml.h" #include "dmr/lookups/DMRAffiliationLookup.h" #include "dmr/Slot.h" #include "modem/Modem.h" #include "network/Network.h" -#include "lookups/RSSIInterpolator.h" -#include "lookups/IdenTableLookup.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" -#include "yaml/Yaml.h" namespace dmr { diff --git a/src/dmr/Slot.cpp b/src/host/dmr/Slot.cpp similarity index 99% rename from src/dmr/Slot.cpp rename to src/host/dmr/Slot.cpp index 9f838b2b..3152c8d3 100644 --- a/src/dmr/Slot.cpp +++ b/src/host/dmr/Slot.cpp @@ -24,18 +24,19 @@ * GNU General Public License for more details. */ #include "Defines.h" +#include "common/dmr/lc/FullLC.h" +#include "common/dmr/lc/ShortLC.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/Log.h" +#include "common/Utils.h" #include "dmr/Slot.h" -#include "dmr/acl/AccessControl.h" -#include "dmr/lc/FullLC.h" -#include "dmr/lc/ShortLC.h" -#include "dmr/lc/CSBK.h" -#include "dmr/SlotType.h" -#include "dmr/Sync.h" -#include "edac/BPTC19696.h" -#include "edac/CRC.h" +#include "common/dmr/acl/AccessControl.h" #include "remote/RESTClient.h" -#include "Log.h" -#include "Utils.h" +#include "ActivityLog.h" using namespace dmr; using namespace dmr::packet; diff --git a/src/dmr/Slot.h b/src/host/dmr/Slot.h similarity index 97% rename from src/dmr/Slot.h rename to src/host/dmr/Slot.h index efc220fd..3b36576c 100644 --- a/src/dmr/Slot.h +++ b/src/host/dmr/Slot.h @@ -32,21 +32,21 @@ #define __DMR_SLOT_H__ #include "Defines.h" +#include "common/dmr/SiteData.h" +#include "common/lookups/RSSIInterpolator.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/RingBuffer.h" +#include "common/StopWatch.h" +#include "common/Timer.h" #include "dmr/Control.h" -#include "dmr/SiteData.h" #include "dmr/lookups/DMRAffiliationLookup.h" #include "dmr/packet/ControlSignaling.h" #include "dmr/packet/Data.h" #include "dmr/packet/Voice.h" #include "modem/Modem.h" #include "network/Network.h" -#include "lookups/RSSIInterpolator.h" -#include "lookups/IdenTableLookup.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" -#include "RingBuffer.h" -#include "StopWatch.h" -#include "Timer.h" #include diff --git a/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp b/src/host/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp similarity index 98% rename from src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp rename to src/host/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp index b4f3ca2b..d9136c37 100644 --- a/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp +++ b/src/host/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp @@ -24,10 +24,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/Log.h" +#include "common/Utils.h" #include "dmr/lc/csbk/CSBK_DVM_GIT_HASH.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace dmr::lc::csbk; using namespace dmr::lc; diff --git a/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h b/src/host/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h similarity index 98% rename from src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h rename to src/host/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h index 6219f2e9..a208c587 100644 --- a/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h +++ b/src/host/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h @@ -27,7 +27,7 @@ #define __DMR_LC_CSBK__CSBK_DVM_GIT_HASH_H__ #include "Defines.h" -#include "dmr/lc/CSBK.h" +#include "common/dmr/lc/CSBK.h" namespace dmr { diff --git a/src/dmr/lookups/DMRAffiliationLookup.cpp b/src/host/dmr/lookups/DMRAffiliationLookup.cpp similarity index 99% rename from src/dmr/lookups/DMRAffiliationLookup.cpp rename to src/host/dmr/lookups/DMRAffiliationLookup.cpp index f0d4015d..358d5e60 100644 --- a/src/dmr/lookups/DMRAffiliationLookup.cpp +++ b/src/host/dmr/lookups/DMRAffiliationLookup.cpp @@ -23,8 +23,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "common/Log.h" #include "dmr/lookups/DMRAffiliationLookup.h" -#include "Log.h" using namespace dmr::lookups; diff --git a/src/dmr/lookups/DMRAffiliationLookup.h b/src/host/dmr/lookups/DMRAffiliationLookup.h similarity index 98% rename from src/dmr/lookups/DMRAffiliationLookup.h rename to src/host/dmr/lookups/DMRAffiliationLookup.h index b20086f3..6198d4f4 100644 --- a/src/dmr/lookups/DMRAffiliationLookup.h +++ b/src/host/dmr/lookups/DMRAffiliationLookup.h @@ -27,7 +27,7 @@ #define __DMR_AFFILIATION_LOOKUP_H__ #include "Defines.h" -#include "lookups/AffiliationLookup.h" +#include "common/lookups/AffiliationLookup.h" #include diff --git a/src/dmr/packet/ControlSignaling.cpp b/src/host/dmr/packet/ControlSignaling.cpp similarity index 99% rename from src/dmr/packet/ControlSignaling.cpp rename to src/host/dmr/packet/ControlSignaling.cpp index a53eb86f..20b5cc37 100644 --- a/src/dmr/packet/ControlSignaling.cpp +++ b/src/host/dmr/packet/ControlSignaling.cpp @@ -24,22 +24,24 @@ * GNU General Public License for more details. */ #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" #include "dmr/packet/ControlSignaling.h" -#include "dmr/acl/AccessControl.h" -#include "dmr/data/DataHeader.h" -#include "dmr/data/EMB.h" -#include "dmr/lc/ShortLC.h" -#include "dmr/lc/FullLC.h" -#include "dmr/lc/CSBK.h" -#include "dmr/lc/csbk/CSBKFactory.h" #include "dmr/Slot.h" -#include "dmr/SlotType.h" -#include "dmr/Sync.h" -#include "edac/BPTC19696.h" -#include "edac/CRC.h" #include "remote/RESTClient.h" -#include "Log.h" -#include "Utils.h" +#include "ActivityLog.h" using namespace dmr; using namespace dmr::lc::csbk; diff --git a/src/dmr/packet/ControlSignaling.h b/src/host/dmr/packet/ControlSignaling.h similarity index 95% rename from src/dmr/packet/ControlSignaling.h rename to src/host/dmr/packet/ControlSignaling.h index 13c35fb0..7ea95035 100644 --- a/src/dmr/packet/ControlSignaling.h +++ b/src/host/dmr/packet/ControlSignaling.h @@ -32,15 +32,15 @@ #define __DMR_PACKET_CONTROL_SIGNALING_H__ #include "Defines.h" -#include "dmr/data/Data.h" -#include "dmr/data/EmbeddedData.h" -#include "dmr/lc/LC.h" -#include "dmr/lc/CSBK.h" +#include "common/dmr/data/Data.h" +#include "common/dmr/data/EmbeddedData.h" +#include "common/dmr/lc/LC.h" +#include "common/dmr/lc/CSBK.h" +#include "common/network/BaseNetwork.h" +#include "common/RingBuffer.h" +#include "common/StopWatch.h" +#include "common/Timer.h" #include "modem/Modem.h" -#include "network/BaseNetwork.h" -#include "RingBuffer.h" -#include "StopWatch.h" -#include "Timer.h" #include diff --git a/src/dmr/packet/Data.cpp b/src/host/dmr/packet/Data.cpp similarity index 98% rename from src/dmr/packet/Data.cpp rename to src/host/dmr/packet/Data.cpp index 82fe1da6..6970a69f 100644 --- a/src/dmr/packet/Data.cpp +++ b/src/host/dmr/packet/Data.cpp @@ -24,20 +24,21 @@ * GNU General Public License for more details. */ #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" #include "dmr/packet/Data.h" -#include "dmr/acl/AccessControl.h" -#include "dmr/data/EMB.h" -#include "dmr/lc/ShortLC.h" -#include "dmr/lc/FullLC.h" -#include "dmr/lc/CSBK.h" #include "dmr/Slot.h" -#include "dmr/SlotType.h" -#include "dmr/Sync.h" -#include "edac/BPTC19696.h" -#include "edac/CRC.h" -#include "edac/Trellis.h" -#include "Log.h" -#include "Utils.h" +#include "ActivityLog.h" using namespace dmr; using namespace dmr::packet; diff --git a/src/dmr/packet/Data.h b/src/host/dmr/packet/Data.h similarity index 91% rename from src/dmr/packet/Data.h rename to src/host/dmr/packet/Data.h index 9f688e05..ea8512e9 100644 --- a/src/dmr/packet/Data.h +++ b/src/host/dmr/packet/Data.h @@ -32,16 +32,16 @@ #define __DMR_PACKET_DATA_H__ #include "Defines.h" -#include "dmr/data/Data.h" -#include "dmr/data/DataHeader.h" -#include "dmr/data/EmbeddedData.h" -#include "dmr/lc/LC.h" -#include "edac/AMBEFEC.h" +#include "common/dmr/data/Data.h" +#include "common/dmr/data/DataHeader.h" +#include "common/dmr/data/EmbeddedData.h" +#include "common/dmr/lc/LC.h" +#include "common/edac/AMBEFEC.h" +#include "common/network/BaseNetwork.h" +#include "common/RingBuffer.h" +#include "common/StopWatch.h" +#include "common/Timer.h" #include "modem/Modem.h" -#include "network/BaseNetwork.h" -#include "RingBuffer.h" -#include "StopWatch.h" -#include "Timer.h" #include diff --git a/src/dmr/packet/Voice.cpp b/src/host/dmr/packet/Voice.cpp similarity index 99% rename from src/dmr/packet/Voice.cpp rename to src/host/dmr/packet/Voice.cpp index b505348a..258202e7 100644 --- a/src/dmr/packet/Voice.cpp +++ b/src/host/dmr/packet/Voice.cpp @@ -24,21 +24,22 @@ * GNU General Public License for more details. */ #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/acl/AccessControl.h" -#include "dmr/data/DataHeader.h" -#include "dmr/data/EMB.h" -#include "dmr/lc/CSBK.h" -#include "dmr/lc/ShortLC.h" -#include "dmr/lc/FullLC.h" #include "dmr/Slot.h" -#include "dmr/SlotType.h" -#include "dmr/Sync.h" -#include "edac/BPTC19696.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "ActivityLog.h" using namespace dmr; using namespace dmr::packet; diff --git a/src/dmr/packet/Voice.h b/src/host/dmr/packet/Voice.h similarity index 94% rename from src/dmr/packet/Voice.h rename to src/host/dmr/packet/Voice.h index fbf5f2d0..3721c72f 100644 --- a/src/dmr/packet/Voice.h +++ b/src/host/dmr/packet/Voice.h @@ -32,12 +32,12 @@ #define __DMR_PACKET_VOICE_H__ #include "Defines.h" -#include "dmr/data/Data.h" -#include "dmr/data/EmbeddedData.h" -#include "dmr/lc/LC.h" -#include "dmr/lc/PrivacyLC.h" -#include "edac/AMBEFEC.h" -#include "network/BaseNetwork.h" +#include "common/dmr/data/Data.h" +#include "common/dmr/data/EmbeddedData.h" +#include "common/dmr/lc/LC.h" +#include "common/dmr/lc/PrivacyLC.h" +#include "common/edac/AMBEFEC.h" +#include "common/network/BaseNetwork.h" #include diff --git a/src/modem/Modem.cpp b/src/host/modem/Modem.cpp similarity index 99% rename from src/modem/Modem.cpp rename to src/host/modem/Modem.cpp index 60cbb415..9008040b 100644 --- a/src/modem/Modem.cpp +++ b/src/host/modem/Modem.cpp @@ -30,14 +30,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "dmr/DMRDefines.h" -#include "p25/P25Defines.h" -#include "nxdn/NXDNDefines.h" +#include "common/dmr/DMRDefines.h" +#include "common/p25/P25Defines.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Thread.h" +#include "common/Utils.h" #include "modem/Modem.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Thread.h" -#include "Utils.h" using namespace modem; diff --git a/src/modem/Modem.h b/src/host/modem/Modem.h similarity index 99% rename from src/modem/Modem.h rename to src/host/modem/Modem.h index aa343fd7..010f15d1 100644 --- a/src/modem/Modem.h +++ b/src/host/modem/Modem.h @@ -33,10 +33,10 @@ #define __MODEM_H__ #include "Defines.h" +#include "common/RingBuffer.h" +#include "common/Timer.h" #include "modem/port/IModemPort.h" #include "network/RESTAPI.h" -#include "RingBuffer.h" -#include "Timer.h" #include #include diff --git a/src/modem/port/IModemPort.cpp b/src/host/modem/port/IModemPort.cpp similarity index 100% rename from src/modem/port/IModemPort.cpp rename to src/host/modem/port/IModemPort.cpp diff --git a/src/modem/port/IModemPort.h b/src/host/modem/port/IModemPort.h similarity index 100% rename from src/modem/port/IModemPort.h rename to src/host/modem/port/IModemPort.h diff --git a/src/modem/port/ISerialPort.cpp b/src/host/modem/port/ISerialPort.cpp similarity index 100% rename from src/modem/port/ISerialPort.cpp rename to src/host/modem/port/ISerialPort.cpp diff --git a/src/modem/port/ISerialPort.h b/src/host/modem/port/ISerialPort.h similarity index 100% rename from src/modem/port/ISerialPort.h rename to src/host/modem/port/ISerialPort.h diff --git a/src/modem/port/ModemNullPort.cpp b/src/host/modem/port/ModemNullPort.cpp similarity index 100% rename from src/modem/port/ModemNullPort.cpp rename to src/host/modem/port/ModemNullPort.cpp diff --git a/src/modem/port/ModemNullPort.h b/src/host/modem/port/ModemNullPort.h similarity index 98% rename from src/modem/port/ModemNullPort.h rename to src/host/modem/port/ModemNullPort.h index 47bf37e7..ddb99f51 100644 --- a/src/modem/port/ModemNullPort.h +++ b/src/host/modem/port/ModemNullPort.h @@ -32,8 +32,8 @@ #define __MODEM_NULL_PORT_H__ #include "Defines.h" +#include "common/RingBuffer.h" #include "modem/port/IModemPort.h" -#include "RingBuffer.h" namespace modem { diff --git a/src/modem/port/PseudoPTYPort.cpp b/src/host/modem/port/PseudoPTYPort.cpp similarity index 99% rename from src/modem/port/PseudoPTYPort.cpp rename to src/host/modem/port/PseudoPTYPort.cpp index 567289f5..30b5fda5 100644 --- a/src/modem/port/PseudoPTYPort.cpp +++ b/src/host/modem/port/PseudoPTYPort.cpp @@ -27,8 +27,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "common/Log.h" #include "modem/port/PseudoPTYPort.h" -#include "Log.h" #include #include diff --git a/src/modem/port/PseudoPTYPort.h b/src/host/modem/port/PseudoPTYPort.h similarity index 100% rename from src/modem/port/PseudoPTYPort.h rename to src/host/modem/port/PseudoPTYPort.h diff --git a/src/modem/port/UARTPort.cpp b/src/host/modem/port/UARTPort.cpp similarity index 99% rename from src/modem/port/UARTPort.cpp rename to src/host/modem/port/UARTPort.cpp index de168d29..0fc46c6e 100644 --- a/src/modem/port/UARTPort.cpp +++ b/src/host/modem/port/UARTPort.cpp @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/Log.h" #include "modem/port/UARTPort.h" -#include "Log.h" using namespace modem::port; diff --git a/src/modem/port/UARTPort.h b/src/host/modem/port/UARTPort.h similarity index 100% rename from src/modem/port/UARTPort.h rename to src/host/modem/port/UARTPort.h diff --git a/src/modem/port/UDPPort.cpp b/src/host/modem/port/UDPPort.cpp similarity index 98% rename from src/modem/port/UDPPort.cpp rename to src/host/modem/port/UDPPort.cpp index 2425a4d2..64d7e2e5 100644 --- a/src/modem/port/UDPPort.cpp +++ b/src/host/modem/port/UDPPort.cpp @@ -29,9 +29,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/Log.h" +#include "common/Utils.h" #include "modem/port/UDPPort.h" -#include "Log.h" -#include "Utils.h" using namespace modem::port; using namespace network; diff --git a/src/modem/port/UDPPort.h b/src/host/modem/port/UDPPort.h similarity index 97% rename from src/modem/port/UDPPort.h rename to src/host/modem/port/UDPPort.h index f934ceba..7fc7c9dc 100644 --- a/src/modem/port/UDPPort.h +++ b/src/host/modem/port/UDPPort.h @@ -32,9 +32,9 @@ #define __UDP_PORT_H__ #include "Defines.h" +#include "common/network/UDPSocket.h" +#include "common/RingBuffer.h" #include "modem/port/IModemPort.h" -#include "RingBuffer.h" -#include "network/UDPSocket.h" #include diff --git a/src/network/Network.cpp b/src/host/network/Network.cpp similarity index 99% rename from src/network/Network.cpp rename to src/host/network/Network.cpp index 47cf1efb..71340fa3 100644 --- a/src/network/Network.cpp +++ b/src/host/network/Network.cpp @@ -29,14 +29,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "edac/SHA256.h" +#include "common/edac/SHA256.h" +#include "common/network/RTPHeader.h" +#include "common/network/RTPFNEHeader.h" +#include "common/network/json/json.h" +#include "common/Log.h" +#include "common/StopWatch.h" +#include "common/Utils.h" #include "network/Network.h" -#include "network/RTPHeader.h" -#include "network/RTPFNEHeader.h" -#include "network/json/json.h" -#include "Log.h" -#include "StopWatch.h" -#include "Utils.h" using namespace network; diff --git a/src/network/Network.h b/src/host/network/Network.h similarity index 97% rename from src/network/Network.h rename to src/host/network/Network.h index eaedce47..18d1bc49 100644 --- a/src/network/Network.h +++ b/src/host/network/Network.h @@ -32,9 +32,9 @@ #define __NETWORK_H__ #include "Defines.h" -#include "network/BaseNetwork.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" +#include "common/network/BaseNetwork.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" #include #include diff --git a/src/network/RESTAPI.cpp b/src/host/network/RESTAPI.cpp similarity index 99% rename from src/network/RESTAPI.cpp rename to src/host/network/RESTAPI.cpp index a0d74d91..47f0de8f 100644 --- a/src/network/RESTAPI.cpp +++ b/src/host/network/RESTAPI.cpp @@ -28,19 +28,19 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "edac/SHA256.h" +#include "common/edac/SHA256.h" +#include "common/lookups/AffiliationLookup.h" +#include "common/network/json/json.h" +#include "common/Log.h" +#include "common/Thread.h" +#include "common/Utils.h" #include "dmr/Control.h" #include "p25/Control.h" #include "nxdn/Control.h" -#include "lookups/AffiliationLookup.h" #include "modem/Modem.h" -#include "host/Host.h" -#include "network/json/json.h" -#include "RESTAPI.h" +#include "network/RESTAPI.h" +#include "Host.h" #include "HostMain.h" -#include "Log.h" -#include "Thread.h" -#include "Utils.h" using namespace network; using namespace network::rest; diff --git a/src/network/RESTAPI.h b/src/host/network/RESTAPI.h similarity index 97% rename from src/network/RESTAPI.h rename to src/host/network/RESTAPI.h index 43b5b8de..e1d85ef4 100644 --- a/src/network/RESTAPI.h +++ b/src/host/network/RESTAPI.h @@ -27,13 +27,13 @@ #define __REST_API_H__ #include "Defines.h" -#include "network/UDPSocket.h" +#include "common/network/UDPSocket.h" +#include "common/network/rest/RequestDispatcher.h" +#include "common/network/rest/http/HTTPServer.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/Thread.h" #include "network/RESTDefines.h" -#include "network/rest/RequestDispatcher.h" -#include "network/rest/http/HTTPServer.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" -#include "Thread.h" #include #include diff --git a/src/network/RESTDefines.h b/src/host/network/RESTDefines.h similarity index 100% rename from src/network/RESTDefines.h rename to src/host/network/RESTDefines.h diff --git a/src/nxdn/Audio.cpp b/src/host/nxdn/Audio.cpp similarity index 99% rename from src/nxdn/Audio.cpp rename to src/host/nxdn/Audio.cpp index 342de132..74d9dc1a 100644 --- a/src/nxdn/Audio.cpp +++ b/src/host/nxdn/Audio.cpp @@ -29,7 +29,7 @@ */ #include "nxdn/Audio.h" -#include "edac/Golay24128.h" +#include "common/edac/Golay24128.h" using namespace nxdn; using namespace edac; diff --git a/src/nxdn/Audio.h b/src/host/nxdn/Audio.h similarity index 100% rename from src/nxdn/Audio.h rename to src/host/nxdn/Audio.h diff --git a/src/nxdn/Control.cpp b/src/host/nxdn/Control.cpp similarity index 98% rename from src/nxdn/Control.cpp rename to src/host/nxdn/Control.cpp index 165db438..7223bec8 100644 --- a/src/nxdn/Control.cpp +++ b/src/host/nxdn/Control.cpp @@ -29,20 +29,21 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "nxdn/NXDNDefines.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/acl/AccessControl.h" +#include "common/nxdn/channel/SACCH.h" +#include "common/nxdn/channel/FACCH1.h" +#include "common/nxdn/lc/RCCH.h" +#include "common/nxdn/lc/RTCH.h" +#include "common/nxdn/Sync.h" +#include "common/nxdn/NXDNUtils.h" +#include "common/edac/AMBEFEC.h" +#include "common/Log.h" +#include "common/Utils.h" #include "nxdn/Control.h" -#include "nxdn/acl/AccessControl.h" -#include "nxdn/channel/SACCH.h" -#include "nxdn/channel/FACCH1.h" -#include "nxdn/lc/RCCH.h" -#include "nxdn/lc/RTCH.h" -#include "nxdn/Sync.h" -#include "nxdn/NXDNUtils.h" -#include "edac/AMBEFEC.h" #include "remote/RESTClient.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace nxdn; using namespace nxdn::packet; diff --git a/src/nxdn/Control.h b/src/host/nxdn/Control.h similarity index 95% rename from src/nxdn/Control.h rename to src/host/nxdn/Control.h index 0a0ff4c0..b92adf5a 100644 --- a/src/nxdn/Control.h +++ b/src/host/nxdn/Control.h @@ -32,23 +32,23 @@ #define __NXDN_CONTROL_H__ #include "Defines.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/channel/LICH.h" -#include "nxdn/lc/RTCH.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/channel/LICH.h" +#include "common/nxdn/lc/RTCH.h" +#include "common/nxdn/SiteData.h" +#include "common/lookups/RSSIInterpolator.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/lookups/AffiliationLookup.h" +#include "common/RingBuffer.h" +#include "common/Timer.h" +#include "common/yaml/Yaml.h" #include "nxdn/packet/Voice.h" #include "nxdn/packet/ControlSignaling.h" #include "nxdn/packet/Data.h" -#include "nxdn/SiteData.h" #include "network/Network.h" -#include "lookups/RSSIInterpolator.h" -#include "lookups/IdenTableLookup.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" -#include "lookups/AffiliationLookup.h" #include "modem/Modem.h" -#include "RingBuffer.h" -#include "Timer.h" -#include "yaml/Yaml.h" #include #include diff --git a/src/nxdn/packet/ControlSignaling.cpp b/src/host/nxdn/packet/ControlSignaling.cpp similarity index 99% rename from src/nxdn/packet/ControlSignaling.cpp rename to src/host/nxdn/packet/ControlSignaling.cpp index 19aa9bdd..b9d03c9e 100644 --- a/src/nxdn/packet/ControlSignaling.cpp +++ b/src/host/nxdn/packet/ControlSignaling.cpp @@ -28,18 +28,19 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/channel/CAC.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/channel/CAC.h" +#include "common/nxdn/acl/AccessControl.h" +#include "common/nxdn/lc/rcch/RCCHFactory.h" +#include "common/nxdn/Sync.h" +#include "common/nxdn/NXDNUtils.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" #include "nxdn/packet/ControlSignaling.h" -#include "nxdn/acl/AccessControl.h" -#include "nxdn/lc/rcch/RCCHFactory.h" -#include "nxdn/Sync.h" -#include "nxdn/NXDNUtils.h" -#include "edac/CRC.h" #include "remote/RESTClient.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace nxdn; using namespace nxdn::lc; diff --git a/src/nxdn/packet/ControlSignaling.h b/src/host/nxdn/packet/ControlSignaling.h similarity index 99% rename from src/nxdn/packet/ControlSignaling.h rename to src/host/nxdn/packet/ControlSignaling.h index d7967c53..d6ca46d3 100644 --- a/src/nxdn/packet/ControlSignaling.h +++ b/src/host/nxdn/packet/ControlSignaling.h @@ -31,8 +31,8 @@ #define __NXDN_PACKET_CONTROL_SIGNALING_H__ #include "Defines.h" +#include "common/nxdn/lc/RCCH.h" #include "nxdn/Control.h" -#include "nxdn/lc/RCCH.h" #include #include diff --git a/src/nxdn/packet/Data.cpp b/src/host/nxdn/packet/Data.cpp similarity index 98% rename from src/nxdn/packet/Data.cpp rename to src/host/nxdn/packet/Data.cpp index 235935bb..5a8ad24c 100644 --- a/src/nxdn/packet/Data.cpp +++ b/src/host/nxdn/packet/Data.cpp @@ -29,16 +29,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/channel/UDCH.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/channel/UDCH.h" +#include "common/nxdn/acl/AccessControl.h" +#include "common/nxdn/Sync.h" +#include "common/nxdn/NXDNUtils.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" #include "nxdn/packet/Data.h" -#include "nxdn/acl/AccessControl.h" -#include "nxdn/Sync.h" -#include "nxdn/NXDNUtils.h" -#include "edac/CRC.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace nxdn; using namespace nxdn::packet; diff --git a/src/nxdn/packet/Data.h b/src/host/nxdn/packet/Data.h similarity index 100% rename from src/nxdn/packet/Data.h rename to src/host/nxdn/packet/Data.h diff --git a/src/nxdn/packet/Voice.cpp b/src/host/nxdn/packet/Voice.cpp similarity index 99% rename from src/nxdn/packet/Voice.cpp rename to src/host/nxdn/packet/Voice.cpp index 33aa9c90..9d28a557 100644 --- a/src/nxdn/packet/Voice.cpp +++ b/src/host/nxdn/packet/Voice.cpp @@ -29,18 +29,19 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/packet/Voice.h" -#include "nxdn/channel/FACCH1.h" -#include "nxdn/channel/SACCH.h" -#include "nxdn/acl/AccessControl.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/channel/FACCH1.h" +#include "common/nxdn/channel/SACCH.h" +#include "common/nxdn/acl/AccessControl.h" +#include "common/nxdn/Sync.h" +#include "common/nxdn/NXDNUtils.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" #include "nxdn/Audio.h" -#include "nxdn/Sync.h" -#include "nxdn/NXDNUtils.h" -#include "edac/CRC.h" +#include "nxdn/packet/Voice.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace nxdn; using namespace nxdn::packet; diff --git a/src/nxdn/packet/Voice.h b/src/host/nxdn/packet/Voice.h similarity index 100% rename from src/nxdn/packet/Voice.h rename to src/host/nxdn/packet/Voice.h diff --git a/src/p25/Control.cpp b/src/host/p25/Control.cpp similarity index 99% rename from src/p25/Control.cpp rename to src/host/p25/Control.cpp index c455d6d1..aeb46761 100644 --- a/src/p25/Control.cpp +++ b/src/host/p25/Control.cpp @@ -29,17 +29,18 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "p25/P25Defines.h" +#include "common/p25/P25Defines.h" +#include "common/p25/acl/AccessControl.h" +#include "common/p25/P25Utils.h" +#include "common/p25/Sync.h" +#include "common/edac/CRC.h" +#include "common/AESCrypto.h" +#include "common/Log.h" +#include "common/Utils.h" #include "p25/Control.h" -#include "p25/acl/AccessControl.h" -#include "p25/P25Utils.h" -#include "p25/Sync.h" -#include "edac/CRC.h" #include "remote/RESTClient.h" -#include "AESCrypto.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace p25; using namespace p25::packet; diff --git a/src/p25/Control.h b/src/host/p25/Control.h similarity index 97% rename from src/p25/Control.h rename to src/host/p25/Control.h index e2db6a68..86b96b51 100644 --- a/src/p25/Control.h +++ b/src/host/p25/Control.h @@ -32,21 +32,21 @@ #define __P25_CONTROL_H__ #include "Defines.h" -#include "p25/NID.h" -#include "p25/SiteData.h" +#include "common/p25/NID.h" +#include "common/lookups/RSSIInterpolator.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/lookups/RadioIdLookup.h" +#include "common/lookups/TalkgroupRulesLookup.h" +#include "common/p25/SiteData.h" +#include "common/RingBuffer.h" +#include "common/Timer.h" +#include "common/yaml/Yaml.h" #include "p25/packet/Data.h" #include "p25/packet/Voice.h" #include "p25/packet/ControlSignaling.h" #include "network/Network.h" -#include "lookups/RSSIInterpolator.h" -#include "lookups/IdenTableLookup.h" -#include "lookups/RadioIdLookup.h" -#include "lookups/TalkgroupRulesLookup.h" #include "p25/lookups/P25AffiliationLookup.h" #include "modem/Modem.h" -#include "RingBuffer.h" -#include "Timer.h" -#include "yaml/Yaml.h" #include #include diff --git a/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp b/src/host/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp similarity index 98% rename from src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp rename to src/host/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp index 7e94a317..2f54fd76 100644 --- a/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp +++ b/src/host/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp @@ -24,10 +24,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" +#include "common/Log.h" +#include "common/Utils.h" #include "p25/lc/tsbk/OSP_DVM_GIT_HASH.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace p25::lc::tsbk; using namespace p25::lc; diff --git a/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.h b/src/host/p25/lc/tsbk/OSP_DVM_GIT_HASH.h similarity index 98% rename from src/p25/lc/tsbk/OSP_DVM_GIT_HASH.h rename to src/host/p25/lc/tsbk/OSP_DVM_GIT_HASH.h index 433ef5c7..311fbbfe 100644 --- a/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.h +++ b/src/host/p25/lc/tsbk/OSP_DVM_GIT_HASH.h @@ -27,7 +27,7 @@ #define __P25_LC_TSBK__OSP_DVM_GIT_HASH_H__ #include "Defines.h" -#include "p25/lc/TSBK.h" +#include "common/p25/lc/TSBK.h" namespace p25 { diff --git a/src/p25/lookups/P25AffiliationLookup.cpp b/src/host/p25/lookups/P25AffiliationLookup.cpp similarity index 99% rename from src/p25/lookups/P25AffiliationLookup.cpp rename to src/host/p25/lookups/P25AffiliationLookup.cpp index 7c847c55..fa81314d 100644 --- a/src/p25/lookups/P25AffiliationLookup.cpp +++ b/src/host/p25/lookups/P25AffiliationLookup.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "common/Log.h" #include "p25/lookups/P25AffiliationLookup.h" #include "p25/packet/ControlSignaling.h" #include "p25/Control.h" -#include "Log.h" using namespace p25::lookups; diff --git a/src/p25/lookups/P25AffiliationLookup.h b/src/host/p25/lookups/P25AffiliationLookup.h similarity index 98% rename from src/p25/lookups/P25AffiliationLookup.h rename to src/host/p25/lookups/P25AffiliationLookup.h index 2dfd526e..885f3466 100644 --- a/src/p25/lookups/P25AffiliationLookup.h +++ b/src/host/p25/lookups/P25AffiliationLookup.h @@ -27,7 +27,7 @@ #define __P25_AFFILIATION_LOOKUP_H__ #include "Defines.h" -#include "lookups/AffiliationLookup.h" +#include "common/lookups/AffiliationLookup.h" namespace p25 { diff --git a/src/p25/packet/ControlSignaling.cpp b/src/host/p25/packet/ControlSignaling.cpp similarity index 99% rename from src/p25/packet/ControlSignaling.cpp rename to src/host/p25/packet/ControlSignaling.cpp index 0ab219a2..ccda0dbd 100644 --- a/src/p25/packet/ControlSignaling.cpp +++ b/src/host/p25/packet/ControlSignaling.cpp @@ -25,22 +25,24 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "p25/P25Defines.h" +#include "common/p25/P25Defines.h" +#include "common/p25/acl/AccessControl.h" +#include "common/p25/lc/tsbk/TSBKFactory.h" +#include "common/p25/lc/tdulc/TDULCFactory.h" +#include "common/p25/P25Utils.h" +#include "common/p25/Sync.h" +#include "common/edac/CRC.h" +#include "common/AESCrypto.h" +#include "common/Log.h" +#include "common/Thread.h" +#include "common/Utils.h" +#include "p25/lc/tsbk/OSP_DVM_GIT_HASH.h" #include "p25/packet/Voice.h" #include "p25/packet/ControlSignaling.h" -#include "p25/acl/AccessControl.h" -#include "p25/lc/tsbk/TSBKFactory.h" -#include "p25/lc/tdulc/TDULCFactory.h" #include "p25/lookups/P25AffiliationLookup.h" -#include "p25/P25Utils.h" -#include "p25/Sync.h" -#include "edac/CRC.h" #include "remote/RESTClient.h" -#include "AESCrypto.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Thread.h" -#include "Utils.h" using namespace p25; using namespace p25::data; diff --git a/src/p25/packet/ControlSignaling.h b/src/host/p25/packet/ControlSignaling.h similarity index 98% rename from src/p25/packet/ControlSignaling.h rename to src/host/p25/packet/ControlSignaling.h index 4d387327..6f6ea424 100644 --- a/src/p25/packet/ControlSignaling.h +++ b/src/host/p25/packet/ControlSignaling.h @@ -27,13 +27,13 @@ #define __P25_PACKET_CONTROL_SIGNALING_H__ #include "Defines.h" -#include "p25/data/DataHeader.h" -#include "p25/data/DataBlock.h" -#include "p25/lc/TSBK.h" -#include "p25/lc/AMBT.h" -#include "p25/lc/TDULC.h" +#include "common/p25/data/DataHeader.h" +#include "common/p25/data/DataBlock.h" +#include "common/p25/lc/TSBK.h" +#include "common/p25/lc/AMBT.h" +#include "common/p25/lc/TDULC.h" +#include "common/Timer.h" #include "p25/Control.h" -#include "Timer.h" #include #include diff --git a/src/p25/packet/Data.cpp b/src/host/p25/packet/Data.cpp similarity index 99% rename from src/p25/packet/Data.cpp rename to src/host/p25/packet/Data.cpp index 952bcef5..45788ac9 100644 --- a/src/p25/packet/Data.cpp +++ b/src/host/p25/packet/Data.cpp @@ -29,16 +29,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "p25/P25Defines.h" -#include "p25/packet/Data.h" +#include "common/p25/P25Defines.h" +#include "common/p25/acl/AccessControl.h" +#include "common/p25/P25Utils.h" +#include "common/p25/Sync.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" #include "p25/packet/ControlSignaling.h" -#include "p25/acl/AccessControl.h" -#include "p25/P25Utils.h" -#include "p25/Sync.h" -#include "edac/CRC.h" +#include "p25/packet/Data.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace p25; using namespace p25::data; diff --git a/src/p25/packet/Data.h b/src/host/p25/packet/Data.h similarity index 96% rename from src/p25/packet/Data.h rename to src/host/p25/packet/Data.h index cd1b85eb..f8d2a34d 100644 --- a/src/p25/packet/Data.h +++ b/src/host/p25/packet/Data.h @@ -32,12 +32,12 @@ #define __P25_PACKET_DATA_H__ #include "Defines.h" -#include "p25/data/DataBlock.h" -#include "p25/data/DataHeader.h" -#include "p25/data/LowSpeedData.h" -#include "p25/lc/LC.h" +#include "common/p25/data/DataBlock.h" +#include "common/p25/data/DataHeader.h" +#include "common/p25/data/LowSpeedData.h" +#include "common/p25/lc/LC.h" +#include "common/Timer.h" #include "p25/Control.h" -#include "Timer.h" #include #include diff --git a/src/p25/packet/Voice.cpp b/src/host/p25/packet/Voice.cpp similarity index 99% rename from src/p25/packet/Voice.cpp rename to src/host/p25/packet/Voice.cpp index 72a63a19..004cb6b6 100644 --- a/src/p25/packet/Voice.cpp +++ b/src/host/p25/packet/Voice.cpp @@ -29,20 +29,21 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "p25/P25Defines.h" +#include "common/p25/P25Defines.h" +#include "common/p25/acl/AccessControl.h" +#include "common/p25/dfsi/DFSIDefines.h" +#include "common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h" +#include "common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h" +#include "common/p25/lc/tdulc/TDULCFactory.h" +#include "common/p25/P25Utils.h" +#include "common/p25/Sync.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" #include "p25/packet/Voice.h" #include "p25/packet/ControlSignaling.h" -#include "p25/acl/AccessControl.h" -#include "p25/dfsi/DFSIDefines.h" -#include "p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h" -#include "p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h" -#include "p25/lc/tdulc/TDULCFactory.h" -#include "p25/P25Utils.h" -#include "p25/Sync.h" -#include "edac/CRC.h" +#include "ActivityLog.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace p25; using namespace p25::packet; diff --git a/src/p25/packet/Voice.h b/src/host/p25/packet/Voice.h similarity index 97% rename from src/p25/packet/Voice.h rename to src/host/p25/packet/Voice.h index 3453c76c..071c143b 100644 --- a/src/p25/packet/Voice.h +++ b/src/host/p25/packet/Voice.h @@ -32,11 +32,11 @@ #define __P25_PACKET_VOICE_H__ #include "Defines.h" -#include "p25/data/LowSpeedData.h" -#include "p25/dfsi/LC.h" -#include "p25/lc/LC.h" +#include "common/p25/data/LowSpeedData.h" +#include "common/p25/dfsi/LC.h" +#include "common/p25/lc/LC.h" +#include "common/p25/Audio.h" #include "p25/Control.h" -#include "p25/Audio.h" #include #include diff --git a/src/host/setup/AdjustWndBase.h b/src/host/setup/AdjustWndBase.h index 8a7dd73d..36305a8f 100644 --- a/src/host/setup/AdjustWndBase.h +++ b/src/host/setup/AdjustWndBase.h @@ -26,8 +26,8 @@ #if !defined(__ADJUST_WND_BASE_H__) #define __ADJUST_WND_BASE_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" #include using namespace finalcut; diff --git a/src/host/setup/BERDisplayWnd.h b/src/host/setup/BERDisplayWnd.h index 50df7837..d66df2f2 100644 --- a/src/host/setup/BERDisplayWnd.h +++ b/src/host/setup/BERDisplayWnd.h @@ -31,7 +31,7 @@ #if !defined(__BER_DISPLAY_WND_H__) #define __BER_DISPLAY_WND_H__ -#include "host/setup/HostSetup.h" +#include "setup/HostSetup.h" #include #include diff --git a/src/host/setup/ChannelConfigSetWnd.h b/src/host/setup/ChannelConfigSetWnd.h index addb339f..6b8c1146 100644 --- a/src/host/setup/ChannelConfigSetWnd.h +++ b/src/host/setup/ChannelConfigSetWnd.h @@ -26,10 +26,10 @@ #if !defined(__CHANNEL_CONFIG_SET_WND_H__) #define __CHANNEL_CONFIG_SET_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/CloseWndBase.h" +#include "setup/CloseWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/CloseWndBase.h b/src/host/setup/CloseWndBase.h index 9f43bbf8..be72b7f4 100644 --- a/src/host/setup/CloseWndBase.h +++ b/src/host/setup/CloseWndBase.h @@ -26,8 +26,8 @@ #if !defined(__CLOSE_WND_BASE_H__) #define __CLOSE_WND_BASE_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" #include using namespace finalcut; diff --git a/src/host/setup/FIFOBufferAdjustWnd.h b/src/host/setup/FIFOBufferAdjustWnd.h index e59d81fa..e1a8e29f 100644 --- a/src/host/setup/FIFOBufferAdjustWnd.h +++ b/src/host/setup/FIFOBufferAdjustWnd.h @@ -26,10 +26,10 @@ #if !defined(__FIFO_BUFFER_ADJUST_WND_H__) #define __FIFO_BUFFER_ADJUST_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/CloseWndBase.h" +#include "setup/CloseWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/HSBandwidthAdjustWnd.h b/src/host/setup/HSBandwidthAdjustWnd.h index 0e13215b..47380ed1 100644 --- a/src/host/setup/HSBandwidthAdjustWnd.h +++ b/src/host/setup/HSBandwidthAdjustWnd.h @@ -26,10 +26,10 @@ #if !defined(__HS_BANDWIDTH_ADJUST_WND_H__) #define __HS_BANDWIDTH_ADJUST_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/AdjustWndBase.h" +#include "setup/AdjustWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/HSGainAdjustWnd.h b/src/host/setup/HSGainAdjustWnd.h index 2ab858e2..c489e031 100644 --- a/src/host/setup/HSGainAdjustWnd.h +++ b/src/host/setup/HSGainAdjustWnd.h @@ -26,10 +26,10 @@ #if !defined(__HS_GAIN_ADJUST_WND_H__) #define __HS_GAIN_ADJUST_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/AdjustWndBase.h" +#include "setup/AdjustWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/HostSetup.cpp b/src/host/setup/HostSetup.cpp index f9f9a7dd..e768b1c7 100644 --- a/src/host/setup/HostSetup.cpp +++ b/src/host/setup/HostSetup.cpp @@ -23,25 +23,25 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "dmr/DMRDefines.h" -#include "dmr/DMRUtils.h" +#include "common/dmr/DMRDefines.h" +#include "common/dmr/DMRUtils.h" +#include "common/p25/P25Defines.h" +#include "common/p25/data/DataHeader.h" +#include "common/p25/lc/LC.h" +#include "common/p25/lc/tsbk/TSBKFactory.h" +#include "common/p25/NID.h" +#include "common/p25/Sync.h" +#include "common/p25/P25Utils.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/channel/LICH.h" +#include "common/nxdn/NXDNUtils.h" +#include "common/edac/CRC.h" #include "modem/port/ModemNullPort.h" #include "modem/port/UARTPort.h" -#include "p25/P25Defines.h" -#include "p25/data/DataHeader.h" -#include "p25/lc/LC.h" -#include "p25/lc/tsbk/TSBKFactory.h" -#include "p25/NID.h" -#include "p25/Sync.h" -#include "p25/P25Utils.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/channel/LICH.h" -#include "nxdn/NXDNUtils.h" -#include "edac/CRC.h" -#include "host/setup/HostSetup.h" +#include "common/Log.h" +#include "common/Utils.h" +#include "setup/HostSetup.h" #include "HostMain.h" -#include "Log.h" -#include "Utils.h" using namespace modem; using namespace lookups; @@ -54,8 +54,8 @@ using namespace lookups; #if !defined(CATCH2_TEST_COMPILATION) #if defined(ENABLE_SETUP_TUI) -#include "host/setup/SetupApplication.h" -#include "host/setup/SetupMainWnd.h" +#include "setup/SetupApplication.h" +#include "setup/SetupMainWnd.h" #include #endif // defined(ENABLE_SETUP_TUI) diff --git a/src/host/setup/HostSetup.h b/src/host/setup/HostSetup.h index bc05d0f7..4d999f4d 100644 --- a/src/host/setup/HostSetup.h +++ b/src/host/setup/HostSetup.h @@ -27,13 +27,13 @@ #define __HOST_SETUP_H__ #include "Defines.h" -#include "edac/AMBEFEC.h" +#include "common/edac/AMBEFEC.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/yaml/Yaml.h" +#include "common/RingBuffer.h" +#include "common/StopWatch.h" #include "modem/Modem.h" -#include "host/Host.h" -#include "lookups/IdenTableLookup.h" -#include "yaml/Yaml.h" -#include "RingBuffer.h" -#include "StopWatch.h" +#include "Host.h" #include diff --git a/src/host/setup/LevelAdjustWnd.h b/src/host/setup/LevelAdjustWnd.h index d214d9ec..fe4a0ce4 100644 --- a/src/host/setup/LevelAdjustWnd.h +++ b/src/host/setup/LevelAdjustWnd.h @@ -26,10 +26,10 @@ #if !defined(__LEVEL_ADJUST_WND_H__) #define __LEVEL_ADJUST_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/AdjustWndBase.h" +#include "setup/AdjustWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/LogDisplayWnd.h b/src/host/setup/LogDisplayWnd.h index 56867fb3..5c27957a 100644 --- a/src/host/setup/LogDisplayWnd.h +++ b/src/host/setup/LogDisplayWnd.h @@ -26,7 +26,7 @@ #if !defined(__LOG_DISPLAY_WND_H__) #define __LOG_DISPLAY_WND_H__ -#include "host/setup/HostSetup.h" +#include "setup/HostSetup.h" #include using namespace finalcut; diff --git a/src/host/setup/LoggingAndDataSetWnd.h b/src/host/setup/LoggingAndDataSetWnd.h index 1df5a18a..e2de8b0f 100644 --- a/src/host/setup/LoggingAndDataSetWnd.h +++ b/src/host/setup/LoggingAndDataSetWnd.h @@ -26,10 +26,10 @@ #if !defined(__LOGGING_AND_DATA_SET_WND_H__) #define __LOGGING_AND_DATA_SET_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/CloseWndBase.h" +#include "setup/CloseWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/ModemStatusWnd.h b/src/host/setup/ModemStatusWnd.h index b4570a7f..73d079bf 100644 --- a/src/host/setup/ModemStatusWnd.h +++ b/src/host/setup/ModemStatusWnd.h @@ -26,7 +26,7 @@ #if !defined(__MODEM_STATUS_WND_H__) #define __MODEM_STATUS_WND_H__ -#include "host/setup/HostSetup.h" +#include "setup/HostSetup.h" #include using namespace finalcut; diff --git a/src/host/setup/SetupApplication.h b/src/host/setup/SetupApplication.h index d7a1df11..64d29f3d 100644 --- a/src/host/setup/SetupApplication.h +++ b/src/host/setup/SetupApplication.h @@ -26,9 +26,9 @@ #if !defined(__SETUP_APPLICATION_H__) #define __SETUP_APPLICATION_H__ -#include "host/setup/HostSetup.h" -#include "host/setup/SetupMainWnd.h" -#include "Log.h" +#include "common/Log.h" +#include "setup/HostSetup.h" +#include "setup/SetupMainWnd.h" #include using namespace finalcut; diff --git a/src/host/setup/SetupMainWnd.h b/src/host/setup/SetupMainWnd.h index 475811ff..3db87ea5 100644 --- a/src/host/setup/SetupMainWnd.h +++ b/src/host/setup/SetupMainWnd.h @@ -26,27 +26,27 @@ #if !defined(__SETUP_WND_H__) #define __SETUP_WND_H__ +#include "common/Log.h" +#include "common/Thread.h" #include "modem/Modem.h" -#include "host/setup/HostSetup.h" -#include "Log.h" -#include "Thread.h" +#include "setup/HostSetup.h" using namespace modem; -#include "host/setup/LogDisplayWnd.h" -#include "host/setup/ModemStatusWnd.h" -#include "host/setup/BERDisplayWnd.h" +#include "setup/LogDisplayWnd.h" +#include "setup/ModemStatusWnd.h" +#include "setup/BERDisplayWnd.h" -#include "host/setup/LevelAdjustWnd.h" -#include "host/setup/SymbLevelAdjustWnd.h" -#include "host/setup/HSBandwidthAdjustWnd.h" -#include "host/setup/HSGainAdjustWnd.h" -#include "host/setup/FIFOBufferAdjustWnd.h" +#include "setup/LevelAdjustWnd.h" +#include "setup/SymbLevelAdjustWnd.h" +#include "setup/HSBandwidthAdjustWnd.h" +#include "setup/HSGainAdjustWnd.h" +#include "setup/FIFOBufferAdjustWnd.h" -#include "host/setup/LoggingAndDataSetWnd.h" -#include "host/setup/SystemConfigSetWnd.h" -#include "host/setup/SiteParamSetWnd.h" -#include "host/setup/ChannelConfigSetWnd.h" +#include "setup/LoggingAndDataSetWnd.h" +#include "setup/SystemConfigSetWnd.h" +#include "setup/SiteParamSetWnd.h" +#include "setup/ChannelConfigSetWnd.h" #include using namespace finalcut; diff --git a/src/host/setup/SiteParamSetWnd.h b/src/host/setup/SiteParamSetWnd.h index 150dd9b1..e229707f 100644 --- a/src/host/setup/SiteParamSetWnd.h +++ b/src/host/setup/SiteParamSetWnd.h @@ -26,10 +26,10 @@ #if !defined(__SITE_PARAM_SET_WND_H__) #define __SITE_PARAM_SET_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/CloseWndBase.h" +#include "setup/CloseWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/SymbLevelAdjustWnd.h b/src/host/setup/SymbLevelAdjustWnd.h index 60a3c309..2abe7a2a 100644 --- a/src/host/setup/SymbLevelAdjustWnd.h +++ b/src/host/setup/SymbLevelAdjustWnd.h @@ -26,10 +26,10 @@ #if !defined(__SYMB_LEVEL_ADJUST_WND_H__) #define __SYMB_LEVEL_ADJUST_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/AdjustWndBase.h" +#include "setup/AdjustWndBase.h" #include using namespace finalcut; diff --git a/src/host/setup/SystemConfigSetWnd.h b/src/host/setup/SystemConfigSetWnd.h index 74d97d62..d43241cb 100644 --- a/src/host/setup/SystemConfigSetWnd.h +++ b/src/host/setup/SystemConfigSetWnd.h @@ -26,10 +26,10 @@ #if !defined(__SYSTEM_CONFIG_SET_WND_H__) #define __SYSTEM_CONFIG_SET_WND_H__ -#include "host/setup/HostSetup.h" -#include "Thread.h" +#include "common/Thread.h" +#include "setup/HostSetup.h" -#include "host/setup/CloseWndBase.h" +#include "setup/CloseWndBase.h" #include using namespace finalcut; diff --git a/src/monitor/CMakeLists.txt b/src/monitor/CMakeLists.txt new file mode 100644 index 00000000..01e23cbe --- /dev/null +++ b/src/monitor/CMakeLists.txt @@ -0,0 +1,40 @@ +#/** +#* Digital Voice Modem - Host Software +#* GPLv2 Open Source. Use is subject to license terms. +#* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +#* +#* @package DVM / Host Software +#* +#*/ +#/* +#* Copyright (C) 2022 by Bryan Biedenkapp N2PLL +#* Copyright (C) 2022 by Natalie Moore +#* +#* 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 2 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, write to the Free Software +#* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#*/ +file(GLOB dvmmon_SRC + "src/host/modem/Modem.h" + "src/remote/RESTClient.cpp" + "src/remote/RESTClient.h" + "src/monitor/*.h" + "src/monitor/*.cpp" +) + +if (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) +project(dvmmon) +add_executable(dvmmon ${common_INCLUDE} ${dvmmon_SRC}) +target_link_libraries(dvmmon PRIVATE common asio::asio finalcut Threads::Threads) +target_include_directories(dvmmon PRIVATE src src/host src/monitor) +endif (ENABLE_TUI_SUPPORT AND (NOT DISABLE_MONITOR)) diff --git a/src/monitor/Defines.h b/src/monitor/Defines.h new file mode 100644 index 00000000..d6c974a4 --- /dev/null +++ b/src/monitor/Defines.h @@ -0,0 +1,45 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @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 +* +* 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 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__DEFINES_H__) +#define __DEFINES_H__ + +#include "common/Defines.h" + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#undef __PROG_NAME__ +#define __PROG_NAME__ "Digital Voice Modem (DVM) Monitor" +#undef __EXE_NAME__ +#define __EXE_NAME__ "dvmmon" + +#endif // __DEFINES_H__ diff --git a/src/monitor/InhibitSubscriberWnd.h b/src/monitor/InhibitSubscriberWnd.h index e7a3511f..57c2430e 100644 --- a/src/monitor/InhibitSubscriberWnd.h +++ b/src/monitor/InhibitSubscriberWnd.h @@ -26,7 +26,7 @@ #if !defined(__INHIBIT_SUBSCRIBER_WND_H__) #define __INHIBIT_SUBSCRIBER_WND_H__ -#include "monitor/TransmitWndBase.h" +#include "TransmitWndBase.h" #include using namespace finalcut; diff --git a/src/monitor/MonitorApplication.h b/src/monitor/MonitorApplication.h index 12cb513f..074ca7bb 100644 --- a/src/monitor/MonitorApplication.h +++ b/src/monitor/MonitorApplication.h @@ -26,9 +26,9 @@ #if !defined(__MONITOR_APPLICATION_H__) #define __MONITOR_APPLICATION_H__ -#include "monitor/MonitorMain.h" -#include "monitor/MonitorMainWnd.h" -#include "Log.h" +#include "common/Log.h" +#include "MonitorMain.h" +#include "MonitorMainWnd.h" #include using namespace finalcut; diff --git a/src/monitor/MonitorMain.cpp b/src/monitor/MonitorMain.cpp index 5ffb28b3..30ea66f2 100644 --- a/src/monitor/MonitorMain.cpp +++ b/src/monitor/MonitorMain.cpp @@ -24,12 +24,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "Log.h" -#include "monitor/MonitorMain.h" -#include "monitor/MonitorApplication.h" -#include "monitor/MonitorMainWnd.h" -#include "yaml/Yaml.h" -#include "Utils.h" +#include "common/yaml/Yaml.h" +#include "common/Log.h" +#include "common/Utils.h" +#include "MonitorMain.h" +#include "MonitorApplication.h" +#include "MonitorMainWnd.h" using namespace lookups; @@ -90,7 +90,7 @@ void fatal(const char* msg, ...) void usage(const char* message, const char* arg) { ::fprintf(stdout, __PROG_NAME__ " %s (built %s)\r\n", __VER__, __BUILD__); - ::fprintf(stdout, "Copyright (c) 2023 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n\n"); if (message != nullptr) { ::fprintf(stderr, "%s: ", g_progExe.c_str()); @@ -161,7 +161,8 @@ int checkArgs(int argc, char* argv[]) } else if (IS("-v")) { ::fprintf(stdout, __PROG_NAME__ " %s (built %s)\r\n", __VER__, __BUILD__); - ::fprintf(stdout, "Copyright (c) 2017-2023 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n"); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n\n"); if (argc == 2) exit(EXIT_SUCCESS); } diff --git a/src/monitor/MonitorMain.h b/src/monitor/MonitorMain.h index 87cbabe3..71f6dcbc 100644 --- a/src/monitor/MonitorMain.h +++ b/src/monitor/MonitorMain.h @@ -27,8 +27,8 @@ #define __MONITOR_MAIN_H__ #include "Defines.h" -#include "lookups/IdenTableLookup.h" -#include "yaml/Yaml.h" +#include "common/lookups/IdenTableLookup.h" +#include "common/yaml/Yaml.h" #include diff --git a/src/monitor/MonitorMainWnd.h b/src/monitor/MonitorMainWnd.h index e9c10c9c..c3a179dc 100644 --- a/src/monitor/MonitorMainWnd.h +++ b/src/monitor/MonitorMainWnd.h @@ -26,9 +26,9 @@ #if !defined(__MONITOR_WND_H__) #define __MONITOR_WND_H__ -#include "lookups/AffiliationLookup.h" -#include "Log.h" -#include "Thread.h" +#include "common/lookups/AffiliationLookup.h" +#include "common/Log.h" +#include "common/Thread.h" using namespace lookups; @@ -36,15 +36,15 @@ using namespace lookups; using namespace finalcut; #undef null -#include "monitor/MonitorMain.h" +#include "MonitorMain.h" -#include "monitor/LogDisplayWnd.h" -#include "monitor/NodeStatusWnd.h" -#include "monitor/SelectedNodeWnd.h" -#include "monitor/PageSubscriberWnd.h" -#include "monitor/RadioCheckSubscriberWnd.h" -#include "monitor/InhibitSubscriberWnd.h" -#include "monitor/UninhibitSubscriberWnd.h" +#include "LogDisplayWnd.h" +#include "NodeStatusWnd.h" +#include "SelectedNodeWnd.h" +#include "PageSubscriberWnd.h" +#include "RadioCheckSubscriberWnd.h" +#include "InhibitSubscriberWnd.h" +#include "UninhibitSubscriberWnd.h" #include @@ -110,7 +110,7 @@ public: const FString line(2, UniChar::BoxDrawingsHorizontal); FMessageBox info("About", line + __PROG_NAME__ + line + L"\n\n" L"Version " + __VER__ + L"\n\n" - L"Copyright (c) 2017-2023 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors." + L"\n" + L"Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors." + L"\n" L"Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others", FMessageBox::ButtonType::Ok, FMessageBox::ButtonType::Reject, FMessageBox::ButtonType::Reject, this); info.setCenterText(); diff --git a/src/monitor/NodeStatusWnd.h b/src/monitor/NodeStatusWnd.h index 9350fab2..2ae37cfc 100644 --- a/src/monitor/NodeStatusWnd.h +++ b/src/monitor/NodeStatusWnd.h @@ -26,12 +26,12 @@ #if !defined(__NODE_STATUS_WND_H__) #define __NODE_STATUS_WND_H__ -#include "lookups/AffiliationLookup.h" -#include "modem/Modem.h" -#include "network/RESTDefines.h" +#include "common/lookups/AffiliationLookup.h" +#include "host/network/RESTDefines.h" +#include "host/modem/Modem.h" #include "remote/RESTClient.h" -#include "monitor/MonitorMainWnd.h" +#include "MonitorMainWnd.h" #include using namespace finalcut; diff --git a/src/monitor/PageSubscriberWnd.h b/src/monitor/PageSubscriberWnd.h index c93c5024..b20925b1 100644 --- a/src/monitor/PageSubscriberWnd.h +++ b/src/monitor/PageSubscriberWnd.h @@ -26,7 +26,7 @@ #if !defined(__PAGE_SUBSCRIBER_WND_H__) #define __PAGE_SUBSCRIBER_WND_H__ -#include "monitor/TransmitWndBase.h" +#include "TransmitWndBase.h" #include using namespace finalcut; diff --git a/src/monitor/RadioCheckSubscriberWnd.h b/src/monitor/RadioCheckSubscriberWnd.h index 6754518f..d101b7f5 100644 --- a/src/monitor/RadioCheckSubscriberWnd.h +++ b/src/monitor/RadioCheckSubscriberWnd.h @@ -26,7 +26,7 @@ #if !defined(__RADIO_CHECK_SUBSCRIBER_WND_H__) #define __RADIO_CHECK_SUBSCRIBER_WND_H__ -#include "monitor/TransmitWndBase.h" +#include "TransmitWndBase.h" #include using namespace finalcut; diff --git a/src/monitor/SelectedNodeWnd.h b/src/monitor/SelectedNodeWnd.h index ea0e6a87..e2787daa 100644 --- a/src/monitor/SelectedNodeWnd.h +++ b/src/monitor/SelectedNodeWnd.h @@ -26,7 +26,7 @@ #if !defined(__SELECTED_NODE_WND_H__) #define __SELECTED_NODE_WND_H__ -#include "monitor/MonitorMainWnd.h" +#include "MonitorMainWnd.h" #include using namespace finalcut; diff --git a/src/monitor/TransmitWndBase.h b/src/monitor/TransmitWndBase.h index 8fce28b8..1a1b138f 100644 --- a/src/monitor/TransmitWndBase.h +++ b/src/monitor/TransmitWndBase.h @@ -26,9 +26,11 @@ #if !defined(__TRANSMIT_WND_BASE_H__) #define __TRANSMIT_WND_BASE_H__ -#include "lookups/AffiliationLookup.h" -#include "network/RESTDefines.h" +#include "common/lookups/AffiliationLookup.h" +#include "host/network/RESTDefines.h" +#include "host/modem/Modem.h" #include "remote/RESTClient.h" +#include "MonitorMain.h" #include using namespace finalcut; diff --git a/src/monitor/UninhibitSubscriberWnd.h b/src/monitor/UninhibitSubscriberWnd.h index b4bfbde9..c124095e 100644 --- a/src/monitor/UninhibitSubscriberWnd.h +++ b/src/monitor/UninhibitSubscriberWnd.h @@ -26,7 +26,7 @@ #if !defined(__UNINHIBIT_SUBSCRIBER_WND_H__) #define __UNINHIBIT_SUBSCRIBER_WND_H__ -#include "monitor/TransmitWndBase.h" +#include "TransmitWndBase.h" #include using namespace finalcut; diff --git a/src/p25/lc/tsbk/TSBKFactory.h b/src/p25/lc/tsbk/TSBKFactory.h deleted file mode 100644 index 0e09c9bd..00000000 --- a/src/p25/lc/tsbk/TSBKFactory.h +++ /dev/null @@ -1,138 +0,0 @@ -/** -* Digital Voice Modem - Host Software -* GPLv2 Open Source. Use is subject to license terms. -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* @package DVM / Host Software -* -*/ -/* -* Copyright (C) 2022 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 -* the Free Software Foundation; either version 2 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, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -#if !defined(__P25_LC__TSBK_FACTORY_H__) -#define __P25_LC__TSBK_FACTORY_H__ - -#include "Defines.h" - -#include "edac/Trellis.h" - -#include "p25/lc/TSBK.h" -#include "p25/lc/tsbk/IOSP_ACK_RSP.h" -#include "p25/lc/tsbk/IOSP_CALL_ALRT.h" -#include "p25/lc/tsbk/IOSP_EXT_FNCT.h" -#include "p25/lc/tsbk/IOSP_GRP_AFF.h" -#include "p25/lc/tsbk/IOSP_GRP_VCH.h" -#include "p25/lc/tsbk/IOSP_MSG_UPDT.h" -#include "p25/lc/tsbk/IOSP_RAD_MON.h" -#include "p25/lc/tsbk/IOSP_STS_UPDT.h" -#include "p25/lc/tsbk/IOSP_U_REG.h" -#include "p25/lc/tsbk/IOSP_UU_ANS.h" -#include "p25/lc/tsbk/IOSP_UU_VCH.h" -#include "p25/lc/tsbk/ISP_AUTH_FNE_RST.h" -#include "p25/lc/tsbk/ISP_AUTH_RESP.h" -#include "p25/lc/tsbk/ISP_AUTH_SU_DMD.h" -#include "p25/lc/tsbk/ISP_CAN_SRV_REQ.h" -#include "p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h" -#include "p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h" -#include "p25/lc/tsbk/ISP_LOC_REG_REQ.h" -#include "p25/lc/tsbk/ISP_SNDCP_CH_REQ.h" -#include "p25/lc/tsbk/ISP_U_DEREG_REQ.h" -#include "p25/lc/tsbk/OSP_ADJ_STS_BCAST.h" -#include "p25/lc/tsbk/OSP_AUTH_FNE_RESP.h" -#include "p25/lc/tsbk/OSP_DENY_RSP.h" -#include "p25/lc/tsbk/OSP_DVM_GIT_HASH.h" -#include "p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h" -#include "p25/lc/tsbk/OSP_GRP_AFF_Q.h" -#include "p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h" -#include "p25/lc/tsbk/OSP_IDEN_UP_VU.h" -#include "p25/lc/tsbk/OSP_IDEN_UP.h" -#include "p25/lc/tsbk/OSP_LOC_REG_RSP.h" -#include "p25/lc/tsbk/OSP_MOT_CC_BSI.h" -#include "p25/lc/tsbk/OSP_MOT_GRG_ADD.h" -#include "p25/lc/tsbk/OSP_MOT_GRG_DEL.h" -#include "p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h" -#include "p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h" -#include "p25/lc/tsbk/OSP_MOT_PSH_CCH.h" -#include "p25/lc/tsbk/OSP_NET_STS_BCAST.h" -#include "p25/lc/tsbk/OSP_QUE_RSP.h" -#include "p25/lc/tsbk/OSP_RFSS_STS_BCAST.h" -#include "p25/lc/tsbk/OSP_SCCB_EXP.h" -#include "p25/lc/tsbk/OSP_SCCB.h" -#include "p25/lc/tsbk/OSP_SNDCP_CH_ANN.h" -#include "p25/lc/tsbk/OSP_SNDCP_CH_GNT.h" -#include "p25/lc/tsbk/OSP_SYNC_BCAST.h" -#include "p25/lc/tsbk/OSP_SYS_SRV_BCAST.h" -#include "p25/lc/tsbk/OSP_TIME_DATE_ANN.h" -#include "p25/lc/tsbk/OSP_TSBK_RAW.h" -#include "p25/lc/tsbk/OSP_U_DEREG_ACK.h" -#include "p25/lc/tsbk/OSP_U_REG_CMD.h" -#include "p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h" - -#include "p25/lc/AMBT.h" -#include "p25/lc/tsbk/MBT_IOSP_ACK_RSP.h" -#include "p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h" -#include "p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h" -#include "p25/lc/tsbk/MBT_IOSP_GRP_AFF.h" -#include "p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h" -#include "p25/lc/tsbk/MBT_IOSP_STS_UPDT.h" -#include "p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h" -#include "p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h" -#include "p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h" -#include "p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h" -#include "p25/lc/tsbk/MBT_OSP_AUTH_DMD.h" -#include "p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h" -#include "p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h" - -namespace p25 -{ - namespace lc - { - namespace tsbk - { - // --------------------------------------------------------------------------- - // Class Declaration - // Helper class to instantiate an instance of a TSBK. - // --------------------------------------------------------------------------- - - class HOST_SW_API TSBKFactory { - public: - /// Initializes a new instance of the TSBKFactory class. - TSBKFactory(); - /// Finalizes a instance of the TSBKFactory class. - ~TSBKFactory(); - - /// Create an instance of a TSBK. - static std::unique_ptr createTSBK(const uint8_t* data, bool rawTSBK = false); - /// Create an instance of a AMBT. - static std::unique_ptr createAMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks); - - /// Sets the flag indicating CRC-errors should be warnings and not errors. - static void setWarnCRC(bool warnCRC) { m_warnCRC = warnCRC; } - - private: - static bool m_warnCRC; - - /// - static std::unique_ptr decode(TSBK* tsbk, const uint8_t* data, bool rawTSBK = false); - /// - static std::unique_ptr decode(AMBT* ambt, const data::DataHeader& dataHeader, const data::DataBlock* blocks); - }; - } // namespace tsbk - } // namespace lc -} // namespace p25 - -#endif // __P25_LC__TSBK_FACTORY_H__ diff --git a/src/remote/CMakeLists.txt b/src/remote/CMakeLists.txt new file mode 100644 index 00000000..4862417e --- /dev/null +++ b/src/remote/CMakeLists.txt @@ -0,0 +1,34 @@ +#/** +#* Digital Voice Modem - Host Software +#* GPLv2 Open Source. Use is subject to license terms. +#* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +#* +#* @package DVM / Host Software +#* +#*/ +#/* +#* Copyright (C) 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 +#* the Free Software Foundation; either version 2 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, write to the Free Software +#* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#*/ +file(GLOB dvmcmd_SRC + "src/remote/*.h" + "src/remote/*.cpp" +) + +project(dvmcmd) +add_executable(dvmcmd ${common_INCLUDE} ${dvmcmd_SRC}) +target_link_libraries(dvmcmd PRIVATE common asio::asio Threads::Threads) +target_include_directories(dvmcmd PRIVATE src src/remote) diff --git a/src/remote/Defines.h b/src/remote/Defines.h new file mode 100644 index 00000000..95f5168e --- /dev/null +++ b/src/remote/Defines.h @@ -0,0 +1,41 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @package DVM / Host Software +* +*/ +/* +* 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 +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__DEFINES_H__) +#define __DEFINES_H__ + +#include "common/Defines.h" + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#undef __PROG_NAME__ +#define __PROG_NAME__ "Digital Voice Modem (DVM) CLI" +#undef __EXE_NAME__ +#define __EXE_NAME__ "dvmcmd" + +#endif // __DEFINES_H__ diff --git a/src/remote/RESTClient.cpp b/src/remote/RESTClient.cpp index 17ab4109..60f0ac49 100644 --- a/src/remote/RESTClient.cpp +++ b/src/remote/RESTClient.cpp @@ -28,14 +28,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "Defines.h" -#include "edac/SHA256.h" -#include "network/json/json.h" -#include "network/rest/http/HTTPClient.h" -#include "network/rest/RequestDispatcher.h" +#include "common/edac/SHA256.h" +#include "common/network/json/json.h" +#include "common/network/rest/http/HTTPClient.h" +#include "common/network/rest/RequestDispatcher.h" +#include "common/Thread.h" +#include "common/Log.h" +#include "common/Utils.h" #include "remote/RESTClient.h" -#include "Thread.h" -#include "Log.h" -#include "Utils.h" using namespace network; using namespace network::rest::http; diff --git a/src/remote/RESTClient.h b/src/remote/RESTClient.h index 9507557e..430979db 100644 --- a/src/remote/RESTClient.h +++ b/src/remote/RESTClient.h @@ -27,8 +27,8 @@ #define __REST_CLIENT_H__ #include "Defines.h" -#include "network/json/json.h" -#include "network/rest/http/HTTPPayload.h" +#include "common/network/json/json.h" +#include "common/network/rest/http/HTTPPayload.h" #include diff --git a/src/remote/RESTClientMain.cpp b/src/remote/RESTClientMain.cpp index c1e24426..12fd4326 100644 --- a/src/remote/RESTClientMain.cpp +++ b/src/remote/RESTClientMain.cpp @@ -24,10 +24,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "remote/RESTClient.h" -#include "network/RESTDefines.h" -#include "Thread.h" -#include "Log.h" -#include "Utils.h" +#include "host/network/RESTDefines.h" +#include "common/Thread.h" +#include "common/Log.h" +#include "common/Utils.h" #include #include @@ -152,7 +152,7 @@ void fatal(const char* message) void usage(const char* message, const char* arg) { ::fprintf(stdout, __PROG_NAME__ " %s (built %s)\r\n", __VER__, __BUILD__); - ::fprintf(stdout, "Copyright (c) 2023 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n\n"); if (message != nullptr) { ::fprintf(stderr, "%s: ", g_progExe.c_str()); @@ -300,7 +300,8 @@ int checkArgs(int argc, char* argv[]) } else if (IS("-v")) { ::fprintf(stdout, __PROG_NAME__ " %s (built %s)\r\n", __VER__, __BUILD__); - ::fprintf(stdout, "Copyright (c) 2017-2023 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n"); + ::fprintf(stdout, "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\n"); + ::fprintf(stdout, "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\n\n"); if (argc == 2) exit(EXIT_SUCCESS); } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 72361250..0536b831 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,20 +24,15 @@ #* along with this program; if not, write to the Free Software #* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #*/ -# -## dvmtest source/header files -# file(GLOB dvmtests_SRC - "tests/nulltest.cpp" + "tests/*.h" + "tests/*.cpp" "tests/crypto/*.cpp" "tests/edac/*.cpp" "tests/p25/*.cpp" "tests/nxdn/*.cpp" ) -# -## dvmtest project -# project(dvmtest) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") Include(FetchContent) @@ -56,7 +51,7 @@ target_include_directories(asio::asio INTERFACE ${ASIO_INCLUDE_DIR}) target_compile_definitions(asio::asio INTERFACE "ASIO_STANDALONE") target_link_libraries(asio::asio INTERFACE Threads::Threads) -add_executable(dvmtests ${dvmhost_SRC} ${dvmtests_SRC}) +add_executable(dvmtests ${common_INCLUDE} ${dvmhost_SRC} ${dvmtests_SRC}) target_compile_definitions(dvmtests PUBLIC -DCATCH2_TEST_COMPILATION) -target_link_libraries(dvmtests PRIVATE Catch2::Catch2WithMain asio::asio Threads::Threads util) -target_include_directories(dvmtests PRIVATE src) +target_link_libraries(dvmtests PRIVATE Catch2::Catch2WithMain common asio::asio Threads::Threads util) +target_include_directories(dvmtests PRIVATE src src/host tests) diff --git a/tests/Defines.h b/tests/Defines.h new file mode 100644 index 00000000..91408f0b --- /dev/null +++ b/tests/Defines.h @@ -0,0 +1,45 @@ +/** +* Digital Voice Modem - Host Software +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @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 +* +* 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 2 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, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#if !defined(__DEFINES_H__) +#define __DEFINES_H__ + +#include "common/Defines.h" + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#undef __PROG_NAME__ +#define __PROG_NAME__ "Digital Voice Modem (DVM) Tests" +#undef __EXE_NAME__ +#define __EXE_NAME__ "dvmtest" + +#endif // __DEFINES_H__ diff --git a/tests/crypto/AES_LLA_AM1_Test.cpp b/tests/crypto/AES_LLA_AM1_Test.cpp index ef594ad1..b88c7c0b 100644 --- a/tests/crypto/AES_LLA_AM1_Test.cpp +++ b/tests/crypto/AES_LLA_AM1_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "AESCrypto.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/AESCrypto.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace crypto; diff --git a/tests/crypto/AES_LLA_AM2_Test.cpp b/tests/crypto/AES_LLA_AM2_Test.cpp index 3595f23c..9fa0386f 100644 --- a/tests/crypto/AES_LLA_AM2_Test.cpp +++ b/tests/crypto/AES_LLA_AM2_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "AESCrypto.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/AESCrypto.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace crypto; diff --git a/tests/crypto/AES_LLA_AM3_Test.cpp b/tests/crypto/AES_LLA_AM3_Test.cpp index 0bf43707..0846f89d 100644 --- a/tests/crypto/AES_LLA_AM3_Test.cpp +++ b/tests/crypto/AES_LLA_AM3_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "AESCrypto.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/AESCrypto.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace crypto; diff --git a/tests/crypto/AES_LLA_AM4_Test.cpp b/tests/crypto/AES_LLA_AM4_Test.cpp index 1e4884c4..27507128 100644 --- a/tests/crypto/AES_LLA_AM4_Test.cpp +++ b/tests/crypto/AES_LLA_AM4_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "AESCrypto.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/AESCrypto.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace crypto; diff --git a/tests/edac/CRC_12_Test.cpp b/tests/edac/CRC_12_Test.cpp index 24c1cffe..f0082f13 100644 --- a/tests/edac/CRC_12_Test.cpp +++ b/tests/edac/CRC_12_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_15_Test.cpp b/tests/edac/CRC_15_Test.cpp index 7b21b316..07423397 100644 --- a/tests/edac/CRC_15_Test.cpp +++ b/tests/edac/CRC_15_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_16_Test.cpp b/tests/edac/CRC_16_Test.cpp index 59efd188..27c24d0c 100644 --- a/tests/edac/CRC_16_Test.cpp +++ b/tests/edac/CRC_16_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_32_Test.cpp b/tests/edac/CRC_32_Test.cpp index 1d78f553..47234b9c 100644 --- a/tests/edac/CRC_32_Test.cpp +++ b/tests/edac/CRC_32_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_6_Test.cpp b/tests/edac/CRC_6_Test.cpp index 8c8487f7..8d7f9459 100644 --- a/tests/edac/CRC_6_Test.cpp +++ b/tests/edac/CRC_6_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_8_Test.cpp b/tests/edac/CRC_8_Test.cpp index 07bd0d2f..57148ba3 100644 --- a/tests/edac/CRC_8_Test.cpp +++ b/tests/edac/CRC_8_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_9_Test.cpp b/tests/edac/CRC_9_Test.cpp index 715e341e..9ab886e1 100644 --- a/tests/edac/CRC_9_Test.cpp +++ b/tests/edac/CRC_9_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_CCITT_161_Test.cpp b/tests/edac/CRC_CCITT_161_Test.cpp index 8c58fa63..3fe4cd29 100644 --- a/tests/edac/CRC_CCITT_161_Test.cpp +++ b/tests/edac/CRC_CCITT_161_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/edac/CRC_CCITT_162_Test.cpp b/tests/edac/CRC_CCITT_162_Test.cpp index 0c1a65e6..cf85015c 100644 --- a/tests/edac/CRC_CCITT_162_Test.cpp +++ b/tests/edac/CRC_CCITT_162_Test.cpp @@ -23,10 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/CRC.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/CRC.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; diff --git a/tests/nxdn/AMBE_FEC_Test.cpp b/tests/nxdn/AMBE_FEC_Test.cpp index 999b6c62..c4334edb 100644 --- a/tests/nxdn/AMBE_FEC_Test.cpp +++ b/tests/nxdn/AMBE_FEC_Test.cpp @@ -23,13 +23,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/AMBEFEC.h" -#include "edac/Golay24128.h" -#include "nxdn/NXDNDefines.h" -#include "nxdn/NXDNUtils.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/AMBEFEC.h" +#include "common/edac/Golay24128.h" +#include "common/nxdn/NXDNDefines.h" +#include "common/nxdn/NXDNUtils.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; using namespace nxdn; diff --git a/tests/p25/HDU_RS_Test.cpp b/tests/p25/HDU_RS_Test.cpp index afcc5a66..6a79ff6d 100644 --- a/tests/p25/HDU_RS_Test.cpp +++ b/tests/p25/HDU_RS_Test.cpp @@ -23,11 +23,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/RS634717.h" -#include "p25/P25Defines.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/RS634717.h" +#include "common/p25/P25Defines.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; using namespace p25; diff --git a/tests/p25/LDU1_RS_Test.cpp b/tests/p25/LDU1_RS_Test.cpp index 6fb48345..5df945c0 100644 --- a/tests/p25/LDU1_RS_Test.cpp +++ b/tests/p25/LDU1_RS_Test.cpp @@ -23,11 +23,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/RS634717.h" -#include "p25/P25Defines.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/RS634717.h" +#include "common/p25/P25Defines.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; using namespace p25; diff --git a/tests/p25/LDU2_RS_Test.cpp b/tests/p25/LDU2_RS_Test.cpp index 4ec861c5..2352ef2f 100644 --- a/tests/p25/LDU2_RS_Test.cpp +++ b/tests/p25/LDU2_RS_Test.cpp @@ -23,11 +23,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Defines.h" -#include "edac/RS634717.h" -#include "p25/P25Defines.h" -#include "Log.h" -#include "Utils.h" +#include "host/Defines.h" +#include "common/edac/RS634717.h" +#include "common/p25/P25Defines.h" +#include "common/Log.h" +#include "common/Utils.h" using namespace edac; using namespace p25;