move AMBT packets into their own directory; create common static library CMakeLists;

pull/45/head
Bryan Biedenkapp 2 years ago
parent 1379482fcc
commit 2150b69137

@ -141,7 +141,8 @@ endif (DISABLE_MONITOR)
# Debug compilation features/options (these should not be enabled for production!)
option(DEBUG_DMR_PDU_DATA "" off)
option(DEBUG_CRC "" off)
option(DEBUG_CRC_ADD "" off)
option(DEBUG_CRC_CHECK "" off)
option(DEBUG_RS "" off)
option(DEBUG_AMBEFEC "" off)
option(DEBUG_MODEM_CAL "" off)
@ -233,7 +234,7 @@ if (DEBUG_TRELLIS)
add_definitions(-DDEBUG_TRELLIS)
endif (DEBUG_TRELLIS)
project(common)
project(src)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
find_package(Threads REQUIRED)
@ -261,9 +262,7 @@ if (HAVE_SENDMMSG)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DHAVE_SENDMMSG=1")
endif (HAVE_SENDMMSG)
add_library(common STATIC ${common_SRC} ${common_INCLUDE})
target_include_directories(common PRIVATE src src/common)
include(src/common/CMakeLists.txt)
include(src/host/CMakeLists.txt)
include(src/fne/CMakeLists.txt)
include(src/monitor/CMakeLists.txt)

@ -0,0 +1,106 @@
#/**
#* 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 common_SRC
# DMR module
"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/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/lc/tsbk/mbt/*.cpp"
"src/common/p25/lookups/*.cpp"
# NXDN module
"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/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"
)
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"
# 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/lc/tsbk/mbt/*.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"
)
project(common)
add_library(common STATIC ${common_SRC} ${common_INCLUDE})
target_include_directories(common PRIVATE src src/common)

@ -82,19 +82,19 @@
#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"
#include "common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h"
#include "common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h"
#include "common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h"
#include "common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h"
#include "common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h"
#include "common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h"
#include "common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h"
#include "common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h"
#include "common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h"
#include "common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h"
#include "common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h"
#include "common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h"
#include "common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h"
namespace p25
{

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_IOSP_ACK_RSP.h"
#include "p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h"
#include "p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h"
#include "p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_IOSP_GRP_AFF.h"
#include "p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h"
#include "p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_IOSP_STS_UPDT.h"
#include "p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h"
#include "p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h"
#include "p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h"
#include "p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h"
#include "p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_OSP_AUTH_DMD.h"
#include "p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h"
#include "p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h"
#include "Log.h"
#include "Utils.h"

@ -24,7 +24,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Defines.h"
#include "p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h"
#include "p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h"
#include "Log.h"
#include "Utils.h"
Loading…
Cancel
Save

Powered by TurnKey Linux.