From c487873db29cff3a27ac8e01b09b191b06b07b69 Mon Sep 17 00:00:00 2001 From: K4YT3X Date: Wed, 22 Mar 2023 20:41:48 +0000 Subject: [PATCH] Reorganizing directory structure and minor housekeeping (#21) * reorganized files into appropriate directories * updated README, AUTHOR, and LICENSE to conform to conventions * adjusted CMakeLists and pipeline for the new directory structure * moved examples->configs; scripts->tools; src/debian->/debian * updated authors information * created new section in author information * removed deprecated iden_channel_calc tool --- .github/workflows/release.yml | 1 - AUTHORS.md | 15 +- CMakeLists.txt | 215 +++++------ LICENSE | 339 ++++++++++++++++++ LICENSE.md | 264 -------------- README.md | 99 ++--- RSSI.dat => configs/RSSI.example.dat | 0 .../config.example.yml | 0 .../iden_table.example.dat | 0 .../rid_acl.example.dat | 0 .../tg_acl.example.dat | 0 iden_channel_calc.py | 115 ------ Defines.h => src/Defines.h | 0 HostMain.cpp => src/HostMain.cpp | 0 HostMain.h => src/HostMain.h | 0 Log.cpp => src/Log.cpp | 0 Log.h => src/Log.h | 0 Mutex.cpp => src/Mutex.cpp | 0 Mutex.h => src/Mutex.h | 0 RingBuffer.h => src/RingBuffer.h | 0 StopWatch.cpp => src/StopWatch.cpp | 0 StopWatch.h => src/StopWatch.h | 0 Thread.cpp => src/Thread.cpp | 0 Thread.h => src/Thread.h | 0 Timer.cpp => src/Timer.cpp | 0 Timer.h => src/Timer.h | 0 Utils.cpp => src/Utils.cpp | 0 Utils.h => src/Utils.h | 0 cpp.hint => src/cpp.hint | 0 {dmr => src/dmr}/Control.cpp | 0 {dmr => src/dmr}/Control.h | 0 {dmr => src/dmr}/DMRDefines.h | 0 {dmr => src/dmr}/DMRUtils.h | 0 {dmr => src/dmr}/SiteData.h | 0 {dmr => src/dmr}/Slot.cpp | 0 {dmr => src/dmr}/Slot.h | 0 {dmr => src/dmr}/SlotType.cpp | 0 {dmr => src/dmr}/SlotType.h | 0 {dmr => src/dmr}/Sync.cpp | 0 {dmr => src/dmr}/Sync.h | 0 {dmr => src/dmr}/acl/AccessControl.cpp | 0 {dmr => src/dmr}/acl/AccessControl.h | 0 {dmr => src/dmr}/data/Data.cpp | 0 {dmr => src/dmr}/data/Data.h | 0 {dmr => src/dmr}/data/DataHeader.cpp | 0 {dmr => src/dmr}/data/DataHeader.h | 0 {dmr => src/dmr}/data/EMB.cpp | 0 {dmr => src/dmr}/data/EMB.h | 0 {dmr => src/dmr}/data/EmbeddedData.cpp | 0 {dmr => src/dmr}/data/EmbeddedData.h | 0 {dmr => src/dmr}/edac/Trellis.cpp | 0 {dmr => src/dmr}/edac/Trellis.h | 0 {dmr => src/dmr}/lc/CSBK.cpp | 0 {dmr => src/dmr}/lc/CSBK.h | 0 {dmr => src/dmr}/lc/FullLC.cpp | 0 {dmr => src/dmr}/lc/FullLC.h | 0 {dmr => src/dmr}/lc/LC.cpp | 0 {dmr => src/dmr}/lc/LC.h | 0 {dmr => src/dmr}/lc/PrivacyLC.cpp | 0 {dmr => src/dmr}/lc/PrivacyLC.h | 0 {dmr => src/dmr}/lc/ShortLC.cpp | 0 {dmr => src/dmr}/lc/ShortLC.h | 0 {dmr => src/dmr}/lc/csbk/CSBKFactory.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBKFactory.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_ACK_RSP.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_ACK_RSP.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_ALOHA.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_ALOHA.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_BROADCAST.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_BROADCAST.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_BSDWNACT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_BSDWNACT.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_CALL_ALRT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_CALL_ALRT.h | 0 .../dmr}/lc/csbk/CSBK_DVM_GIT_HASH.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_DVM_GIT_HASH.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_EXT_FNCT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_EXT_FNCT.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_NACK_RSP.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_NACK_RSP.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_PD_GRANT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_PD_GRANT.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_PRECCSBK.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_PRECCSBK.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_PV_GRANT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_PV_GRANT.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_RAND.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_RAND.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_RAW.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_RAW.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_TD_GRANT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_TD_GRANT.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_TV_GRANT.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_TV_GRANT.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_UU_ANS_RSP.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_UU_ANS_RSP.h | 0 {dmr => src/dmr}/lc/csbk/CSBK_UU_V_REQ.cpp | 0 {dmr => src/dmr}/lc/csbk/CSBK_UU_V_REQ.h | 0 .../dmr}/lookups/DMRAffiliationLookup.cpp | 0 .../dmr}/lookups/DMRAffiliationLookup.h | 0 {dmr => src/dmr}/packet/ControlSignaling.cpp | 0 {dmr => src/dmr}/packet/ControlSignaling.h | 0 {dmr => src/dmr}/packet/Data.cpp | 0 {dmr => src/dmr}/packet/Data.h | 0 {dmr => src/dmr}/packet/Voice.cpp | 0 {dmr => src/dmr}/packet/Voice.h | 0 {edac => src/edac}/AMBEFEC.cpp | 0 {edac => src/edac}/AMBEFEC.h | 0 {edac => src/edac}/BCH.cpp | 0 {edac => src/edac}/BCH.h | 0 {edac => src/edac}/BPTC19696.cpp | 0 {edac => src/edac}/BPTC19696.h | 0 {edac => src/edac}/CRC.cpp | 0 {edac => src/edac}/CRC.h | 0 {edac => src/edac}/Golay2087.cpp | 0 {edac => src/edac}/Golay2087.h | 0 {edac => src/edac}/Golay24128.cpp | 0 {edac => src/edac}/Golay24128.h | 0 {edac => src/edac}/Hamming.cpp | 0 {edac => src/edac}/Hamming.h | 0 {edac => src/edac}/QR1676.cpp | 0 {edac => src/edac}/QR1676.h | 0 {edac => src/edac}/RS129.cpp | 0 {edac => src/edac}/RS129.h | 0 {edac => src/edac}/RS634717.cpp | 0 {edac => src/edac}/RS634717.h | 0 {edac => src/edac}/SHA256.cpp | 0 {edac => src/edac}/SHA256.h | 0 {edac => src/edac}/rs/RS.h | 0 {host => src/host}/Console.cpp | 0 {host => src/host}/Console.h | 0 {host => src/host}/Host.cpp | 0 {host => src/host}/Host.h | 0 {host => src/host}/calibrate/HostCal.cpp | 0 {host => src/host}/calibrate/HostCal.h | 0 {host => src/host}/setup/HostSetup.cpp | 0 {host => src/host}/setup/HostSetup.h | 0 {linux => src/linux}/dvmhost.service | 0 .../lookups}/AffiliationLookup.cpp | 0 {lookups => src/lookups}/AffiliationLookup.h | 0 {lookups => src/lookups}/IdenTableLookup.cpp | 0 {lookups => src/lookups}/IdenTableLookup.h | 0 {lookups => src/lookups}/LookupTable.h | 0 {lookups => src/lookups}/RSSIInterpolator.cpp | 0 {lookups => src/lookups}/RSSIInterpolator.h | 0 {lookups => src/lookups}/RadioIdLookup.cpp | 0 {lookups => src/lookups}/RadioIdLookup.h | 0 .../lookups}/TalkgroupIdLookup.cpp | 0 {lookups => src/lookups}/TalkgroupIdLookup.h | 0 {modem => src/modem}/Modem.cpp | 0 {modem => src/modem}/Modem.h | 0 {modem => src/modem}/port/IModemPort.cpp | 0 {modem => src/modem}/port/IModemPort.h | 0 {modem => src/modem}/port/ISerialPort.cpp | 0 {modem => src/modem}/port/ISerialPort.h | 0 {modem => src/modem}/port/ModemNullPort.cpp | 0 {modem => src/modem}/port/ModemNullPort.h | 0 {modem => src/modem}/port/PseudoPTYPort.cpp | 0 {modem => src/modem}/port/PseudoPTYPort.h | 0 {modem => src/modem}/port/UARTPort.cpp | 0 {modem => src/modem}/port/UARTPort.h | 0 {modem => src/modem}/port/UDPPort.cpp | 0 {modem => src/modem}/port/UDPPort.h | 0 {network => src/network}/BaseNetwork.cpp | 0 {network => src/network}/BaseNetwork.h | 0 {network => src/network}/Network.cpp | 0 {network => src/network}/Network.h | 0 {network => src/network}/RESTAPI.cpp | 0 {network => src/network}/RESTAPI.h | 0 {network => src/network}/RESTDefines.h | 0 {network => src/network}/UDPSocket.cpp | 0 {network => src/network}/UDPSocket.h | 0 {network => src/network}/json/json.h | 0 .../network}/rest/RequestDispatcher.h | 0 .../network}/rest/http/Connection.h | 0 .../network}/rest/http/ConnectionManager.h | 0 .../network}/rest/http/HTTPClient.h | 0 .../network}/rest/http/HTTPHeaders.h | 0 .../network}/rest/http/HTTPLexer.cpp | 0 .../network}/rest/http/HTTPLexer.h | 0 .../network}/rest/http/HTTPPayload.cpp | 0 .../network}/rest/http/HTTPPayload.h | 0 .../network}/rest/http/HTTPRequestHandler.cpp | 0 .../network}/rest/http/HTTPRequestHandler.h | 0 .../network}/rest/http/HTTPServer.h | 0 {nxdn => src/nxdn}/Audio.cpp | 0 {nxdn => src/nxdn}/Audio.h | 0 {nxdn => src/nxdn}/Control.cpp | 0 {nxdn => src/nxdn}/Control.h | 0 {nxdn => src/nxdn}/NXDNDefines.h | 0 {nxdn => src/nxdn}/NXDNUtils.cpp | 0 {nxdn => src/nxdn}/NXDNUtils.h | 0 {nxdn => src/nxdn}/SiteData.h | 0 {nxdn => src/nxdn}/Sync.cpp | 0 {nxdn => src/nxdn}/Sync.h | 0 {nxdn => src/nxdn}/acl/AccessControl.cpp | 0 {nxdn => src/nxdn}/acl/AccessControl.h | 0 {nxdn => src/nxdn}/channel/CAC.cpp | 0 {nxdn => src/nxdn}/channel/CAC.h | 0 {nxdn => src/nxdn}/channel/FACCH1.cpp | 0 {nxdn => src/nxdn}/channel/FACCH1.h | 0 {nxdn => src/nxdn}/channel/LICH.cpp | 0 {nxdn => src/nxdn}/channel/LICH.h | 0 {nxdn => src/nxdn}/channel/SACCH.cpp | 0 {nxdn => src/nxdn}/channel/SACCH.h | 0 {nxdn => src/nxdn}/channel/UDCH.cpp | 0 {nxdn => src/nxdn}/channel/UDCH.h | 0 {nxdn => src/nxdn}/edac/Convolution.cpp | 0 {nxdn => src/nxdn}/edac/Convolution.h | 0 {nxdn => src/nxdn}/lc/PacketInformation.cpp | 0 {nxdn => src/nxdn}/lc/PacketInformation.h | 0 {nxdn => src/nxdn}/lc/RCCH.cpp | 0 {nxdn => src/nxdn}/lc/RCCH.h | 0 {nxdn => src/nxdn}/lc/RTCH.cpp | 0 {nxdn => src/nxdn}/lc/RTCH.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h | 0 .../lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_GRP_REG.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_IDLE.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_IDLE.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_REG.cpp | 0 {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_REG_C.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_REG_C.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_REG_COMM.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_SITE_INFO.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_SRV_INFO.h | 0 .../lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp | 0 .../nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h | 0 {nxdn => src/nxdn}/lc/rcch/RCCHFactory.cpp | 0 {nxdn => src/nxdn}/lc/rcch/RCCHFactory.h | 0 {nxdn => src/nxdn}/packet/Data.cpp | 0 {nxdn => src/nxdn}/packet/Data.h | 0 {nxdn => src/nxdn}/packet/Trunk.cpp | 0 {nxdn => src/nxdn}/packet/Trunk.h | 0 {nxdn => src/nxdn}/packet/Voice.cpp | 0 {nxdn => src/nxdn}/packet/Voice.h | 0 {p25 => src/p25}/Audio.cpp | 0 {p25 => src/p25}/Audio.h | 0 {p25 => src/p25}/Control.cpp | 0 {p25 => src/p25}/Control.h | 0 {p25 => src/p25}/NID.cpp | 0 {p25 => src/p25}/NID.h | 0 {p25 => src/p25}/P25Defines.h | 0 {p25 => src/p25}/P25Utils.cpp | 0 {p25 => src/p25}/P25Utils.h | 0 {p25 => src/p25}/SiteData.h | 0 {p25 => src/p25}/Sync.cpp | 0 {p25 => src/p25}/Sync.h | 0 {p25 => src/p25}/acl/AccessControl.cpp | 0 {p25 => src/p25}/acl/AccessControl.h | 0 {p25 => src/p25}/data/DataBlock.cpp | 0 {p25 => src/p25}/data/DataBlock.h | 0 {p25 => src/p25}/data/DataHeader.cpp | 0 {p25 => src/p25}/data/DataHeader.h | 0 {p25 => src/p25}/data/LowSpeedData.cpp | 0 {p25 => src/p25}/data/LowSpeedData.h | 0 {p25 => src/p25}/dfsi/DFSIDefines.h | 0 {p25 => src/p25}/dfsi/LC.cpp | 0 {p25 => src/p25}/dfsi/LC.h | 0 {p25 => src/p25}/dfsi/packet/DFSITrunk.cpp | 0 {p25 => src/p25}/dfsi/packet/DFSITrunk.h | 0 {p25 => src/p25}/dfsi/packet/DFSIVoice.cpp | 0 {p25 => src/p25}/dfsi/packet/DFSIVoice.h | 0 {p25 => src/p25}/edac/Trellis.cpp | 0 {p25 => src/p25}/edac/Trellis.h | 0 {p25 => src/p25}/lc/AMBT.cpp | 0 {p25 => src/p25}/lc/AMBT.h | 0 {p25 => src/p25}/lc/LC.cpp | 0 {p25 => src/p25}/lc/LC.h | 0 {p25 => src/p25}/lc/TDULC.cpp | 0 {p25 => src/p25}/lc/TDULC.h | 0 {p25 => src/p25}/lc/TSBK.cpp | 0 {p25 => src/p25}/lc/TSBK.h | 0 .../p25}/lc/tdulc/LC_ADJ_STS_BCAST.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_ADJ_STS_BCAST.h | 0 {p25 => src/p25}/lc/tdulc/LC_CALL_TERM.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_CALL_TERM.h | 0 .../p25}/lc/tdulc/LC_CONV_FALLBACK.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_CONV_FALLBACK.h | 0 {p25 => src/p25}/lc/tdulc/LC_GROUP.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_GROUP.h | 0 {p25 => src/p25}/lc/tdulc/LC_GROUP_UPDT.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_GROUP_UPDT.h | 0 {p25 => src/p25}/lc/tdulc/LC_IDEN_UP.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_IDEN_UP.h | 0 .../p25}/lc/tdulc/LC_NET_STS_BCAST.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_NET_STS_BCAST.h | 0 {p25 => src/p25}/lc/tdulc/LC_PRIVATE.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_PRIVATE.h | 0 .../p25}/lc/tdulc/LC_RFSS_STS_BCAST.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_RFSS_STS_BCAST.h | 0 .../p25}/lc/tdulc/LC_SYS_SRV_BCAST.cpp | 0 {p25 => src/p25}/lc/tdulc/LC_SYS_SRV_BCAST.h | 0 .../p25}/lc/tdulc/LC_TEL_INT_VCH_USER.cpp | 0 .../p25}/lc/tdulc/LC_TEL_INT_VCH_USER.h | 0 {p25 => src/p25}/lc/tdulc/TDULCFactory.cpp | 0 {p25 => src/p25}/lc/tdulc/TDULCFactory.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_ACK_RSP.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_ACK_RSP.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_CALL_ALRT.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_CALL_ALRT.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_EXT_FNCT.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_EXT_FNCT.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_GRP_AFF.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_GRP_AFF.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_GRP_VCH.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_GRP_VCH.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_MSG_UPDT.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_MSG_UPDT.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_RAD_MON.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_RAD_MON.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_STS_UPDT.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_STS_UPDT.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_UU_ANS.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_UU_ANS.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_UU_VCH.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_UU_VCH.h | 0 {p25 => src/p25}/lc/tsbk/IOSP_U_REG.cpp | 0 {p25 => src/p25}/lc/tsbk/IOSP_U_REG.h | 0 {p25 => src/p25}/lc/tsbk/ISP_AUTH_FNE_RST.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_AUTH_FNE_RST.h | 0 {p25 => src/p25}/lc/tsbk/ISP_AUTH_RESP.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_AUTH_RESP.h | 0 {p25 => src/p25}/lc/tsbk/ISP_AUTH_SU_DMD.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_AUTH_SU_DMD.h | 0 {p25 => src/p25}/lc/tsbk/ISP_CAN_SRV_REQ.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_CAN_SRV_REQ.h | 0 .../p25}/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_EMERG_ALRM_REQ.h | 0 .../p25}/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_GRP_AFF_Q_RSP.h | 0 {p25 => src/p25}/lc/tsbk/ISP_LOC_REG_REQ.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_LOC_REG_REQ.h | 0 {p25 => src/p25}/lc/tsbk/ISP_SNDCP_CH_REQ.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_SNDCP_CH_REQ.h | 0 {p25 => src/p25}/lc/tsbk/ISP_U_DEREG_REQ.cpp | 0 {p25 => src/p25}/lc/tsbk/ISP_U_DEREG_REQ.h | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_ACK_RSP.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_ACK_RSP.h | 0 .../p25}/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_CALL_ALRT.h | 0 .../p25}/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_EXT_FNCT.h | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_GRP_AFF.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_GRP_AFF.h | 0 .../p25}/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_MSG_UPDT.h | 0 .../p25}/lc/tsbk/MBT_IOSP_STS_UPDT.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_IOSP_STS_UPDT.h | 0 .../p25}/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp | 0 .../p25}/lc/tsbk/MBT_ISP_AUTH_RESP_M.h | 0 .../p25}/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp | 0 .../p25}/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h | 0 .../p25}/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp | 0 .../p25}/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h | 0 .../p25}/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp | 0 .../p25}/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h | 0 {p25 => src/p25}/lc/tsbk/MBT_OSP_AUTH_DMD.cpp | 0 {p25 => src/p25}/lc/tsbk/MBT_OSP_AUTH_DMD.h | 0 .../p25}/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp | 0 .../p25}/lc/tsbk/MBT_OSP_NET_STS_BCAST.h | 0 .../p25}/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp | 0 .../p25}/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h | 0 .../p25}/lc/tsbk/OSP_ADJ_STS_BCAST.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_ADJ_STS_BCAST.h | 0 .../p25}/lc/tsbk/OSP_AUTH_FNE_RESP.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_AUTH_FNE_RESP.h | 0 {p25 => src/p25}/lc/tsbk/OSP_DENY_RSP.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_DENY_RSP.h | 0 {p25 => src/p25}/lc/tsbk/OSP_DVM_GIT_HASH.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_DVM_GIT_HASH.h | 0 .../p25}/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp | 0 .../p25}/lc/tsbk/OSP_DVM_LC_CALL_TERM.h | 0 {p25 => src/p25}/lc/tsbk/OSP_GRP_AFF_Q.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_GRP_AFF_Q.h | 0 .../p25}/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp | 0 .../p25}/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h | 0 {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP.h | 0 {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP_VU.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP_VU.h | 0 {p25 => src/p25}/lc/tsbk/OSP_LOC_REG_RSP.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_LOC_REG_RSP.h | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_CC_BSI.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_CC_BSI.h | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_ADD.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_ADD.h | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_DEL.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_DEL.h | 0 .../p25}/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp | 0 .../p25}/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h | 0 .../p25}/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp | 0 .../p25}/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_PSH_CCH.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_MOT_PSH_CCH.h | 0 .../p25}/lc/tsbk/OSP_NET_STS_BCAST.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_NET_STS_BCAST.h | 0 {p25 => src/p25}/lc/tsbk/OSP_QUE_RSP.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_QUE_RSP.h | 0 .../p25}/lc/tsbk/OSP_RFSS_STS_BCAST.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_RFSS_STS_BCAST.h | 0 {p25 => src/p25}/lc/tsbk/OSP_SCCB.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_SCCB.h | 0 {p25 => src/p25}/lc/tsbk/OSP_SCCB_EXP.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_SCCB_EXP.h | 0 {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_ANN.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_ANN.h | 0 {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_GNT.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_GNT.h | 0 {p25 => src/p25}/lc/tsbk/OSP_SYNC_BCAST.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_SYNC_BCAST.h | 0 .../p25}/lc/tsbk/OSP_SYS_SRV_BCAST.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_SYS_SRV_BCAST.h | 0 .../p25}/lc/tsbk/OSP_TIME_DATE_ANN.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_TIME_DATE_ANN.h | 0 {p25 => src/p25}/lc/tsbk/OSP_TSBK_RAW.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_TSBK_RAW.h | 0 {p25 => src/p25}/lc/tsbk/OSP_U_DEREG_ACK.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_U_DEREG_ACK.h | 0 {p25 => src/p25}/lc/tsbk/OSP_U_REG_CMD.cpp | 0 {p25 => src/p25}/lc/tsbk/OSP_U_REG_CMD.h | 0 {p25 => src/p25}/lc/tsbk/TSBKFactory.cpp | 0 {p25 => src/p25}/lc/tsbk/TSBKFactory.h | 0 .../p25}/lookups/P25AffiliationLookup.cpp | 0 .../p25}/lookups/P25AffiliationLookup.h | 0 {p25 => src/p25}/packet/Data.cpp | 0 {p25 => src/p25}/packet/Data.h | 0 {p25 => src/p25}/packet/Trunk.cpp | 0 {p25 => src/p25}/packet/Trunk.h | 0 {p25 => src/p25}/packet/Voice.cpp | 0 {p25 => src/p25}/packet/Voice.h | 0 {remote => src/remote}/RESTClient.cpp | 0 {remote => src/remote}/RESTClient.h | 0 {remote => src/remote}/RESTClientMain.cpp | 0 {yaml => src/yaml}/Yaml.cpp | 0 {yaml => src/yaml}/Yaml.h | 0 dvm-watchdog.sh => tools/dvm-watchdog.sh | 0 start-dvm.sh => tools/start-dvm.sh | 0 stop-dvm.sh => tools/stop-dvm.sh | 0 stop-watchdog.sh => tools/stop-watchdog.sh | 0 449 files changed, 512 insertions(+), 536 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.md rename RSSI.dat => configs/RSSI.example.dat (100%) rename config.example.yml => configs/config.example.yml (100%) rename iden_table.dat => configs/iden_table.example.dat (100%) rename rid_acl.example.dat => configs/rid_acl.example.dat (100%) rename tg_acl.example.dat => configs/tg_acl.example.dat (100%) delete mode 100644 iden_channel_calc.py rename Defines.h => src/Defines.h (100%) rename HostMain.cpp => src/HostMain.cpp (100%) rename HostMain.h => src/HostMain.h (100%) rename Log.cpp => src/Log.cpp (100%) rename Log.h => src/Log.h (100%) rename Mutex.cpp => src/Mutex.cpp (100%) rename Mutex.h => src/Mutex.h (100%) rename RingBuffer.h => src/RingBuffer.h (100%) rename StopWatch.cpp => src/StopWatch.cpp (100%) rename StopWatch.h => src/StopWatch.h (100%) rename Thread.cpp => src/Thread.cpp (100%) rename Thread.h => src/Thread.h (100%) rename Timer.cpp => src/Timer.cpp (100%) rename Timer.h => src/Timer.h (100%) rename Utils.cpp => src/Utils.cpp (100%) rename Utils.h => src/Utils.h (100%) rename cpp.hint => src/cpp.hint (100%) rename {dmr => src/dmr}/Control.cpp (100%) rename {dmr => src/dmr}/Control.h (100%) rename {dmr => src/dmr}/DMRDefines.h (100%) rename {dmr => src/dmr}/DMRUtils.h (100%) rename {dmr => src/dmr}/SiteData.h (100%) rename {dmr => src/dmr}/Slot.cpp (100%) rename {dmr => src/dmr}/Slot.h (100%) rename {dmr => src/dmr}/SlotType.cpp (100%) rename {dmr => src/dmr}/SlotType.h (100%) rename {dmr => src/dmr}/Sync.cpp (100%) rename {dmr => src/dmr}/Sync.h (100%) rename {dmr => src/dmr}/acl/AccessControl.cpp (100%) rename {dmr => src/dmr}/acl/AccessControl.h (100%) rename {dmr => src/dmr}/data/Data.cpp (100%) rename {dmr => src/dmr}/data/Data.h (100%) rename {dmr => src/dmr}/data/DataHeader.cpp (100%) rename {dmr => src/dmr}/data/DataHeader.h (100%) rename {dmr => src/dmr}/data/EMB.cpp (100%) rename {dmr => src/dmr}/data/EMB.h (100%) rename {dmr => src/dmr}/data/EmbeddedData.cpp (100%) rename {dmr => src/dmr}/data/EmbeddedData.h (100%) rename {dmr => src/dmr}/edac/Trellis.cpp (100%) rename {dmr => src/dmr}/edac/Trellis.h (100%) rename {dmr => src/dmr}/lc/CSBK.cpp (100%) rename {dmr => src/dmr}/lc/CSBK.h (100%) rename {dmr => src/dmr}/lc/FullLC.cpp (100%) rename {dmr => src/dmr}/lc/FullLC.h (100%) rename {dmr => src/dmr}/lc/LC.cpp (100%) rename {dmr => src/dmr}/lc/LC.h (100%) rename {dmr => src/dmr}/lc/PrivacyLC.cpp (100%) rename {dmr => src/dmr}/lc/PrivacyLC.h (100%) rename {dmr => src/dmr}/lc/ShortLC.cpp (100%) rename {dmr => src/dmr}/lc/ShortLC.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBKFactory.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBKFactory.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_ACK_RSP.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_ACK_RSP.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_ALOHA.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_ALOHA.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_BROADCAST.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_BROADCAST.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_BSDWNACT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_BSDWNACT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_CALL_ALRT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_CALL_ALRT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_DVM_GIT_HASH.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_DVM_GIT_HASH.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_EXT_FNCT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_EXT_FNCT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_NACK_RSP.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_NACK_RSP.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_PD_GRANT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_PD_GRANT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_PRECCSBK.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_PRECCSBK.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_PV_GRANT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_PV_GRANT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_RAND.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_RAND.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_RAW.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_RAW.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_TD_GRANT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_TD_GRANT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_TV_GRANT.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_TV_GRANT.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_UU_ANS_RSP.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_UU_ANS_RSP.h (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_UU_V_REQ.cpp (100%) rename {dmr => src/dmr}/lc/csbk/CSBK_UU_V_REQ.h (100%) rename {dmr => src/dmr}/lookups/DMRAffiliationLookup.cpp (100%) rename {dmr => src/dmr}/lookups/DMRAffiliationLookup.h (100%) rename {dmr => src/dmr}/packet/ControlSignaling.cpp (100%) rename {dmr => src/dmr}/packet/ControlSignaling.h (100%) rename {dmr => src/dmr}/packet/Data.cpp (100%) rename {dmr => src/dmr}/packet/Data.h (100%) rename {dmr => src/dmr}/packet/Voice.cpp (100%) rename {dmr => src/dmr}/packet/Voice.h (100%) rename {edac => src/edac}/AMBEFEC.cpp (100%) rename {edac => src/edac}/AMBEFEC.h (100%) rename {edac => src/edac}/BCH.cpp (100%) rename {edac => src/edac}/BCH.h (100%) rename {edac => src/edac}/BPTC19696.cpp (100%) rename {edac => src/edac}/BPTC19696.h (100%) rename {edac => src/edac}/CRC.cpp (100%) rename {edac => src/edac}/CRC.h (100%) rename {edac => src/edac}/Golay2087.cpp (100%) rename {edac => src/edac}/Golay2087.h (100%) rename {edac => src/edac}/Golay24128.cpp (100%) rename {edac => src/edac}/Golay24128.h (100%) rename {edac => src/edac}/Hamming.cpp (100%) rename {edac => src/edac}/Hamming.h (100%) rename {edac => src/edac}/QR1676.cpp (100%) rename {edac => src/edac}/QR1676.h (100%) rename {edac => src/edac}/RS129.cpp (100%) rename {edac => src/edac}/RS129.h (100%) rename {edac => src/edac}/RS634717.cpp (100%) rename {edac => src/edac}/RS634717.h (100%) rename {edac => src/edac}/SHA256.cpp (100%) rename {edac => src/edac}/SHA256.h (100%) rename {edac => src/edac}/rs/RS.h (100%) rename {host => src/host}/Console.cpp (100%) rename {host => src/host}/Console.h (100%) rename {host => src/host}/Host.cpp (100%) rename {host => src/host}/Host.h (100%) rename {host => src/host}/calibrate/HostCal.cpp (100%) rename {host => src/host}/calibrate/HostCal.h (100%) rename {host => src/host}/setup/HostSetup.cpp (100%) rename {host => src/host}/setup/HostSetup.h (100%) rename {linux => src/linux}/dvmhost.service (100%) rename {lookups => src/lookups}/AffiliationLookup.cpp (100%) rename {lookups => src/lookups}/AffiliationLookup.h (100%) rename {lookups => src/lookups}/IdenTableLookup.cpp (100%) rename {lookups => src/lookups}/IdenTableLookup.h (100%) rename {lookups => src/lookups}/LookupTable.h (100%) rename {lookups => src/lookups}/RSSIInterpolator.cpp (100%) rename {lookups => src/lookups}/RSSIInterpolator.h (100%) rename {lookups => src/lookups}/RadioIdLookup.cpp (100%) rename {lookups => src/lookups}/RadioIdLookup.h (100%) rename {lookups => src/lookups}/TalkgroupIdLookup.cpp (100%) rename {lookups => src/lookups}/TalkgroupIdLookup.h (100%) rename {modem => src/modem}/Modem.cpp (100%) rename {modem => src/modem}/Modem.h (100%) rename {modem => src/modem}/port/IModemPort.cpp (100%) rename {modem => src/modem}/port/IModemPort.h (100%) rename {modem => src/modem}/port/ISerialPort.cpp (100%) rename {modem => src/modem}/port/ISerialPort.h (100%) rename {modem => src/modem}/port/ModemNullPort.cpp (100%) rename {modem => src/modem}/port/ModemNullPort.h (100%) rename {modem => src/modem}/port/PseudoPTYPort.cpp (100%) rename {modem => src/modem}/port/PseudoPTYPort.h (100%) rename {modem => src/modem}/port/UARTPort.cpp (100%) rename {modem => src/modem}/port/UARTPort.h (100%) rename {modem => src/modem}/port/UDPPort.cpp (100%) rename {modem => src/modem}/port/UDPPort.h (100%) rename {network => src/network}/BaseNetwork.cpp (100%) rename {network => src/network}/BaseNetwork.h (100%) rename {network => src/network}/Network.cpp (100%) rename {network => src/network}/Network.h (100%) rename {network => src/network}/RESTAPI.cpp (100%) rename {network => src/network}/RESTAPI.h (100%) rename {network => src/network}/RESTDefines.h (100%) rename {network => src/network}/UDPSocket.cpp (100%) rename {network => src/network}/UDPSocket.h (100%) rename {network => src/network}/json/json.h (100%) rename {network => src/network}/rest/RequestDispatcher.h (100%) rename {network => src/network}/rest/http/Connection.h (100%) rename {network => src/network}/rest/http/ConnectionManager.h (100%) rename {network => src/network}/rest/http/HTTPClient.h (100%) rename {network => src/network}/rest/http/HTTPHeaders.h (100%) rename {network => src/network}/rest/http/HTTPLexer.cpp (100%) rename {network => src/network}/rest/http/HTTPLexer.h (100%) rename {network => src/network}/rest/http/HTTPPayload.cpp (100%) rename {network => src/network}/rest/http/HTTPPayload.h (100%) rename {network => src/network}/rest/http/HTTPRequestHandler.cpp (100%) rename {network => src/network}/rest/http/HTTPRequestHandler.h (100%) rename {network => src/network}/rest/http/HTTPServer.h (100%) rename {nxdn => src/nxdn}/Audio.cpp (100%) rename {nxdn => src/nxdn}/Audio.h (100%) rename {nxdn => src/nxdn}/Control.cpp (100%) rename {nxdn => src/nxdn}/Control.h (100%) rename {nxdn => src/nxdn}/NXDNDefines.h (100%) rename {nxdn => src/nxdn}/NXDNUtils.cpp (100%) rename {nxdn => src/nxdn}/NXDNUtils.h (100%) rename {nxdn => src/nxdn}/SiteData.h (100%) rename {nxdn => src/nxdn}/Sync.cpp (100%) rename {nxdn => src/nxdn}/Sync.h (100%) rename {nxdn => src/nxdn}/acl/AccessControl.cpp (100%) rename {nxdn => src/nxdn}/acl/AccessControl.h (100%) rename {nxdn => src/nxdn}/channel/CAC.cpp (100%) rename {nxdn => src/nxdn}/channel/CAC.h (100%) rename {nxdn => src/nxdn}/channel/FACCH1.cpp (100%) rename {nxdn => src/nxdn}/channel/FACCH1.h (100%) rename {nxdn => src/nxdn}/channel/LICH.cpp (100%) rename {nxdn => src/nxdn}/channel/LICH.h (100%) rename {nxdn => src/nxdn}/channel/SACCH.cpp (100%) rename {nxdn => src/nxdn}/channel/SACCH.h (100%) rename {nxdn => src/nxdn}/channel/UDCH.cpp (100%) rename {nxdn => src/nxdn}/channel/UDCH.h (100%) rename {nxdn => src/nxdn}/edac/Convolution.cpp (100%) rename {nxdn => src/nxdn}/edac/Convolution.h (100%) rename {nxdn => src/nxdn}/lc/PacketInformation.cpp (100%) rename {nxdn => src/nxdn}/lc/PacketInformation.h (100%) rename {nxdn => src/nxdn}/lc/RCCH.cpp (100%) rename {nxdn => src/nxdn}/lc/RCCH.h (100%) rename {nxdn => src/nxdn}/lc/RTCH.cpp (100%) rename {nxdn => src/nxdn}/lc/RTCH.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_GRP_REG.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_IDLE.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_IDLE.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG_C.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG_C.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_REG_COMM.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_SITE_INFO.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_SRV_INFO.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h (100%) rename {nxdn => src/nxdn}/lc/rcch/RCCHFactory.cpp (100%) rename {nxdn => src/nxdn}/lc/rcch/RCCHFactory.h (100%) rename {nxdn => src/nxdn}/packet/Data.cpp (100%) rename {nxdn => src/nxdn}/packet/Data.h (100%) rename {nxdn => src/nxdn}/packet/Trunk.cpp (100%) rename {nxdn => src/nxdn}/packet/Trunk.h (100%) rename {nxdn => src/nxdn}/packet/Voice.cpp (100%) rename {nxdn => src/nxdn}/packet/Voice.h (100%) rename {p25 => src/p25}/Audio.cpp (100%) rename {p25 => src/p25}/Audio.h (100%) rename {p25 => src/p25}/Control.cpp (100%) rename {p25 => src/p25}/Control.h (100%) rename {p25 => src/p25}/NID.cpp (100%) rename {p25 => src/p25}/NID.h (100%) rename {p25 => src/p25}/P25Defines.h (100%) rename {p25 => src/p25}/P25Utils.cpp (100%) rename {p25 => src/p25}/P25Utils.h (100%) rename {p25 => src/p25}/SiteData.h (100%) rename {p25 => src/p25}/Sync.cpp (100%) rename {p25 => src/p25}/Sync.h (100%) rename {p25 => src/p25}/acl/AccessControl.cpp (100%) rename {p25 => src/p25}/acl/AccessControl.h (100%) rename {p25 => src/p25}/data/DataBlock.cpp (100%) rename {p25 => src/p25}/data/DataBlock.h (100%) rename {p25 => src/p25}/data/DataHeader.cpp (100%) rename {p25 => src/p25}/data/DataHeader.h (100%) rename {p25 => src/p25}/data/LowSpeedData.cpp (100%) rename {p25 => src/p25}/data/LowSpeedData.h (100%) rename {p25 => src/p25}/dfsi/DFSIDefines.h (100%) rename {p25 => src/p25}/dfsi/LC.cpp (100%) rename {p25 => src/p25}/dfsi/LC.h (100%) rename {p25 => src/p25}/dfsi/packet/DFSITrunk.cpp (100%) rename {p25 => src/p25}/dfsi/packet/DFSITrunk.h (100%) rename {p25 => src/p25}/dfsi/packet/DFSIVoice.cpp (100%) rename {p25 => src/p25}/dfsi/packet/DFSIVoice.h (100%) rename {p25 => src/p25}/edac/Trellis.cpp (100%) rename {p25 => src/p25}/edac/Trellis.h (100%) rename {p25 => src/p25}/lc/AMBT.cpp (100%) rename {p25 => src/p25}/lc/AMBT.h (100%) rename {p25 => src/p25}/lc/LC.cpp (100%) rename {p25 => src/p25}/lc/LC.h (100%) rename {p25 => src/p25}/lc/TDULC.cpp (100%) rename {p25 => src/p25}/lc/TDULC.h (100%) rename {p25 => src/p25}/lc/TSBK.cpp (100%) rename {p25 => src/p25}/lc/TSBK.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_ADJ_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_ADJ_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_CALL_TERM.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_CALL_TERM.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_CONV_FALLBACK.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_CONV_FALLBACK.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_GROUP.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_GROUP.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_GROUP_UPDT.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_GROUP_UPDT.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_IDEN_UP.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_IDEN_UP.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_NET_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_NET_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_PRIVATE.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_PRIVATE.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_RFSS_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_RFSS_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_SYS_SRV_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_SYS_SRV_BCAST.h (100%) rename {p25 => src/p25}/lc/tdulc/LC_TEL_INT_VCH_USER.cpp (100%) rename {p25 => src/p25}/lc/tdulc/LC_TEL_INT_VCH_USER.h (100%) rename {p25 => src/p25}/lc/tdulc/TDULCFactory.cpp (100%) rename {p25 => src/p25}/lc/tdulc/TDULCFactory.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_ACK_RSP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_ACK_RSP.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_CALL_ALRT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_CALL_ALRT.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_EXT_FNCT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_EXT_FNCT.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_GRP_AFF.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_GRP_AFF.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_GRP_VCH.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_GRP_VCH.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_MSG_UPDT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_MSG_UPDT.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_RAD_MON.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_RAD_MON.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_STS_UPDT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_STS_UPDT.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_UU_ANS.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_UU_ANS.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_UU_VCH.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_UU_VCH.h (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_U_REG.cpp (100%) rename {p25 => src/p25}/lc/tsbk/IOSP_U_REG.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_AUTH_FNE_RST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_AUTH_FNE_RST.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_AUTH_RESP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_AUTH_RESP.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_AUTH_SU_DMD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_AUTH_SU_DMD.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_CAN_SRV_REQ.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_CAN_SRV_REQ.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_EMERG_ALRM_REQ.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_GRP_AFF_Q_RSP.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_LOC_REG_REQ.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_LOC_REG_REQ.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_SNDCP_CH_REQ.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_SNDCP_CH_REQ.h (100%) rename {p25 => src/p25}/lc/tsbk/ISP_U_DEREG_REQ.cpp (100%) rename {p25 => src/p25}/lc/tsbk/ISP_U_DEREG_REQ.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_ACK_RSP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_ACK_RSP.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_CALL_ALRT.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_EXT_FNCT.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_GRP_AFF.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_GRP_AFF.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_MSG_UPDT.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_STS_UPDT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_IOSP_STS_UPDT.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_ISP_AUTH_RESP_M.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_AUTH_DMD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_AUTH_DMD.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_NET_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_ADJ_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_ADJ_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_AUTH_FNE_RESP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_AUTH_FNE_RESP.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_DENY_RSP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_DENY_RSP.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_DVM_GIT_HASH.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_DVM_GIT_HASH.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_DVM_LC_CALL_TERM.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_GRP_AFF_Q.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_GRP_AFF_Q.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP_VU.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_IDEN_UP_VU.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_LOC_REG_RSP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_LOC_REG_RSP.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_CC_BSI.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_CC_BSI.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_ADD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_ADD.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_DEL.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_DEL.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_PSH_CCH.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_MOT_PSH_CCH.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_NET_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_NET_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_QUE_RSP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_QUE_RSP.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_RFSS_STS_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_RFSS_STS_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SCCB.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SCCB.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SCCB_EXP.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SCCB_EXP.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_ANN.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_ANN.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_GNT.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SNDCP_CH_GNT.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SYNC_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SYNC_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SYS_SRV_BCAST.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_SYS_SRV_BCAST.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_TIME_DATE_ANN.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_TIME_DATE_ANN.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_TSBK_RAW.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_TSBK_RAW.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_U_DEREG_ACK.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_U_DEREG_ACK.h (100%) rename {p25 => src/p25}/lc/tsbk/OSP_U_REG_CMD.cpp (100%) rename {p25 => src/p25}/lc/tsbk/OSP_U_REG_CMD.h (100%) rename {p25 => src/p25}/lc/tsbk/TSBKFactory.cpp (100%) rename {p25 => src/p25}/lc/tsbk/TSBKFactory.h (100%) rename {p25 => src/p25}/lookups/P25AffiliationLookup.cpp (100%) rename {p25 => src/p25}/lookups/P25AffiliationLookup.h (100%) rename {p25 => src/p25}/packet/Data.cpp (100%) rename {p25 => src/p25}/packet/Data.h (100%) rename {p25 => src/p25}/packet/Trunk.cpp (100%) rename {p25 => src/p25}/packet/Trunk.h (100%) rename {p25 => src/p25}/packet/Voice.cpp (100%) rename {p25 => src/p25}/packet/Voice.h (100%) rename {remote => src/remote}/RESTClient.cpp (100%) rename {remote => src/remote}/RESTClient.h (100%) rename {remote => src/remote}/RESTClientMain.cpp (100%) rename {yaml => src/yaml}/Yaml.cpp (100%) rename {yaml => src/yaml}/Yaml.h (100%) rename dvm-watchdog.sh => tools/dvm-watchdog.sh (100%) rename start-dvm.sh => tools/start-dvm.sh (100%) rename stop-dvm.sh => tools/stop-dvm.sh (100%) rename stop-watchdog.sh => tools/stop-watchdog.sh (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 302f2c38..fdddbdda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,6 @@ jobs: gcc-arm-linux-gnueabihf \ g++-aarch64-linux-gnu \ libasio-dev - sudo git clone --recurse-submodules https://github.com/raspberrypi/tools.git /opt/tools - name: Build run: | if [[ "${{ matrix.arch }}" == "RPI_ARM" ]]; then diff --git a/AUTHORS.md b/AUTHORS.md index a5901f55..0050b977 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,19 +1,24 @@ # Digital Voice Modem Host ## Project Technical Leads + - Bryan Biedenkapp (https://github.com/gatekeep) ## Developers + - Natalie Moore (https://github.com/jelimoore) ## All other contributors and their affiliations -- Documentation Team - - Charles Bricker (https://github.com/ceb515) - - Connor Lovell (https://github.com/DevRanger) +- Build Chain and Helper Tools + - K4YT3X (https://github.com/k4yt3x) +- Documentation Team + - Charles Bricker (https://github.com/ceb515) + - Connor Lovell (https://github.com/DevRanger) - Community Support Team - - Steven Jennison (https://github.com/sjennison) - - Charles Bricker (https://github.com/ceb515) + - Steven Jennison (https://github.com/sjennison) + - Charles Bricker (https://github.com/ceb515) ## Special thanks to + - Jonathan Naylor G4KLX (https://github.com/g4klx) and the MMDVM authors. diff --git a/CMakeLists.txt b/CMakeLists.txt index cd78100e..a35a1c1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,123 +29,121 @@ cmake_minimum_required(VERSION 3.16.0) # dvmhost source/header files file(GLOB dvmhost_SRC # DMR module - "dmr/*.h" - "dmr/*.cpp" - "dmr/acl/*.h" - "dmr/acl/*.cpp" - "dmr/data/*.h" - "dmr/data/*.cpp" - "dmr/edac/*.h" - "dmr/edac/*.cpp" - "dmr/lc/*.h" - "dmr/lc/*.cpp" - "dmr/lc/csbk/*.h" - "dmr/lc/csbk/*.cpp" - "dmr/lookups/*.h" - "dmr/lookups/*.cpp" - "dmr/packet*.h" - "dmr/packet/*.cpp" + "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" # P25 module - "p25/*.h" - "p25/*.cpp" - "p25/acl/*.h" - "p25/acl/*.cpp" - "p25/data/*.h" - "p25/data/*.cpp" - "p25/dfsi/*.h" - "p25/dfsi/*.cpp" - "p25/dfsi/packet/*.h" - "p25/dfsi/packet/*.cpp" - "p25/edac/*.h" - "p25/edac/*.cpp" - "p25/lc/*.h" - "p25/lc/*.cpp" - "p25/lc/tdulc/*.h" - "p25/lc/tdulc/*.cpp" - "p25/lc/tsbk/*.h" - "p25/lc/tsbk/*.cpp" - "p25/lookups/*.h" - "p25/lookups/*.cpp" - "p25/packet/*.h" - "p25/packet/*.cpp" + "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/dfsi/packet/*.h" + "src/p25/dfsi/packet/*.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" # NXDN module - "nxdn/*.h" - "nxdn/*.cpp" - "nxdn/acl/*.h" - "nxdn/acl/*.cpp" - "nxdn/channel/*.h" - "nxdn/channel/*.cpp" - "nxdn/edac/*.h" - "nxdn/edac/*.cpp" - "nxdn/lc/*.h" - "nxdn/lc/*.cpp" - "nxdn/lc/rcch/*.h" - "nxdn/lc/rcch/*.cpp" - "nxdn/packet/*.h" - "nxdn/packet/*.cpp" + "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" # Core - "edac/*.h" - "edac/*.cpp" - "edac/rs/*.h" - "host/*.h" - "host/*.cpp" - "host/calibrate/*.h" - "host/calibrate/*.cpp" - "host/setup/*.h" - "host/setup/*.cpp" - "lookups/*.h" - "lookups/*.cpp" - "modem/*.h" - "modem/*.cpp" - "modem/port/*.h" - "modem/port/*.cpp" - "network/*.h" - "network/*.cpp" - "network/json/*.h" - "network/rest/*.h" - "network/rest/*.cpp" - "network/rest/http/*.h" - "network/rest/http/*.cpp" - "remote/RESTClient.cpp" - "remote/RESTClient.h" - "yaml/*.h" - "yaml/*.cpp" - "*.h" - "*.cpp" + "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/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/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" ) # dvmcmd source/header files file(GLOB dvmcmd_SRC - "network/UDPSocket.h" - "network/UDPSocket.cpp" - "network/RESTDefines.h" - "network/json/*.h" - "network/rest/*.h" - "network/rest/*.cpp" - "network/rest/http/*.h" - "network/rest/http/*.cpp" - "remote/*.h" - "remote/*.cpp" - "edac/SHA256.h" - "edac/SHA256.cpp" - "Defines.h" - "Thread.h" - "Thread.cpp" - "Log.h" - "Log.cpp" - "Utils.h" - "Utils.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/*.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" ) # dvmtest source/header files file(GLOB dvmtests_SRC "tests/nulltest.cpp" - "tests/edac/*.cpp" - "tests/p25/*.cpp" ) @@ -313,8 +311,15 @@ else () endif (CROSS_COMPILE_AARCH64) message(CHECK_START "Cross compiling for (old RPi) 32-bit ARM") if (CROSS_COMPILE_RPI_ARM) - set(CMAKE_C_COMPILER /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc) - set(CMAKE_CXX_COMPILER /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++) + message("Cloning legacy Raspberry Pi compilation toolchain") + Include(FetchContent) + FetchContent_Declare( + RPiTools + GIT_REPOSITORY https://github.com/raspberrypi/tools.git + ) + FetchContent_MakeAvailable(RPiTools) + set(CMAKE_C_COMPILER ${CMAKE_CURRENT_LIST_DIR}/_deps/rpitools-src/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc) + set(CMAKE_CXX_COMPILER ${CMAKE_CURRENT_LIST_DIR}/_deps/rpitools-src/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++) set(ARCH armhf) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf) message(CHECK_PASS "yes") @@ -365,7 +370,7 @@ else() target_link_libraries(asio::asio INTERFACE Threads::Threads) endif () add_executable(dvmhost ${dvmhost_SRC}) -target_include_directories(dvmhost PRIVATE .) +target_include_directories(dvmhost PRIVATE src) target_link_libraries(dvmhost PRIVATE asio::asio Threads::Threads util) set(CPACK_SET_DESTDIR true) @@ -403,7 +408,7 @@ else() endif () add_executable(dvmcmd ${dvmcmd_SRC}) target_link_libraries(dvmcmd PRIVATE asio::asio Threads::Threads) -target_include_directories(dvmcmd PRIVATE .) +target_include_directories(dvmcmd PRIVATE src) if (ENABLE_TESTS) # dvmtest project diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index b017086e..00000000 --- a/LICENSE.md +++ /dev/null @@ -1,264 +0,0 @@ -The GNU General Public License, Version 2, June 1991 (GPLv2) -============================================================ - -> Copyright (C) 1989, 1991 Free Software Foundation, Inc. -> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - - -Preamble --------- - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to most -of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you can -do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a -fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show them -these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced by -others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually -obtain patent licenses, in effect making the program proprietary. To prevent -this, we have made it clear that any patent must be licensed for everyone's free -use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - - -Terms And Conditions For Copying, Distribution And Modification ---------------------------------------------------------------- - -**0.** This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program or -work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included without -limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -**1.** You may copy and distribute verbatim copies of the Program's source code -as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the Program -a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. - -**2.** You may modify your copy or copies of the Program or any portion of it, -thus forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you also -meet all of these conditions: - -* **a)** You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - -* **b)** You must cause any work that you distribute or publish, that in whole - or in part contains or is derived from the Program or any part thereof, to - be licensed as a whole at no charge to all third parties under the terms of - this License. - -* **c)** If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the entire whole, -and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on the -Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -**3.** You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and 2 -above provided that you also do one of the following: - -* **a)** Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above on - a medium customarily used for software interchange; or, - -* **b)** Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - -* **c)** Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only for - noncommercial distribution and only if you received the program in object - code or executable form with such an offer, in accord with Subsection b - above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all the -source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code distributed -need not include anything that is normally distributed (in either source or -binary form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component itself -accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source code -from the same place counts as distribution of the source code, even though third -parties are not compelled to copy the source along with the object code. - -**4.** You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -**5.** You are not required to accept this License, since you have not signed -it. However, nothing else grants you permission to modify or distribute the -Program or its derivative works. These actions are prohibited by law if you do -not accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -**6.** Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties to this License. - -**7.** If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution of -the Program by all those who receive copies directly or indirectly through you, -then the only way you could satisfy both it and this License would be to refrain -entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and the -section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -**8.** If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. - -**9.** The Free Software Foundation may publish revised and/or new versions of -the General Public License from time to time. Such new versions will be similar -in spirit to the present version, but may differ in detail to address new -problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that version -or of any later version published by the Free Software Foundation. If the -Program does not specify a version number of this License, you may choose any -version ever published by the Free Software Foundation. - -**10.** If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - - -No Warranty ------------ - -**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/README.md b/README.md index e7314568..2e56dfef 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - # Digital Voice Modem Host 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. @@ -15,44 +14,47 @@ The DVM Host software does not have any specific library dependancies and is wri ### Dependencies -This project requires the ASIO library (https://think-async.com/Asio/) for its REST API services. This can be installed on most Debian/Ubuntu Linux's with: ```apt-get install libasio-dev``` +This project requires the ASIO library (https://think-async.com/Asio/) for its REST API services. This can be installed on most Debian/Ubuntu Linux's with: `apt-get install libasio-dev` -Alternatively, if you download the ASIO library from the ASIO website and extract it to a location, you can specify the path to the ASIO library using: ```-DWITH_ASIO=/path/to/asio```. This method is required when cross-compiling -for old Raspberry Pi ARM 32 bit. +Alternatively, if you download the ASIO library from the ASIO website and extract it to a location, you can specify the path to the ASIO library using: `-DWITH_ASIO=/path/to/asio`. This method is required when cross-compiling for old Raspberry Pi ARM 32 bit. ### Build Instructions -1. Clone the repository. ```git clone https://github.com/DVMProject/dvmhost.git``` + +1. Clone the repository. `git clone https://github.com/DVMProject/dvmhost.git` 2. Switch into the "dvmhost" folder. Create a new folder named "build" and switch into it. - ``` - # cd dvmhost - dvmhost # mkdir build - dvmhost # cd build - ``` + ``` + # cd dvmhost + dvmhost # mkdir build + dvmhost # cd build + ``` 3. Run CMake with any specific options required. (Where [options] is any various compilation options you require.) - ``` - dvmhost/build # cmake [options] .. - ... - -- Build files have been written to: dvmhost/build - dvmhost/build # make - ``` + ``` + dvmhost/build # cmake [options] .. + ... + -- Build files have been written to: dvmhost/build + dvmhost/build # make + ``` + If cross-compiling is required (for either ARM 32bit, 64bit or old Raspberry Pi ARM 32bit), the CMake build system has some options: -* ```-DCROSS_COMPILE_ARM=1``` - This will cross-compile dvmhost for ARM 32bit. -* ```-DCROSS_COMPILE_AARCH64=1``` - This will cross-compile dvmhost for ARM 64bit. -* ```-DCROSS_COMPILE_RPI_ARM=1``` - This will cross-compile for old Raspberry Pi ARM 32 bit. (see below) + +- `-DCROSS_COMPILE_ARM=1` - This will cross-compile dvmhost for ARM 32bit. +- `-DCROSS_COMPILE_AARCH64=1` - This will cross-compile dvmhost for ARM 64bit. +- `-DCROSS_COMPILE_RPI_ARM=1` - This will cross-compile for old Raspberry Pi ARM 32 bit. (see below) Please note cross-compliation requires you to have the appropriate development packages installed for your system. For ARM 32-bit, on Debian/Ubuntu OS install the "arm-linux-gnueabihf-gcc" and "arm-linux-gnueabihf-g++" packages. For ARM 64-bit, on Debian/Ubuntu OS install the "aarch64-linux-gnu-gcc" and "aarch64-linux-gnu-g++" packages. -* For old RPi 1 using Debian/Ubuntu OS install the standard ARM embedded toolchain (typically "arm-none-eabi-gcc" and "arm-none-eabi-g++"). - 1. Switch to "/opt" and checkout ```https://github.com/raspberrypi/tools.git```. +- For old RPi 1 using Debian/Ubuntu OS install the standard ARM embedded toolchain (typically "arm-none-eabi-gcc" and "arm-none-eabi-g++"). + 1. Switch to "/opt" and checkout `https://github.com/raspberrypi/tools.git`. ### Compiled Protocol Options -These are the protocols that are compiled-in to the host for data processing. By default, support for both DMR and P25 protocols are enabled. And, support for the NXDN protocol is disabled. What "compiled-in" support means is whether or not the host will perform *any* processing for the specified protocol (and this is regardless of whether or not the ```config.yml``` has a protocol specified for being enabled or not). +These are the protocols that are compiled-in to the host for data processing. By default, support for both DMR and P25 protocols are enabled. And, support for the NXDN protocol is disabled. What "compiled-in" support means is whether or not the host will perform _any_ processing for the specified protocol (and this is regardless of whether or not the `config.yml` has a protocol specified for being enabled or not). In order to change what protocol support is compiled into the host, these are the CMake options to supply: -* ```-DENABLE_DMR=1``` - This will enable compiled-in DMR protocol support. -* ```-DENABLE_P25=1``` - This will enable compiled-in P25 protocol support. -* ```-DENABLE_NXDN=1``` - This will enable compiled-in NXDN protocol support. + +- `-DENABLE_DMR=1` - This will enable compiled-in DMR protocol support. +- `-DENABLE_P25=1` - This will enable compiled-in P25 protocol support. +- `-DENABLE_NXDN=1` - This will enable compiled-in NXDN protocol support. **NXDN Support Note**: NXDN support is currently experimental. @@ -61,22 +63,26 @@ In order to change what protocol support is compiled into the host, these are th When first setting up a DVM instance, it is required to properly set the "Logical Channel ID" (or LCN ID) data and then calibrate the modem. ### Initial Setup -1. Edit ```config.yml``` and ensure the settings for the modem are correct, find the "modem" section in "system". Check that the uart protocol has the appropriate UART port and port speed set (the config.yml defaults to /dev/ttyUSB0 and 115200). -2. Start ```dvmhost``` as follows: ```/path/to/dvmhost -c /path/to/config.yml --setup```. This will start the dvmhost setup mode. -3. Set the channel ID using the "i" command. This will select the identity table bandplan entry to use for frequency selection. The bandplan information is contained within the ```iden_table.dat``` file. The identity table information will also appear during dvmhost startup like this: + +1. Edit `config.yml` and ensure the settings for the modem are correct, find the "modem" section in "system". Check that the uart protocol has the appropriate UART port and port speed set (the config.yml defaults to /dev/ttyUSB0 and 115200). +2. Start `dvmhost` as follows: `/path/to/dvmhost -c /path/to/config.yml --setup`. This will start the dvmhost setup mode. +3. Set the channel ID using the "i" command. This will select the identity table bandplan entry to use for frequency selection. The bandplan information is contained within the `iden_table.dat` file. The identity table information will also appear during dvmhost startup like this: + ``` M: ... (HOST) Channel Id 0: BaseFrequency = 851006250Hz, TXOffsetMhz = -45.000000MHz, BandwidthKhz = 12.500000KHz, SpaceKhz = 6.250000KHz M: ... (HOST) Channel Id 1: BaseFrequency = 762006250Hz, TXOffsetMhz = 30.000000MHz, BandwidthKhz = 12.500000KHz, SpaceKhz = 6.250000KHz M: ... (HOST) Channel Id 15: BaseFrequency = 935001250Hz, TXOffsetMhz = -39.000000MHz, BandwidthKhz = 12.500000KHz, SpaceKhz = 6.250000KHz M: ... (HOST) Channel Id 2: BaseFrequency = 450000000Hz, TXOffsetMhz = 5.000000MHz, BandwidthKhz = 12.500000KHz, SpaceKhz = 6.250000KHz ``` + 4. Set the channel number using either the "c" or "f" command. The "f" command is recommended as it will automatically calculate the appropriate channel number from the DVM's transmit frequency. 5. Save the configuration using "s" and quit setup mode with "q". ### Transmit Calibration -1. Start ```dvmhost``` as follows: ```/path/to/dvmhost -c /path/to/config.yml --cal```. This will start the dvmhost calibration mode. The best way to calibrate the DVM is to use a radio from which you can receive and transmit the appropriate test patterns (for example using ASTRO25 Tuner and an XTS radio to use the "Bit Error Rate" functions under Performance Testing). + +1. Start `dvmhost` as follows: `/path/to/dvmhost -c /path/to/config.yml --cal`. This will start the dvmhost calibration mode. The best way to calibrate the DVM is to use a radio from which you can receive and transmit the appropriate test patterns (for example using ASTRO25 Tuner and an XTS radio to use the "Bit Error Rate" functions under Performance Testing). 2. Depending on which protocol you are calibration with, enter DMR BS 1031 Hz Test Pattern (M) or P25 1011 Hz Test Pattern (NAC293 ID1 TG1) (P). -3. Ensure the TXLevel is set to 50 (it should be by default, "`" will display current values, use "T" [increase] and "t" [decrease] if necessary to set it to 50). +3. Ensure the TXLevel is set to 50 (it should be by default, "\`" will display current values, use "T" [increase] and "t" [decrease] if necessary to set it to 50). 4. If the hardware in use has a TX potentiometer, set it to the to minimum level. 5. Start Tx (press spacebar to toggle Tx). 6. While observing the BER via whatever means available, adjust the TX potentiometer for the lowest received BER. If necessary also adjust the software TXLevel for some fine tuning with the "T" (increase) and "t" (decrease). @@ -84,17 +90,19 @@ M: ... (HOST) Channel Id 2: BaseFrequency = 450000000Hz, TXOffsetMhz = 5.000000M 8. Save the configuration using "s" and quit calibration mode with "q". ### Receive Calibration -1. Start ```dvmhost``` as follows: ```/path/to/dvmhost -c /path/to/config.yml --cal```. This will start the dvmhost calibration mode. The best way to calibrate the DVM is to use a radio from which you can receive and transmit the appropriate test patterns (for example using ASTRO25 Tuner and an XTS radio to use the "Transmitter Test Pattern" functions under Performance Testing). + +1. Start `dvmhost` as follows: `/path/to/dvmhost -c /path/to/config.yml --cal`. This will start the dvmhost calibration mode. The best way to calibrate the DVM is to use a radio from which you can receive and transmit the appropriate test patterns (for example using ASTRO25 Tuner and an XTS radio to use the "Transmitter Test Pattern" functions under Performance Testing). 2. Depending on which protocol you are calibration with, enter DMR BS 1031 Hz Test Pattern (M) or P25 1011 Hz Test Pattern (P). -3. Ensure the RXLevel is set to 50 (it should be by default, "`" will display current values, use "R" [increase] and "r" [decrease] if necessary to set it to 50). +3. Ensure the RXLevel is set to 50 (it should be by default, "\`" will display current values, use "R" [increase] and "r" [decrease] if necessary to set it to 50). 4. If the hardware in use has a RX potentiometer, set it to the to minimum level. (If using something like the RepeaterBuilder STM32 board, decrease both the coarse and fine potentiometers to minimum level.) 5. Depending on which protocol you are calibration with, enter DMR MS 1031 Hz Test Pattern (J) or P25 1011 Hz Test Pattern (j). 6. While observing the BER via the calibration console, adjust the RX potentiometer(s) for the lowest received BER. If necessary also adjust the software RXLevel for some fine tuning with the "R" (increase) and "r" (decrease). 7. Save the configuration using "s" and quit calibration mode with "q". ### Calibration Notes -* During Transmit Calibration, it may be necessary to adjust the symbol levels directly. Normally this isn't required as the DVM will just work, but some radios require some fine adjustment of the symbol levels, this is exposed in the calibration mode. -* Unusually high BER >10% and other various receive problems may be due to the radio/hotspot being off frequency and requiring some adjustment. Even a slight frequency drift can be catastrophic for proper digital modulation. The recommendation is to ensure the interfaced radio does not have an overall reference frequency drift > +/- 150hz. An unusually high BER can also be explained by DC level offsets in the signal paths, or issues with the FM deviation levels on the interfaced radio being too high or too low. + +- During Transmit Calibration, it may be necessary to adjust the symbol levels directly. Normally this isn't required as the DVM will just work, but some radios require some fine adjustment of the symbol levels, this is exposed in the calibration mode. +- Unusually high BER >10% and other various receive problems may be due to the radio/hotspot being off frequency and requiring some adjustment. Even a slight frequency drift can be catastrophic for proper digital modulation. The recommendation is to ensure the interfaced radio does not have an overall reference frequency drift > +/- 150hz. An unusually high BER can also be explained by DC level offsets in the signal paths, or issues with the FM deviation levels on the interfaced radio being too high or too low. ## Command Line Parameters @@ -120,21 +128,20 @@ usage: ./dvmhost [-vh] [-f] [--cal] [--setup] [-c ] [--remot Security note: It is highly recommended that the REST API interface not be exposed directly to the internet. If such exposure is wanted/needed, it is highly recommended to proxy the dvmhost REST API through a modern web server (like nginx for example) rather then directly exposing dvmhost's REST API port. -Some extra notes for those who are using the Raspberry Pi, default Raspbian OS or Debian OS installations. You will not be able to flash or access the STM32 modem unless you do some things beforehand. +Some extra notes for those who are using the Raspberry Pi, default Raspbian OS or Debian OS installations. You will not be able to flash or access the STM32 modem unless you do some things beforehand. + +1. Disable the Bluetooth services. Bluetooth will share the GPIO serial interface on `/dev/ttyAMA0`. On Rasbian OS or Debian OS, this is done by: `systemctl disable bluetooth` +2. The default Rasbian OS and Debian OS will have a getty instance listening on `/dev/ttyAMA0`. This can conflict with the STM32, and is best if disabled. On Rasbian OS or Debian OS, this is done by: `systemctl disable serial-getty@ttyAMA0.service` +3. There's a default boot option which is also listening on the GPIO serial interface. This **must be disabled**. Open the `/boot/cmdline.txt` file in your favorite editor (vi or pico) and change it from: -1. Disable the Bluetooth services. Bluetooth will share the GPIO serial interface on ```/dev/ttyAMA0```. On Rasbian OS or Debian OS, this is done by: ```systemctl disable bluetooth``` -2. The default Rasbian OS and Debian OS will have a getty instance listening on ```/dev/ttyAMA0```. This can conflict with the STM32, and is best if disabled. On Rasbian OS or Debian OS, this is done by: ```systemctl disable serial-getty@ttyAMA0.service``` -3. There's a default boot option which is also listening on the GPIO serial interface. This **must be disabled**. Open the ```/boot/cmdline.txt``` file in your favorite editor (vi or pico) and change it from: +`console=serial0,115200 console=tty1 root=PARTUUID=[this is dynamic per partition] rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait` - ```console=serial0,115200 console=tty1 root=PARTUUID=[this is dynamic per partition] rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait``` - - to - - ```console=tty1 root=PARTUUID=[this is dynamic per partition] rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait``` - -All thats being done is to remove the ```console=serial0,115200``` part. Do not change anything else. Save the file, then reboot. +to + +`console=tty1 root=PARTUUID=[this is dynamic per partition] rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait` + +All thats being done is to remove the `console=serial0,115200` part. Do not change anything else. Save the file, then reboot. ## License This project is licensed under the GPLv2 License - see the [LICENSE.md](LICENSE.md) file for details. Use of this project is intended, for amateur and/or educational use ONLY. Any other use is at the risk of user and all commercial purposes is strictly discouraged. - diff --git a/RSSI.dat b/configs/RSSI.example.dat similarity index 100% rename from RSSI.dat rename to configs/RSSI.example.dat diff --git a/config.example.yml b/configs/config.example.yml similarity index 100% rename from config.example.yml rename to configs/config.example.yml diff --git a/iden_table.dat b/configs/iden_table.example.dat similarity index 100% rename from iden_table.dat rename to configs/iden_table.example.dat diff --git a/rid_acl.example.dat b/configs/rid_acl.example.dat similarity index 100% rename from rid_acl.example.dat rename to configs/rid_acl.example.dat diff --git a/tg_acl.example.dat b/configs/tg_acl.example.dat similarity index 100% rename from tg_acl.example.dat rename to configs/tg_acl.example.dat diff --git a/iden_channel_calc.py b/iden_channel_calc.py deleted file mode 100644 index 2cf2602a..00000000 --- a/iden_channel_calc.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/env python -# -# Digital Voice Modem - Fixed Network Equipment -# GPLv2 Open Source. Use is subject to license terms. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# @package DVM / dvmhost -# -############################################################################### -# Copyright (C) 2021 Bryan Biedenkapp -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -############################################################################### -from __future__ import print_function - -from pprint import pprint - -# --------------------------------------------------------------------------- -# Program Entry Point -# --------------------------------------------------------------------------- - -if __name__ == '__main__': - import argparse - import os - - MAX_FREQ_GAP = 25500000 - HZ_MHZ = float(1000000) - - print('Digital Voice Modem -> Identity Table Calculator D01.00') - - # CLI argument parser - parser = argparse.ArgumentParser() - parser.add_argument('--base', action = 'store', dest = 'BaseFrequency', type = int, help = 'Base Frequency (in Hz)', required = True) - parser.add_argument('--spacing', action = 'store', dest = 'Spacing', type = float, help = 'Channel Spacing (in KHz)', required = True) - parser.add_argument('--offset', action = 'store', dest = 'InputOffset', type = float, help = 'Input Offset (in MHz)', required = True) - parser.add_argument('--bandwidth', action = 'store', dest = 'Bandwidth', type = float, help = 'Bandwidth (in KHz)', required = True) - parser.add_argument('--tx', action = 'store', dest = 'TxFrequency', type = int, help = 'Transmit Frequency (in Hz, this should be within the band of the Base Frequency)', required = False) - parser.add_argument('--ch-no', action = 'store', dest = 'ChannelNo', type = str, help = 'Logical Channel Number', required = False) - cli_args = parser.parse_args() - - if (not cli_args.TxFrequency) and (not cli_args.ChannelNo): - print ('ERROR: Tx Frequency or Channel Number must be spcified!') - quit() - if (cli_args.TxFrequency) and (cli_args.ChannelNo): - print ('ERROR: Tx Frequency or Channel Number must be spcified!') - quit() - if (cli_args.TxFrequency): - if (cli_args.TxFrequency < cli_args.BaseFrequency): - print ('ERROR: Tx Frequency (' + '%.5f' % float(cli_args.TxFrequency / HZ_MHZ) + ') is out of band range for base frequency (' + '%.5f' % float(cli_args.BaseFrequency / HZ_MHZ) + '). ' + \ - 'Tx Frequency must be greater then the base frequency!') - quit() - if (cli_args.TxFrequency > (cli_args.BaseFrequency + MAX_FREQ_GAP)): - print ('ERROR: Tx Frequency (' + '%.5f' % float(cli_args.TxFrequency / HZ_MHZ) + ') is out of band range for base frequency (' + '%.5f' % float(cli_args.BaseFrequency / HZ_MHZ) + '). ' + \ - 'Tx Frequency must be no more then 25.5 Mhz higher then the base frequency!') - quit() - - print ('\r\nIdentity Data:') - - print ('Base Frequency: ' + '%.5f' % float(cli_args.BaseFrequency / HZ_MHZ) + ' MHz' + - '\r\nChannel Spacing: ' + '%.2f' % cli_args.Spacing + ' KHz' + - '\r\nReceive Offset: ' + '%.3f' % cli_args.InputOffset + ' MHz' + - '\r\nChannel Bandwidth: ' + '%.2f' % cli_args.Bandwidth + ' KHz') - - print ('\r\nIdentity Table Line: "' + 'xx,' + str(cli_args.BaseFrequency) + ',' + str(cli_args.Spacing) + ',' + - '%.3f' % cli_args.InputOffset + ',' + str(cli_args.Bandwidth) + ',"') - - print ('\r\nChannel Data:') - offsetHz = cli_args.InputOffset * HZ_MHZ - - if cli_args.ChannelNo: - space = cli_args.Spacing / 0.125 - chNo = int(cli_args.ChannelNo, 16) - - txFrequency = (cli_args.BaseFrequency + ((space * 125) * chNo)) - rxFrequency = txFrequency + offsetHz - - if (cli_args.InputOffset < 0 and rxFrequency < cli_args.BaseFrequency): - print ('ERROR: Invalid channel number (' + '%x' % chNo + '), defines a Rx Frequency (' + '%.5f' % float(rxFrequency / HZ_MHZ) + ') is out of band range for base frequency (' + '%.5f' % float(cli_args.BaseFrequency / HZ_MHZ) + '). ' + \ - 'Rx Frequency must be greater then the base frequency!') - quit() - - print ('\r\nChannel Number: ' + '%x' % chNo) - - print ('\r\nTx Frequency: ' + '%.5f' % (float(txFrequency / HZ_MHZ)) + ' MHz' + - '\r\nRx Frequency: ' + '%.5f' % (float(rxFrequency / HZ_MHZ)) + ' MHz') - else: - rxFrequency = int(cli_args.TxFrequency + offsetHz) - - if (cli_args.InputOffset < 0 and rxFrequency < cli_args.BaseFrequency): - print ('ERROR: Rx Frequency (' + '%.5f' % float(rxFrequency / HZ_MHZ) + ') is out of band range for base frequency (' + '%.5f' % float(cli_args.BaseFrequency / HZ_MHZ) + '). ' + \ - 'Rx Frequency must be greater then the base frequency!') - quit() - - print ('Tx Frequency: ' + '%.5f' % (float(cli_args.TxFrequency / HZ_MHZ)) + ' MHz' + - '\r\nRx Frequency: ' + '%.5f' % (float(rxFrequency / HZ_MHZ)) + ' MHz') - - spaceHz = int(cli_args.Spacing * 1000) - offsetHz = int(cli_args.InputOffset * HZ_MHZ) - - rootFreq = cli_args.TxFrequency - cli_args.BaseFrequency - chNo = int(rootFreq / spaceHz) - - print ('\r\nChannel Number: ' + '%x' % chNo) diff --git a/Defines.h b/src/Defines.h similarity index 100% rename from Defines.h rename to src/Defines.h diff --git a/HostMain.cpp b/src/HostMain.cpp similarity index 100% rename from HostMain.cpp rename to src/HostMain.cpp diff --git a/HostMain.h b/src/HostMain.h similarity index 100% rename from HostMain.h rename to src/HostMain.h diff --git a/Log.cpp b/src/Log.cpp similarity index 100% rename from Log.cpp rename to src/Log.cpp diff --git a/Log.h b/src/Log.h similarity index 100% rename from Log.h rename to src/Log.h diff --git a/Mutex.cpp b/src/Mutex.cpp similarity index 100% rename from Mutex.cpp rename to src/Mutex.cpp diff --git a/Mutex.h b/src/Mutex.h similarity index 100% rename from Mutex.h rename to src/Mutex.h diff --git a/RingBuffer.h b/src/RingBuffer.h similarity index 100% rename from RingBuffer.h rename to src/RingBuffer.h diff --git a/StopWatch.cpp b/src/StopWatch.cpp similarity index 100% rename from StopWatch.cpp rename to src/StopWatch.cpp diff --git a/StopWatch.h b/src/StopWatch.h similarity index 100% rename from StopWatch.h rename to src/StopWatch.h diff --git a/Thread.cpp b/src/Thread.cpp similarity index 100% rename from Thread.cpp rename to src/Thread.cpp diff --git a/Thread.h b/src/Thread.h similarity index 100% rename from Thread.h rename to src/Thread.h diff --git a/Timer.cpp b/src/Timer.cpp similarity index 100% rename from Timer.cpp rename to src/Timer.cpp diff --git a/Timer.h b/src/Timer.h similarity index 100% rename from Timer.h rename to src/Timer.h diff --git a/Utils.cpp b/src/Utils.cpp similarity index 100% rename from Utils.cpp rename to src/Utils.cpp diff --git a/Utils.h b/src/Utils.h similarity index 100% rename from Utils.h rename to src/Utils.h diff --git a/cpp.hint b/src/cpp.hint similarity index 100% rename from cpp.hint rename to src/cpp.hint diff --git a/dmr/Control.cpp b/src/dmr/Control.cpp similarity index 100% rename from dmr/Control.cpp rename to src/dmr/Control.cpp diff --git a/dmr/Control.h b/src/dmr/Control.h similarity index 100% rename from dmr/Control.h rename to src/dmr/Control.h diff --git a/dmr/DMRDefines.h b/src/dmr/DMRDefines.h similarity index 100% rename from dmr/DMRDefines.h rename to src/dmr/DMRDefines.h diff --git a/dmr/DMRUtils.h b/src/dmr/DMRUtils.h similarity index 100% rename from dmr/DMRUtils.h rename to src/dmr/DMRUtils.h diff --git a/dmr/SiteData.h b/src/dmr/SiteData.h similarity index 100% rename from dmr/SiteData.h rename to src/dmr/SiteData.h diff --git a/dmr/Slot.cpp b/src/dmr/Slot.cpp similarity index 100% rename from dmr/Slot.cpp rename to src/dmr/Slot.cpp diff --git a/dmr/Slot.h b/src/dmr/Slot.h similarity index 100% rename from dmr/Slot.h rename to src/dmr/Slot.h diff --git a/dmr/SlotType.cpp b/src/dmr/SlotType.cpp similarity index 100% rename from dmr/SlotType.cpp rename to src/dmr/SlotType.cpp diff --git a/dmr/SlotType.h b/src/dmr/SlotType.h similarity index 100% rename from dmr/SlotType.h rename to src/dmr/SlotType.h diff --git a/dmr/Sync.cpp b/src/dmr/Sync.cpp similarity index 100% rename from dmr/Sync.cpp rename to src/dmr/Sync.cpp diff --git a/dmr/Sync.h b/src/dmr/Sync.h similarity index 100% rename from dmr/Sync.h rename to src/dmr/Sync.h diff --git a/dmr/acl/AccessControl.cpp b/src/dmr/acl/AccessControl.cpp similarity index 100% rename from dmr/acl/AccessControl.cpp rename to src/dmr/acl/AccessControl.cpp diff --git a/dmr/acl/AccessControl.h b/src/dmr/acl/AccessControl.h similarity index 100% rename from dmr/acl/AccessControl.h rename to src/dmr/acl/AccessControl.h diff --git a/dmr/data/Data.cpp b/src/dmr/data/Data.cpp similarity index 100% rename from dmr/data/Data.cpp rename to src/dmr/data/Data.cpp diff --git a/dmr/data/Data.h b/src/dmr/data/Data.h similarity index 100% rename from dmr/data/Data.h rename to src/dmr/data/Data.h diff --git a/dmr/data/DataHeader.cpp b/src/dmr/data/DataHeader.cpp similarity index 100% rename from dmr/data/DataHeader.cpp rename to src/dmr/data/DataHeader.cpp diff --git a/dmr/data/DataHeader.h b/src/dmr/data/DataHeader.h similarity index 100% rename from dmr/data/DataHeader.h rename to src/dmr/data/DataHeader.h diff --git a/dmr/data/EMB.cpp b/src/dmr/data/EMB.cpp similarity index 100% rename from dmr/data/EMB.cpp rename to src/dmr/data/EMB.cpp diff --git a/dmr/data/EMB.h b/src/dmr/data/EMB.h similarity index 100% rename from dmr/data/EMB.h rename to src/dmr/data/EMB.h diff --git a/dmr/data/EmbeddedData.cpp b/src/dmr/data/EmbeddedData.cpp similarity index 100% rename from dmr/data/EmbeddedData.cpp rename to src/dmr/data/EmbeddedData.cpp diff --git a/dmr/data/EmbeddedData.h b/src/dmr/data/EmbeddedData.h similarity index 100% rename from dmr/data/EmbeddedData.h rename to src/dmr/data/EmbeddedData.h diff --git a/dmr/edac/Trellis.cpp b/src/dmr/edac/Trellis.cpp similarity index 100% rename from dmr/edac/Trellis.cpp rename to src/dmr/edac/Trellis.cpp diff --git a/dmr/edac/Trellis.h b/src/dmr/edac/Trellis.h similarity index 100% rename from dmr/edac/Trellis.h rename to src/dmr/edac/Trellis.h diff --git a/dmr/lc/CSBK.cpp b/src/dmr/lc/CSBK.cpp similarity index 100% rename from dmr/lc/CSBK.cpp rename to src/dmr/lc/CSBK.cpp diff --git a/dmr/lc/CSBK.h b/src/dmr/lc/CSBK.h similarity index 100% rename from dmr/lc/CSBK.h rename to src/dmr/lc/CSBK.h diff --git a/dmr/lc/FullLC.cpp b/src/dmr/lc/FullLC.cpp similarity index 100% rename from dmr/lc/FullLC.cpp rename to src/dmr/lc/FullLC.cpp diff --git a/dmr/lc/FullLC.h b/src/dmr/lc/FullLC.h similarity index 100% rename from dmr/lc/FullLC.h rename to src/dmr/lc/FullLC.h diff --git a/dmr/lc/LC.cpp b/src/dmr/lc/LC.cpp similarity index 100% rename from dmr/lc/LC.cpp rename to src/dmr/lc/LC.cpp diff --git a/dmr/lc/LC.h b/src/dmr/lc/LC.h similarity index 100% rename from dmr/lc/LC.h rename to src/dmr/lc/LC.h diff --git a/dmr/lc/PrivacyLC.cpp b/src/dmr/lc/PrivacyLC.cpp similarity index 100% rename from dmr/lc/PrivacyLC.cpp rename to src/dmr/lc/PrivacyLC.cpp diff --git a/dmr/lc/PrivacyLC.h b/src/dmr/lc/PrivacyLC.h similarity index 100% rename from dmr/lc/PrivacyLC.h rename to src/dmr/lc/PrivacyLC.h diff --git a/dmr/lc/ShortLC.cpp b/src/dmr/lc/ShortLC.cpp similarity index 100% rename from dmr/lc/ShortLC.cpp rename to src/dmr/lc/ShortLC.cpp diff --git a/dmr/lc/ShortLC.h b/src/dmr/lc/ShortLC.h similarity index 100% rename from dmr/lc/ShortLC.h rename to src/dmr/lc/ShortLC.h diff --git a/dmr/lc/csbk/CSBKFactory.cpp b/src/dmr/lc/csbk/CSBKFactory.cpp similarity index 100% rename from dmr/lc/csbk/CSBKFactory.cpp rename to src/dmr/lc/csbk/CSBKFactory.cpp diff --git a/dmr/lc/csbk/CSBKFactory.h b/src/dmr/lc/csbk/CSBKFactory.h similarity index 100% rename from dmr/lc/csbk/CSBKFactory.h rename to src/dmr/lc/csbk/CSBKFactory.h diff --git a/dmr/lc/csbk/CSBK_ACK_RSP.cpp b/src/dmr/lc/csbk/CSBK_ACK_RSP.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_ACK_RSP.cpp rename to src/dmr/lc/csbk/CSBK_ACK_RSP.cpp diff --git a/dmr/lc/csbk/CSBK_ACK_RSP.h b/src/dmr/lc/csbk/CSBK_ACK_RSP.h similarity index 100% rename from dmr/lc/csbk/CSBK_ACK_RSP.h rename to src/dmr/lc/csbk/CSBK_ACK_RSP.h diff --git a/dmr/lc/csbk/CSBK_ALOHA.cpp b/src/dmr/lc/csbk/CSBK_ALOHA.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_ALOHA.cpp rename to src/dmr/lc/csbk/CSBK_ALOHA.cpp diff --git a/dmr/lc/csbk/CSBK_ALOHA.h b/src/dmr/lc/csbk/CSBK_ALOHA.h similarity index 100% rename from dmr/lc/csbk/CSBK_ALOHA.h rename to src/dmr/lc/csbk/CSBK_ALOHA.h diff --git a/dmr/lc/csbk/CSBK_BROADCAST.cpp b/src/dmr/lc/csbk/CSBK_BROADCAST.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_BROADCAST.cpp rename to src/dmr/lc/csbk/CSBK_BROADCAST.cpp diff --git a/dmr/lc/csbk/CSBK_BROADCAST.h b/src/dmr/lc/csbk/CSBK_BROADCAST.h similarity index 100% rename from dmr/lc/csbk/CSBK_BROADCAST.h rename to src/dmr/lc/csbk/CSBK_BROADCAST.h diff --git a/dmr/lc/csbk/CSBK_BSDWNACT.cpp b/src/dmr/lc/csbk/CSBK_BSDWNACT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_BSDWNACT.cpp rename to src/dmr/lc/csbk/CSBK_BSDWNACT.cpp diff --git a/dmr/lc/csbk/CSBK_BSDWNACT.h b/src/dmr/lc/csbk/CSBK_BSDWNACT.h similarity index 100% rename from dmr/lc/csbk/CSBK_BSDWNACT.h rename to src/dmr/lc/csbk/CSBK_BSDWNACT.h diff --git a/dmr/lc/csbk/CSBK_CALL_ALRT.cpp b/src/dmr/lc/csbk/CSBK_CALL_ALRT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_CALL_ALRT.cpp rename to src/dmr/lc/csbk/CSBK_CALL_ALRT.cpp diff --git a/dmr/lc/csbk/CSBK_CALL_ALRT.h b/src/dmr/lc/csbk/CSBK_CALL_ALRT.h similarity index 100% rename from dmr/lc/csbk/CSBK_CALL_ALRT.h rename to src/dmr/lc/csbk/CSBK_CALL_ALRT.h diff --git a/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp b/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp rename to src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp diff --git a/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h b/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h similarity index 100% rename from dmr/lc/csbk/CSBK_DVM_GIT_HASH.h rename to src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.h diff --git a/dmr/lc/csbk/CSBK_EXT_FNCT.cpp b/src/dmr/lc/csbk/CSBK_EXT_FNCT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_EXT_FNCT.cpp rename to src/dmr/lc/csbk/CSBK_EXT_FNCT.cpp diff --git a/dmr/lc/csbk/CSBK_EXT_FNCT.h b/src/dmr/lc/csbk/CSBK_EXT_FNCT.h similarity index 100% rename from dmr/lc/csbk/CSBK_EXT_FNCT.h rename to src/dmr/lc/csbk/CSBK_EXT_FNCT.h diff --git a/dmr/lc/csbk/CSBK_NACK_RSP.cpp b/src/dmr/lc/csbk/CSBK_NACK_RSP.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_NACK_RSP.cpp rename to src/dmr/lc/csbk/CSBK_NACK_RSP.cpp diff --git a/dmr/lc/csbk/CSBK_NACK_RSP.h b/src/dmr/lc/csbk/CSBK_NACK_RSP.h similarity index 100% rename from dmr/lc/csbk/CSBK_NACK_RSP.h rename to src/dmr/lc/csbk/CSBK_NACK_RSP.h diff --git a/dmr/lc/csbk/CSBK_PD_GRANT.cpp b/src/dmr/lc/csbk/CSBK_PD_GRANT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_PD_GRANT.cpp rename to src/dmr/lc/csbk/CSBK_PD_GRANT.cpp diff --git a/dmr/lc/csbk/CSBK_PD_GRANT.h b/src/dmr/lc/csbk/CSBK_PD_GRANT.h similarity index 100% rename from dmr/lc/csbk/CSBK_PD_GRANT.h rename to src/dmr/lc/csbk/CSBK_PD_GRANT.h diff --git a/dmr/lc/csbk/CSBK_PRECCSBK.cpp b/src/dmr/lc/csbk/CSBK_PRECCSBK.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_PRECCSBK.cpp rename to src/dmr/lc/csbk/CSBK_PRECCSBK.cpp diff --git a/dmr/lc/csbk/CSBK_PRECCSBK.h b/src/dmr/lc/csbk/CSBK_PRECCSBK.h similarity index 100% rename from dmr/lc/csbk/CSBK_PRECCSBK.h rename to src/dmr/lc/csbk/CSBK_PRECCSBK.h diff --git a/dmr/lc/csbk/CSBK_PV_GRANT.cpp b/src/dmr/lc/csbk/CSBK_PV_GRANT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_PV_GRANT.cpp rename to src/dmr/lc/csbk/CSBK_PV_GRANT.cpp diff --git a/dmr/lc/csbk/CSBK_PV_GRANT.h b/src/dmr/lc/csbk/CSBK_PV_GRANT.h similarity index 100% rename from dmr/lc/csbk/CSBK_PV_GRANT.h rename to src/dmr/lc/csbk/CSBK_PV_GRANT.h diff --git a/dmr/lc/csbk/CSBK_RAND.cpp b/src/dmr/lc/csbk/CSBK_RAND.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_RAND.cpp rename to src/dmr/lc/csbk/CSBK_RAND.cpp diff --git a/dmr/lc/csbk/CSBK_RAND.h b/src/dmr/lc/csbk/CSBK_RAND.h similarity index 100% rename from dmr/lc/csbk/CSBK_RAND.h rename to src/dmr/lc/csbk/CSBK_RAND.h diff --git a/dmr/lc/csbk/CSBK_RAW.cpp b/src/dmr/lc/csbk/CSBK_RAW.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_RAW.cpp rename to src/dmr/lc/csbk/CSBK_RAW.cpp diff --git a/dmr/lc/csbk/CSBK_RAW.h b/src/dmr/lc/csbk/CSBK_RAW.h similarity index 100% rename from dmr/lc/csbk/CSBK_RAW.h rename to src/dmr/lc/csbk/CSBK_RAW.h diff --git a/dmr/lc/csbk/CSBK_TD_GRANT.cpp b/src/dmr/lc/csbk/CSBK_TD_GRANT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_TD_GRANT.cpp rename to src/dmr/lc/csbk/CSBK_TD_GRANT.cpp diff --git a/dmr/lc/csbk/CSBK_TD_GRANT.h b/src/dmr/lc/csbk/CSBK_TD_GRANT.h similarity index 100% rename from dmr/lc/csbk/CSBK_TD_GRANT.h rename to src/dmr/lc/csbk/CSBK_TD_GRANT.h diff --git a/dmr/lc/csbk/CSBK_TV_GRANT.cpp b/src/dmr/lc/csbk/CSBK_TV_GRANT.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_TV_GRANT.cpp rename to src/dmr/lc/csbk/CSBK_TV_GRANT.cpp diff --git a/dmr/lc/csbk/CSBK_TV_GRANT.h b/src/dmr/lc/csbk/CSBK_TV_GRANT.h similarity index 100% rename from dmr/lc/csbk/CSBK_TV_GRANT.h rename to src/dmr/lc/csbk/CSBK_TV_GRANT.h diff --git a/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp b/src/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp rename to src/dmr/lc/csbk/CSBK_UU_ANS_RSP.cpp diff --git a/dmr/lc/csbk/CSBK_UU_ANS_RSP.h b/src/dmr/lc/csbk/CSBK_UU_ANS_RSP.h similarity index 100% rename from dmr/lc/csbk/CSBK_UU_ANS_RSP.h rename to src/dmr/lc/csbk/CSBK_UU_ANS_RSP.h diff --git a/dmr/lc/csbk/CSBK_UU_V_REQ.cpp b/src/dmr/lc/csbk/CSBK_UU_V_REQ.cpp similarity index 100% rename from dmr/lc/csbk/CSBK_UU_V_REQ.cpp rename to src/dmr/lc/csbk/CSBK_UU_V_REQ.cpp diff --git a/dmr/lc/csbk/CSBK_UU_V_REQ.h b/src/dmr/lc/csbk/CSBK_UU_V_REQ.h similarity index 100% rename from dmr/lc/csbk/CSBK_UU_V_REQ.h rename to src/dmr/lc/csbk/CSBK_UU_V_REQ.h diff --git a/dmr/lookups/DMRAffiliationLookup.cpp b/src/dmr/lookups/DMRAffiliationLookup.cpp similarity index 100% rename from dmr/lookups/DMRAffiliationLookup.cpp rename to src/dmr/lookups/DMRAffiliationLookup.cpp diff --git a/dmr/lookups/DMRAffiliationLookup.h b/src/dmr/lookups/DMRAffiliationLookup.h similarity index 100% rename from dmr/lookups/DMRAffiliationLookup.h rename to src/dmr/lookups/DMRAffiliationLookup.h diff --git a/dmr/packet/ControlSignaling.cpp b/src/dmr/packet/ControlSignaling.cpp similarity index 100% rename from dmr/packet/ControlSignaling.cpp rename to src/dmr/packet/ControlSignaling.cpp diff --git a/dmr/packet/ControlSignaling.h b/src/dmr/packet/ControlSignaling.h similarity index 100% rename from dmr/packet/ControlSignaling.h rename to src/dmr/packet/ControlSignaling.h diff --git a/dmr/packet/Data.cpp b/src/dmr/packet/Data.cpp similarity index 100% rename from dmr/packet/Data.cpp rename to src/dmr/packet/Data.cpp diff --git a/dmr/packet/Data.h b/src/dmr/packet/Data.h similarity index 100% rename from dmr/packet/Data.h rename to src/dmr/packet/Data.h diff --git a/dmr/packet/Voice.cpp b/src/dmr/packet/Voice.cpp similarity index 100% rename from dmr/packet/Voice.cpp rename to src/dmr/packet/Voice.cpp diff --git a/dmr/packet/Voice.h b/src/dmr/packet/Voice.h similarity index 100% rename from dmr/packet/Voice.h rename to src/dmr/packet/Voice.h diff --git a/edac/AMBEFEC.cpp b/src/edac/AMBEFEC.cpp similarity index 100% rename from edac/AMBEFEC.cpp rename to src/edac/AMBEFEC.cpp diff --git a/edac/AMBEFEC.h b/src/edac/AMBEFEC.h similarity index 100% rename from edac/AMBEFEC.h rename to src/edac/AMBEFEC.h diff --git a/edac/BCH.cpp b/src/edac/BCH.cpp similarity index 100% rename from edac/BCH.cpp rename to src/edac/BCH.cpp diff --git a/edac/BCH.h b/src/edac/BCH.h similarity index 100% rename from edac/BCH.h rename to src/edac/BCH.h diff --git a/edac/BPTC19696.cpp b/src/edac/BPTC19696.cpp similarity index 100% rename from edac/BPTC19696.cpp rename to src/edac/BPTC19696.cpp diff --git a/edac/BPTC19696.h b/src/edac/BPTC19696.h similarity index 100% rename from edac/BPTC19696.h rename to src/edac/BPTC19696.h diff --git a/edac/CRC.cpp b/src/edac/CRC.cpp similarity index 100% rename from edac/CRC.cpp rename to src/edac/CRC.cpp diff --git a/edac/CRC.h b/src/edac/CRC.h similarity index 100% rename from edac/CRC.h rename to src/edac/CRC.h diff --git a/edac/Golay2087.cpp b/src/edac/Golay2087.cpp similarity index 100% rename from edac/Golay2087.cpp rename to src/edac/Golay2087.cpp diff --git a/edac/Golay2087.h b/src/edac/Golay2087.h similarity index 100% rename from edac/Golay2087.h rename to src/edac/Golay2087.h diff --git a/edac/Golay24128.cpp b/src/edac/Golay24128.cpp similarity index 100% rename from edac/Golay24128.cpp rename to src/edac/Golay24128.cpp diff --git a/edac/Golay24128.h b/src/edac/Golay24128.h similarity index 100% rename from edac/Golay24128.h rename to src/edac/Golay24128.h diff --git a/edac/Hamming.cpp b/src/edac/Hamming.cpp similarity index 100% rename from edac/Hamming.cpp rename to src/edac/Hamming.cpp diff --git a/edac/Hamming.h b/src/edac/Hamming.h similarity index 100% rename from edac/Hamming.h rename to src/edac/Hamming.h diff --git a/edac/QR1676.cpp b/src/edac/QR1676.cpp similarity index 100% rename from edac/QR1676.cpp rename to src/edac/QR1676.cpp diff --git a/edac/QR1676.h b/src/edac/QR1676.h similarity index 100% rename from edac/QR1676.h rename to src/edac/QR1676.h diff --git a/edac/RS129.cpp b/src/edac/RS129.cpp similarity index 100% rename from edac/RS129.cpp rename to src/edac/RS129.cpp diff --git a/edac/RS129.h b/src/edac/RS129.h similarity index 100% rename from edac/RS129.h rename to src/edac/RS129.h diff --git a/edac/RS634717.cpp b/src/edac/RS634717.cpp similarity index 100% rename from edac/RS634717.cpp rename to src/edac/RS634717.cpp diff --git a/edac/RS634717.h b/src/edac/RS634717.h similarity index 100% rename from edac/RS634717.h rename to src/edac/RS634717.h diff --git a/edac/SHA256.cpp b/src/edac/SHA256.cpp similarity index 100% rename from edac/SHA256.cpp rename to src/edac/SHA256.cpp diff --git a/edac/SHA256.h b/src/edac/SHA256.h similarity index 100% rename from edac/SHA256.h rename to src/edac/SHA256.h diff --git a/edac/rs/RS.h b/src/edac/rs/RS.h similarity index 100% rename from edac/rs/RS.h rename to src/edac/rs/RS.h diff --git a/host/Console.cpp b/src/host/Console.cpp similarity index 100% rename from host/Console.cpp rename to src/host/Console.cpp diff --git a/host/Console.h b/src/host/Console.h similarity index 100% rename from host/Console.h rename to src/host/Console.h diff --git a/host/Host.cpp b/src/host/Host.cpp similarity index 100% rename from host/Host.cpp rename to src/host/Host.cpp diff --git a/host/Host.h b/src/host/Host.h similarity index 100% rename from host/Host.h rename to src/host/Host.h diff --git a/host/calibrate/HostCal.cpp b/src/host/calibrate/HostCal.cpp similarity index 100% rename from host/calibrate/HostCal.cpp rename to src/host/calibrate/HostCal.cpp diff --git a/host/calibrate/HostCal.h b/src/host/calibrate/HostCal.h similarity index 100% rename from host/calibrate/HostCal.h rename to src/host/calibrate/HostCal.h diff --git a/host/setup/HostSetup.cpp b/src/host/setup/HostSetup.cpp similarity index 100% rename from host/setup/HostSetup.cpp rename to src/host/setup/HostSetup.cpp diff --git a/host/setup/HostSetup.h b/src/host/setup/HostSetup.h similarity index 100% rename from host/setup/HostSetup.h rename to src/host/setup/HostSetup.h diff --git a/linux/dvmhost.service b/src/linux/dvmhost.service similarity index 100% rename from linux/dvmhost.service rename to src/linux/dvmhost.service diff --git a/lookups/AffiliationLookup.cpp b/src/lookups/AffiliationLookup.cpp similarity index 100% rename from lookups/AffiliationLookup.cpp rename to src/lookups/AffiliationLookup.cpp diff --git a/lookups/AffiliationLookup.h b/src/lookups/AffiliationLookup.h similarity index 100% rename from lookups/AffiliationLookup.h rename to src/lookups/AffiliationLookup.h diff --git a/lookups/IdenTableLookup.cpp b/src/lookups/IdenTableLookup.cpp similarity index 100% rename from lookups/IdenTableLookup.cpp rename to src/lookups/IdenTableLookup.cpp diff --git a/lookups/IdenTableLookup.h b/src/lookups/IdenTableLookup.h similarity index 100% rename from lookups/IdenTableLookup.h rename to src/lookups/IdenTableLookup.h diff --git a/lookups/LookupTable.h b/src/lookups/LookupTable.h similarity index 100% rename from lookups/LookupTable.h rename to src/lookups/LookupTable.h diff --git a/lookups/RSSIInterpolator.cpp b/src/lookups/RSSIInterpolator.cpp similarity index 100% rename from lookups/RSSIInterpolator.cpp rename to src/lookups/RSSIInterpolator.cpp diff --git a/lookups/RSSIInterpolator.h b/src/lookups/RSSIInterpolator.h similarity index 100% rename from lookups/RSSIInterpolator.h rename to src/lookups/RSSIInterpolator.h diff --git a/lookups/RadioIdLookup.cpp b/src/lookups/RadioIdLookup.cpp similarity index 100% rename from lookups/RadioIdLookup.cpp rename to src/lookups/RadioIdLookup.cpp diff --git a/lookups/RadioIdLookup.h b/src/lookups/RadioIdLookup.h similarity index 100% rename from lookups/RadioIdLookup.h rename to src/lookups/RadioIdLookup.h diff --git a/lookups/TalkgroupIdLookup.cpp b/src/lookups/TalkgroupIdLookup.cpp similarity index 100% rename from lookups/TalkgroupIdLookup.cpp rename to src/lookups/TalkgroupIdLookup.cpp diff --git a/lookups/TalkgroupIdLookup.h b/src/lookups/TalkgroupIdLookup.h similarity index 100% rename from lookups/TalkgroupIdLookup.h rename to src/lookups/TalkgroupIdLookup.h diff --git a/modem/Modem.cpp b/src/modem/Modem.cpp similarity index 100% rename from modem/Modem.cpp rename to src/modem/Modem.cpp diff --git a/modem/Modem.h b/src/modem/Modem.h similarity index 100% rename from modem/Modem.h rename to src/modem/Modem.h diff --git a/modem/port/IModemPort.cpp b/src/modem/port/IModemPort.cpp similarity index 100% rename from modem/port/IModemPort.cpp rename to src/modem/port/IModemPort.cpp diff --git a/modem/port/IModemPort.h b/src/modem/port/IModemPort.h similarity index 100% rename from modem/port/IModemPort.h rename to src/modem/port/IModemPort.h diff --git a/modem/port/ISerialPort.cpp b/src/modem/port/ISerialPort.cpp similarity index 100% rename from modem/port/ISerialPort.cpp rename to src/modem/port/ISerialPort.cpp diff --git a/modem/port/ISerialPort.h b/src/modem/port/ISerialPort.h similarity index 100% rename from modem/port/ISerialPort.h rename to src/modem/port/ISerialPort.h diff --git a/modem/port/ModemNullPort.cpp b/src/modem/port/ModemNullPort.cpp similarity index 100% rename from modem/port/ModemNullPort.cpp rename to src/modem/port/ModemNullPort.cpp diff --git a/modem/port/ModemNullPort.h b/src/modem/port/ModemNullPort.h similarity index 100% rename from modem/port/ModemNullPort.h rename to src/modem/port/ModemNullPort.h diff --git a/modem/port/PseudoPTYPort.cpp b/src/modem/port/PseudoPTYPort.cpp similarity index 100% rename from modem/port/PseudoPTYPort.cpp rename to src/modem/port/PseudoPTYPort.cpp diff --git a/modem/port/PseudoPTYPort.h b/src/modem/port/PseudoPTYPort.h similarity index 100% rename from modem/port/PseudoPTYPort.h rename to src/modem/port/PseudoPTYPort.h diff --git a/modem/port/UARTPort.cpp b/src/modem/port/UARTPort.cpp similarity index 100% rename from modem/port/UARTPort.cpp rename to src/modem/port/UARTPort.cpp diff --git a/modem/port/UARTPort.h b/src/modem/port/UARTPort.h similarity index 100% rename from modem/port/UARTPort.h rename to src/modem/port/UARTPort.h diff --git a/modem/port/UDPPort.cpp b/src/modem/port/UDPPort.cpp similarity index 100% rename from modem/port/UDPPort.cpp rename to src/modem/port/UDPPort.cpp diff --git a/modem/port/UDPPort.h b/src/modem/port/UDPPort.h similarity index 100% rename from modem/port/UDPPort.h rename to src/modem/port/UDPPort.h diff --git a/network/BaseNetwork.cpp b/src/network/BaseNetwork.cpp similarity index 100% rename from network/BaseNetwork.cpp rename to src/network/BaseNetwork.cpp diff --git a/network/BaseNetwork.h b/src/network/BaseNetwork.h similarity index 100% rename from network/BaseNetwork.h rename to src/network/BaseNetwork.h diff --git a/network/Network.cpp b/src/network/Network.cpp similarity index 100% rename from network/Network.cpp rename to src/network/Network.cpp diff --git a/network/Network.h b/src/network/Network.h similarity index 100% rename from network/Network.h rename to src/network/Network.h diff --git a/network/RESTAPI.cpp b/src/network/RESTAPI.cpp similarity index 100% rename from network/RESTAPI.cpp rename to src/network/RESTAPI.cpp diff --git a/network/RESTAPI.h b/src/network/RESTAPI.h similarity index 100% rename from network/RESTAPI.h rename to src/network/RESTAPI.h diff --git a/network/RESTDefines.h b/src/network/RESTDefines.h similarity index 100% rename from network/RESTDefines.h rename to src/network/RESTDefines.h diff --git a/network/UDPSocket.cpp b/src/network/UDPSocket.cpp similarity index 100% rename from network/UDPSocket.cpp rename to src/network/UDPSocket.cpp diff --git a/network/UDPSocket.h b/src/network/UDPSocket.h similarity index 100% rename from network/UDPSocket.h rename to src/network/UDPSocket.h diff --git a/network/json/json.h b/src/network/json/json.h similarity index 100% rename from network/json/json.h rename to src/network/json/json.h diff --git a/network/rest/RequestDispatcher.h b/src/network/rest/RequestDispatcher.h similarity index 100% rename from network/rest/RequestDispatcher.h rename to src/network/rest/RequestDispatcher.h diff --git a/network/rest/http/Connection.h b/src/network/rest/http/Connection.h similarity index 100% rename from network/rest/http/Connection.h rename to src/network/rest/http/Connection.h diff --git a/network/rest/http/ConnectionManager.h b/src/network/rest/http/ConnectionManager.h similarity index 100% rename from network/rest/http/ConnectionManager.h rename to src/network/rest/http/ConnectionManager.h diff --git a/network/rest/http/HTTPClient.h b/src/network/rest/http/HTTPClient.h similarity index 100% rename from network/rest/http/HTTPClient.h rename to src/network/rest/http/HTTPClient.h diff --git a/network/rest/http/HTTPHeaders.h b/src/network/rest/http/HTTPHeaders.h similarity index 100% rename from network/rest/http/HTTPHeaders.h rename to src/network/rest/http/HTTPHeaders.h diff --git a/network/rest/http/HTTPLexer.cpp b/src/network/rest/http/HTTPLexer.cpp similarity index 100% rename from network/rest/http/HTTPLexer.cpp rename to src/network/rest/http/HTTPLexer.cpp diff --git a/network/rest/http/HTTPLexer.h b/src/network/rest/http/HTTPLexer.h similarity index 100% rename from network/rest/http/HTTPLexer.h rename to src/network/rest/http/HTTPLexer.h diff --git a/network/rest/http/HTTPPayload.cpp b/src/network/rest/http/HTTPPayload.cpp similarity index 100% rename from network/rest/http/HTTPPayload.cpp rename to src/network/rest/http/HTTPPayload.cpp diff --git a/network/rest/http/HTTPPayload.h b/src/network/rest/http/HTTPPayload.h similarity index 100% rename from network/rest/http/HTTPPayload.h rename to src/network/rest/http/HTTPPayload.h diff --git a/network/rest/http/HTTPRequestHandler.cpp b/src/network/rest/http/HTTPRequestHandler.cpp similarity index 100% rename from network/rest/http/HTTPRequestHandler.cpp rename to src/network/rest/http/HTTPRequestHandler.cpp diff --git a/network/rest/http/HTTPRequestHandler.h b/src/network/rest/http/HTTPRequestHandler.h similarity index 100% rename from network/rest/http/HTTPRequestHandler.h rename to src/network/rest/http/HTTPRequestHandler.h diff --git a/network/rest/http/HTTPServer.h b/src/network/rest/http/HTTPServer.h similarity index 100% rename from network/rest/http/HTTPServer.h rename to src/network/rest/http/HTTPServer.h diff --git a/nxdn/Audio.cpp b/src/nxdn/Audio.cpp similarity index 100% rename from nxdn/Audio.cpp rename to src/nxdn/Audio.cpp diff --git a/nxdn/Audio.h b/src/nxdn/Audio.h similarity index 100% rename from nxdn/Audio.h rename to src/nxdn/Audio.h diff --git a/nxdn/Control.cpp b/src/nxdn/Control.cpp similarity index 100% rename from nxdn/Control.cpp rename to src/nxdn/Control.cpp diff --git a/nxdn/Control.h b/src/nxdn/Control.h similarity index 100% rename from nxdn/Control.h rename to src/nxdn/Control.h diff --git a/nxdn/NXDNDefines.h b/src/nxdn/NXDNDefines.h similarity index 100% rename from nxdn/NXDNDefines.h rename to src/nxdn/NXDNDefines.h diff --git a/nxdn/NXDNUtils.cpp b/src/nxdn/NXDNUtils.cpp similarity index 100% rename from nxdn/NXDNUtils.cpp rename to src/nxdn/NXDNUtils.cpp diff --git a/nxdn/NXDNUtils.h b/src/nxdn/NXDNUtils.h similarity index 100% rename from nxdn/NXDNUtils.h rename to src/nxdn/NXDNUtils.h diff --git a/nxdn/SiteData.h b/src/nxdn/SiteData.h similarity index 100% rename from nxdn/SiteData.h rename to src/nxdn/SiteData.h diff --git a/nxdn/Sync.cpp b/src/nxdn/Sync.cpp similarity index 100% rename from nxdn/Sync.cpp rename to src/nxdn/Sync.cpp diff --git a/nxdn/Sync.h b/src/nxdn/Sync.h similarity index 100% rename from nxdn/Sync.h rename to src/nxdn/Sync.h diff --git a/nxdn/acl/AccessControl.cpp b/src/nxdn/acl/AccessControl.cpp similarity index 100% rename from nxdn/acl/AccessControl.cpp rename to src/nxdn/acl/AccessControl.cpp diff --git a/nxdn/acl/AccessControl.h b/src/nxdn/acl/AccessControl.h similarity index 100% rename from nxdn/acl/AccessControl.h rename to src/nxdn/acl/AccessControl.h diff --git a/nxdn/channel/CAC.cpp b/src/nxdn/channel/CAC.cpp similarity index 100% rename from nxdn/channel/CAC.cpp rename to src/nxdn/channel/CAC.cpp diff --git a/nxdn/channel/CAC.h b/src/nxdn/channel/CAC.h similarity index 100% rename from nxdn/channel/CAC.h rename to src/nxdn/channel/CAC.h diff --git a/nxdn/channel/FACCH1.cpp b/src/nxdn/channel/FACCH1.cpp similarity index 100% rename from nxdn/channel/FACCH1.cpp rename to src/nxdn/channel/FACCH1.cpp diff --git a/nxdn/channel/FACCH1.h b/src/nxdn/channel/FACCH1.h similarity index 100% rename from nxdn/channel/FACCH1.h rename to src/nxdn/channel/FACCH1.h diff --git a/nxdn/channel/LICH.cpp b/src/nxdn/channel/LICH.cpp similarity index 100% rename from nxdn/channel/LICH.cpp rename to src/nxdn/channel/LICH.cpp diff --git a/nxdn/channel/LICH.h b/src/nxdn/channel/LICH.h similarity index 100% rename from nxdn/channel/LICH.h rename to src/nxdn/channel/LICH.h diff --git a/nxdn/channel/SACCH.cpp b/src/nxdn/channel/SACCH.cpp similarity index 100% rename from nxdn/channel/SACCH.cpp rename to src/nxdn/channel/SACCH.cpp diff --git a/nxdn/channel/SACCH.h b/src/nxdn/channel/SACCH.h similarity index 100% rename from nxdn/channel/SACCH.h rename to src/nxdn/channel/SACCH.h diff --git a/nxdn/channel/UDCH.cpp b/src/nxdn/channel/UDCH.cpp similarity index 100% rename from nxdn/channel/UDCH.cpp rename to src/nxdn/channel/UDCH.cpp diff --git a/nxdn/channel/UDCH.h b/src/nxdn/channel/UDCH.h similarity index 100% rename from nxdn/channel/UDCH.h rename to src/nxdn/channel/UDCH.h diff --git a/nxdn/edac/Convolution.cpp b/src/nxdn/edac/Convolution.cpp similarity index 100% rename from nxdn/edac/Convolution.cpp rename to src/nxdn/edac/Convolution.cpp diff --git a/nxdn/edac/Convolution.h b/src/nxdn/edac/Convolution.h similarity index 100% rename from nxdn/edac/Convolution.h rename to src/nxdn/edac/Convolution.h diff --git a/nxdn/lc/PacketInformation.cpp b/src/nxdn/lc/PacketInformation.cpp similarity index 100% rename from nxdn/lc/PacketInformation.cpp rename to src/nxdn/lc/PacketInformation.cpp diff --git a/nxdn/lc/PacketInformation.h b/src/nxdn/lc/PacketInformation.h similarity index 100% rename from nxdn/lc/PacketInformation.h rename to src/nxdn/lc/PacketInformation.h diff --git a/nxdn/lc/RCCH.cpp b/src/nxdn/lc/RCCH.cpp similarity index 100% rename from nxdn/lc/RCCH.cpp rename to src/nxdn/lc/RCCH.cpp diff --git a/nxdn/lc/RCCH.h b/src/nxdn/lc/RCCH.h similarity index 100% rename from nxdn/lc/RCCH.h rename to src/nxdn/lc/RCCH.h diff --git a/nxdn/lc/RTCH.cpp b/src/nxdn/lc/RTCH.cpp similarity index 100% rename from nxdn/lc/RTCH.cpp rename to src/nxdn/lc/RTCH.cpp diff --git a/nxdn/lc/RTCH.h b/src/nxdn/lc/RTCH.h similarity index 100% rename from nxdn/lc/RTCH.h rename to src/nxdn/lc/RTCH.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_REG.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_REG.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_REG.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_REG.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_REG.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp b/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp rename to src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.cpp diff --git a/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h b/src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h similarity index 100% rename from nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h rename to src/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h diff --git a/nxdn/lc/rcch/RCCHFactory.cpp b/src/nxdn/lc/rcch/RCCHFactory.cpp similarity index 100% rename from nxdn/lc/rcch/RCCHFactory.cpp rename to src/nxdn/lc/rcch/RCCHFactory.cpp diff --git a/nxdn/lc/rcch/RCCHFactory.h b/src/nxdn/lc/rcch/RCCHFactory.h similarity index 100% rename from nxdn/lc/rcch/RCCHFactory.h rename to src/nxdn/lc/rcch/RCCHFactory.h diff --git a/nxdn/packet/Data.cpp b/src/nxdn/packet/Data.cpp similarity index 100% rename from nxdn/packet/Data.cpp rename to src/nxdn/packet/Data.cpp diff --git a/nxdn/packet/Data.h b/src/nxdn/packet/Data.h similarity index 100% rename from nxdn/packet/Data.h rename to src/nxdn/packet/Data.h diff --git a/nxdn/packet/Trunk.cpp b/src/nxdn/packet/Trunk.cpp similarity index 100% rename from nxdn/packet/Trunk.cpp rename to src/nxdn/packet/Trunk.cpp diff --git a/nxdn/packet/Trunk.h b/src/nxdn/packet/Trunk.h similarity index 100% rename from nxdn/packet/Trunk.h rename to src/nxdn/packet/Trunk.h diff --git a/nxdn/packet/Voice.cpp b/src/nxdn/packet/Voice.cpp similarity index 100% rename from nxdn/packet/Voice.cpp rename to src/nxdn/packet/Voice.cpp diff --git a/nxdn/packet/Voice.h b/src/nxdn/packet/Voice.h similarity index 100% rename from nxdn/packet/Voice.h rename to src/nxdn/packet/Voice.h diff --git a/p25/Audio.cpp b/src/p25/Audio.cpp similarity index 100% rename from p25/Audio.cpp rename to src/p25/Audio.cpp diff --git a/p25/Audio.h b/src/p25/Audio.h similarity index 100% rename from p25/Audio.h rename to src/p25/Audio.h diff --git a/p25/Control.cpp b/src/p25/Control.cpp similarity index 100% rename from p25/Control.cpp rename to src/p25/Control.cpp diff --git a/p25/Control.h b/src/p25/Control.h similarity index 100% rename from p25/Control.h rename to src/p25/Control.h diff --git a/p25/NID.cpp b/src/p25/NID.cpp similarity index 100% rename from p25/NID.cpp rename to src/p25/NID.cpp diff --git a/p25/NID.h b/src/p25/NID.h similarity index 100% rename from p25/NID.h rename to src/p25/NID.h diff --git a/p25/P25Defines.h b/src/p25/P25Defines.h similarity index 100% rename from p25/P25Defines.h rename to src/p25/P25Defines.h diff --git a/p25/P25Utils.cpp b/src/p25/P25Utils.cpp similarity index 100% rename from p25/P25Utils.cpp rename to src/p25/P25Utils.cpp diff --git a/p25/P25Utils.h b/src/p25/P25Utils.h similarity index 100% rename from p25/P25Utils.h rename to src/p25/P25Utils.h diff --git a/p25/SiteData.h b/src/p25/SiteData.h similarity index 100% rename from p25/SiteData.h rename to src/p25/SiteData.h diff --git a/p25/Sync.cpp b/src/p25/Sync.cpp similarity index 100% rename from p25/Sync.cpp rename to src/p25/Sync.cpp diff --git a/p25/Sync.h b/src/p25/Sync.h similarity index 100% rename from p25/Sync.h rename to src/p25/Sync.h diff --git a/p25/acl/AccessControl.cpp b/src/p25/acl/AccessControl.cpp similarity index 100% rename from p25/acl/AccessControl.cpp rename to src/p25/acl/AccessControl.cpp diff --git a/p25/acl/AccessControl.h b/src/p25/acl/AccessControl.h similarity index 100% rename from p25/acl/AccessControl.h rename to src/p25/acl/AccessControl.h diff --git a/p25/data/DataBlock.cpp b/src/p25/data/DataBlock.cpp similarity index 100% rename from p25/data/DataBlock.cpp rename to src/p25/data/DataBlock.cpp diff --git a/p25/data/DataBlock.h b/src/p25/data/DataBlock.h similarity index 100% rename from p25/data/DataBlock.h rename to src/p25/data/DataBlock.h diff --git a/p25/data/DataHeader.cpp b/src/p25/data/DataHeader.cpp similarity index 100% rename from p25/data/DataHeader.cpp rename to src/p25/data/DataHeader.cpp diff --git a/p25/data/DataHeader.h b/src/p25/data/DataHeader.h similarity index 100% rename from p25/data/DataHeader.h rename to src/p25/data/DataHeader.h diff --git a/p25/data/LowSpeedData.cpp b/src/p25/data/LowSpeedData.cpp similarity index 100% rename from p25/data/LowSpeedData.cpp rename to src/p25/data/LowSpeedData.cpp diff --git a/p25/data/LowSpeedData.h b/src/p25/data/LowSpeedData.h similarity index 100% rename from p25/data/LowSpeedData.h rename to src/p25/data/LowSpeedData.h diff --git a/p25/dfsi/DFSIDefines.h b/src/p25/dfsi/DFSIDefines.h similarity index 100% rename from p25/dfsi/DFSIDefines.h rename to src/p25/dfsi/DFSIDefines.h diff --git a/p25/dfsi/LC.cpp b/src/p25/dfsi/LC.cpp similarity index 100% rename from p25/dfsi/LC.cpp rename to src/p25/dfsi/LC.cpp diff --git a/p25/dfsi/LC.h b/src/p25/dfsi/LC.h similarity index 100% rename from p25/dfsi/LC.h rename to src/p25/dfsi/LC.h diff --git a/p25/dfsi/packet/DFSITrunk.cpp b/src/p25/dfsi/packet/DFSITrunk.cpp similarity index 100% rename from p25/dfsi/packet/DFSITrunk.cpp rename to src/p25/dfsi/packet/DFSITrunk.cpp diff --git a/p25/dfsi/packet/DFSITrunk.h b/src/p25/dfsi/packet/DFSITrunk.h similarity index 100% rename from p25/dfsi/packet/DFSITrunk.h rename to src/p25/dfsi/packet/DFSITrunk.h diff --git a/p25/dfsi/packet/DFSIVoice.cpp b/src/p25/dfsi/packet/DFSIVoice.cpp similarity index 100% rename from p25/dfsi/packet/DFSIVoice.cpp rename to src/p25/dfsi/packet/DFSIVoice.cpp diff --git a/p25/dfsi/packet/DFSIVoice.h b/src/p25/dfsi/packet/DFSIVoice.h similarity index 100% rename from p25/dfsi/packet/DFSIVoice.h rename to src/p25/dfsi/packet/DFSIVoice.h diff --git a/p25/edac/Trellis.cpp b/src/p25/edac/Trellis.cpp similarity index 100% rename from p25/edac/Trellis.cpp rename to src/p25/edac/Trellis.cpp diff --git a/p25/edac/Trellis.h b/src/p25/edac/Trellis.h similarity index 100% rename from p25/edac/Trellis.h rename to src/p25/edac/Trellis.h diff --git a/p25/lc/AMBT.cpp b/src/p25/lc/AMBT.cpp similarity index 100% rename from p25/lc/AMBT.cpp rename to src/p25/lc/AMBT.cpp diff --git a/p25/lc/AMBT.h b/src/p25/lc/AMBT.h similarity index 100% rename from p25/lc/AMBT.h rename to src/p25/lc/AMBT.h diff --git a/p25/lc/LC.cpp b/src/p25/lc/LC.cpp similarity index 100% rename from p25/lc/LC.cpp rename to src/p25/lc/LC.cpp diff --git a/p25/lc/LC.h b/src/p25/lc/LC.h similarity index 100% rename from p25/lc/LC.h rename to src/p25/lc/LC.h diff --git a/p25/lc/TDULC.cpp b/src/p25/lc/TDULC.cpp similarity index 100% rename from p25/lc/TDULC.cpp rename to src/p25/lc/TDULC.cpp diff --git a/p25/lc/TDULC.h b/src/p25/lc/TDULC.h similarity index 100% rename from p25/lc/TDULC.h rename to src/p25/lc/TDULC.h diff --git a/p25/lc/TSBK.cpp b/src/p25/lc/TSBK.cpp similarity index 100% rename from p25/lc/TSBK.cpp rename to src/p25/lc/TSBK.cpp diff --git a/p25/lc/TSBK.h b/src/p25/lc/TSBK.h similarity index 100% rename from p25/lc/TSBK.h rename to src/p25/lc/TSBK.h diff --git a/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp b/src/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp similarity index 100% rename from p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp rename to src/p25/lc/tdulc/LC_ADJ_STS_BCAST.cpp diff --git a/p25/lc/tdulc/LC_ADJ_STS_BCAST.h b/src/p25/lc/tdulc/LC_ADJ_STS_BCAST.h similarity index 100% rename from p25/lc/tdulc/LC_ADJ_STS_BCAST.h rename to src/p25/lc/tdulc/LC_ADJ_STS_BCAST.h diff --git a/p25/lc/tdulc/LC_CALL_TERM.cpp b/src/p25/lc/tdulc/LC_CALL_TERM.cpp similarity index 100% rename from p25/lc/tdulc/LC_CALL_TERM.cpp rename to src/p25/lc/tdulc/LC_CALL_TERM.cpp diff --git a/p25/lc/tdulc/LC_CALL_TERM.h b/src/p25/lc/tdulc/LC_CALL_TERM.h similarity index 100% rename from p25/lc/tdulc/LC_CALL_TERM.h rename to src/p25/lc/tdulc/LC_CALL_TERM.h diff --git a/p25/lc/tdulc/LC_CONV_FALLBACK.cpp b/src/p25/lc/tdulc/LC_CONV_FALLBACK.cpp similarity index 100% rename from p25/lc/tdulc/LC_CONV_FALLBACK.cpp rename to src/p25/lc/tdulc/LC_CONV_FALLBACK.cpp diff --git a/p25/lc/tdulc/LC_CONV_FALLBACK.h b/src/p25/lc/tdulc/LC_CONV_FALLBACK.h similarity index 100% rename from p25/lc/tdulc/LC_CONV_FALLBACK.h rename to src/p25/lc/tdulc/LC_CONV_FALLBACK.h diff --git a/p25/lc/tdulc/LC_GROUP.cpp b/src/p25/lc/tdulc/LC_GROUP.cpp similarity index 100% rename from p25/lc/tdulc/LC_GROUP.cpp rename to src/p25/lc/tdulc/LC_GROUP.cpp diff --git a/p25/lc/tdulc/LC_GROUP.h b/src/p25/lc/tdulc/LC_GROUP.h similarity index 100% rename from p25/lc/tdulc/LC_GROUP.h rename to src/p25/lc/tdulc/LC_GROUP.h diff --git a/p25/lc/tdulc/LC_GROUP_UPDT.cpp b/src/p25/lc/tdulc/LC_GROUP_UPDT.cpp similarity index 100% rename from p25/lc/tdulc/LC_GROUP_UPDT.cpp rename to src/p25/lc/tdulc/LC_GROUP_UPDT.cpp diff --git a/p25/lc/tdulc/LC_GROUP_UPDT.h b/src/p25/lc/tdulc/LC_GROUP_UPDT.h similarity index 100% rename from p25/lc/tdulc/LC_GROUP_UPDT.h rename to src/p25/lc/tdulc/LC_GROUP_UPDT.h diff --git a/p25/lc/tdulc/LC_IDEN_UP.cpp b/src/p25/lc/tdulc/LC_IDEN_UP.cpp similarity index 100% rename from p25/lc/tdulc/LC_IDEN_UP.cpp rename to src/p25/lc/tdulc/LC_IDEN_UP.cpp diff --git a/p25/lc/tdulc/LC_IDEN_UP.h b/src/p25/lc/tdulc/LC_IDEN_UP.h similarity index 100% rename from p25/lc/tdulc/LC_IDEN_UP.h rename to src/p25/lc/tdulc/LC_IDEN_UP.h diff --git a/p25/lc/tdulc/LC_NET_STS_BCAST.cpp b/src/p25/lc/tdulc/LC_NET_STS_BCAST.cpp similarity index 100% rename from p25/lc/tdulc/LC_NET_STS_BCAST.cpp rename to src/p25/lc/tdulc/LC_NET_STS_BCAST.cpp diff --git a/p25/lc/tdulc/LC_NET_STS_BCAST.h b/src/p25/lc/tdulc/LC_NET_STS_BCAST.h similarity index 100% rename from p25/lc/tdulc/LC_NET_STS_BCAST.h rename to src/p25/lc/tdulc/LC_NET_STS_BCAST.h diff --git a/p25/lc/tdulc/LC_PRIVATE.cpp b/src/p25/lc/tdulc/LC_PRIVATE.cpp similarity index 100% rename from p25/lc/tdulc/LC_PRIVATE.cpp rename to src/p25/lc/tdulc/LC_PRIVATE.cpp diff --git a/p25/lc/tdulc/LC_PRIVATE.h b/src/p25/lc/tdulc/LC_PRIVATE.h similarity index 100% rename from p25/lc/tdulc/LC_PRIVATE.h rename to src/p25/lc/tdulc/LC_PRIVATE.h diff --git a/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp b/src/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp similarity index 100% rename from p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp rename to src/p25/lc/tdulc/LC_RFSS_STS_BCAST.cpp diff --git a/p25/lc/tdulc/LC_RFSS_STS_BCAST.h b/src/p25/lc/tdulc/LC_RFSS_STS_BCAST.h similarity index 100% rename from p25/lc/tdulc/LC_RFSS_STS_BCAST.h rename to src/p25/lc/tdulc/LC_RFSS_STS_BCAST.h diff --git a/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp b/src/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp similarity index 100% rename from p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp rename to src/p25/lc/tdulc/LC_SYS_SRV_BCAST.cpp diff --git a/p25/lc/tdulc/LC_SYS_SRV_BCAST.h b/src/p25/lc/tdulc/LC_SYS_SRV_BCAST.h similarity index 100% rename from p25/lc/tdulc/LC_SYS_SRV_BCAST.h rename to src/p25/lc/tdulc/LC_SYS_SRV_BCAST.h diff --git a/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp b/src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp similarity index 100% rename from p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp rename to src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.cpp diff --git a/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h b/src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h similarity index 100% rename from p25/lc/tdulc/LC_TEL_INT_VCH_USER.h rename to src/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h diff --git a/p25/lc/tdulc/TDULCFactory.cpp b/src/p25/lc/tdulc/TDULCFactory.cpp similarity index 100% rename from p25/lc/tdulc/TDULCFactory.cpp rename to src/p25/lc/tdulc/TDULCFactory.cpp diff --git a/p25/lc/tdulc/TDULCFactory.h b/src/p25/lc/tdulc/TDULCFactory.h similarity index 100% rename from p25/lc/tdulc/TDULCFactory.h rename to src/p25/lc/tdulc/TDULCFactory.h diff --git a/p25/lc/tsbk/IOSP_ACK_RSP.cpp b/src/p25/lc/tsbk/IOSP_ACK_RSP.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_ACK_RSP.cpp rename to src/p25/lc/tsbk/IOSP_ACK_RSP.cpp diff --git a/p25/lc/tsbk/IOSP_ACK_RSP.h b/src/p25/lc/tsbk/IOSP_ACK_RSP.h similarity index 100% rename from p25/lc/tsbk/IOSP_ACK_RSP.h rename to src/p25/lc/tsbk/IOSP_ACK_RSP.h diff --git a/p25/lc/tsbk/IOSP_CALL_ALRT.cpp b/src/p25/lc/tsbk/IOSP_CALL_ALRT.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_CALL_ALRT.cpp rename to src/p25/lc/tsbk/IOSP_CALL_ALRT.cpp diff --git a/p25/lc/tsbk/IOSP_CALL_ALRT.h b/src/p25/lc/tsbk/IOSP_CALL_ALRT.h similarity index 100% rename from p25/lc/tsbk/IOSP_CALL_ALRT.h rename to src/p25/lc/tsbk/IOSP_CALL_ALRT.h diff --git a/p25/lc/tsbk/IOSP_EXT_FNCT.cpp b/src/p25/lc/tsbk/IOSP_EXT_FNCT.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_EXT_FNCT.cpp rename to src/p25/lc/tsbk/IOSP_EXT_FNCT.cpp diff --git a/p25/lc/tsbk/IOSP_EXT_FNCT.h b/src/p25/lc/tsbk/IOSP_EXT_FNCT.h similarity index 100% rename from p25/lc/tsbk/IOSP_EXT_FNCT.h rename to src/p25/lc/tsbk/IOSP_EXT_FNCT.h diff --git a/p25/lc/tsbk/IOSP_GRP_AFF.cpp b/src/p25/lc/tsbk/IOSP_GRP_AFF.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_GRP_AFF.cpp rename to src/p25/lc/tsbk/IOSP_GRP_AFF.cpp diff --git a/p25/lc/tsbk/IOSP_GRP_AFF.h b/src/p25/lc/tsbk/IOSP_GRP_AFF.h similarity index 100% rename from p25/lc/tsbk/IOSP_GRP_AFF.h rename to src/p25/lc/tsbk/IOSP_GRP_AFF.h diff --git a/p25/lc/tsbk/IOSP_GRP_VCH.cpp b/src/p25/lc/tsbk/IOSP_GRP_VCH.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_GRP_VCH.cpp rename to src/p25/lc/tsbk/IOSP_GRP_VCH.cpp diff --git a/p25/lc/tsbk/IOSP_GRP_VCH.h b/src/p25/lc/tsbk/IOSP_GRP_VCH.h similarity index 100% rename from p25/lc/tsbk/IOSP_GRP_VCH.h rename to src/p25/lc/tsbk/IOSP_GRP_VCH.h diff --git a/p25/lc/tsbk/IOSP_MSG_UPDT.cpp b/src/p25/lc/tsbk/IOSP_MSG_UPDT.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_MSG_UPDT.cpp rename to src/p25/lc/tsbk/IOSP_MSG_UPDT.cpp diff --git a/p25/lc/tsbk/IOSP_MSG_UPDT.h b/src/p25/lc/tsbk/IOSP_MSG_UPDT.h similarity index 100% rename from p25/lc/tsbk/IOSP_MSG_UPDT.h rename to src/p25/lc/tsbk/IOSP_MSG_UPDT.h diff --git a/p25/lc/tsbk/IOSP_RAD_MON.cpp b/src/p25/lc/tsbk/IOSP_RAD_MON.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_RAD_MON.cpp rename to src/p25/lc/tsbk/IOSP_RAD_MON.cpp diff --git a/p25/lc/tsbk/IOSP_RAD_MON.h b/src/p25/lc/tsbk/IOSP_RAD_MON.h similarity index 100% rename from p25/lc/tsbk/IOSP_RAD_MON.h rename to src/p25/lc/tsbk/IOSP_RAD_MON.h diff --git a/p25/lc/tsbk/IOSP_STS_UPDT.cpp b/src/p25/lc/tsbk/IOSP_STS_UPDT.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_STS_UPDT.cpp rename to src/p25/lc/tsbk/IOSP_STS_UPDT.cpp diff --git a/p25/lc/tsbk/IOSP_STS_UPDT.h b/src/p25/lc/tsbk/IOSP_STS_UPDT.h similarity index 100% rename from p25/lc/tsbk/IOSP_STS_UPDT.h rename to src/p25/lc/tsbk/IOSP_STS_UPDT.h diff --git a/p25/lc/tsbk/IOSP_UU_ANS.cpp b/src/p25/lc/tsbk/IOSP_UU_ANS.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_UU_ANS.cpp rename to src/p25/lc/tsbk/IOSP_UU_ANS.cpp diff --git a/p25/lc/tsbk/IOSP_UU_ANS.h b/src/p25/lc/tsbk/IOSP_UU_ANS.h similarity index 100% rename from p25/lc/tsbk/IOSP_UU_ANS.h rename to src/p25/lc/tsbk/IOSP_UU_ANS.h diff --git a/p25/lc/tsbk/IOSP_UU_VCH.cpp b/src/p25/lc/tsbk/IOSP_UU_VCH.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_UU_VCH.cpp rename to src/p25/lc/tsbk/IOSP_UU_VCH.cpp diff --git a/p25/lc/tsbk/IOSP_UU_VCH.h b/src/p25/lc/tsbk/IOSP_UU_VCH.h similarity index 100% rename from p25/lc/tsbk/IOSP_UU_VCH.h rename to src/p25/lc/tsbk/IOSP_UU_VCH.h diff --git a/p25/lc/tsbk/IOSP_U_REG.cpp b/src/p25/lc/tsbk/IOSP_U_REG.cpp similarity index 100% rename from p25/lc/tsbk/IOSP_U_REG.cpp rename to src/p25/lc/tsbk/IOSP_U_REG.cpp diff --git a/p25/lc/tsbk/IOSP_U_REG.h b/src/p25/lc/tsbk/IOSP_U_REG.h similarity index 100% rename from p25/lc/tsbk/IOSP_U_REG.h rename to src/p25/lc/tsbk/IOSP_U_REG.h diff --git a/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp b/src/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp similarity index 100% rename from p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp rename to src/p25/lc/tsbk/ISP_AUTH_FNE_RST.cpp diff --git a/p25/lc/tsbk/ISP_AUTH_FNE_RST.h b/src/p25/lc/tsbk/ISP_AUTH_FNE_RST.h similarity index 100% rename from p25/lc/tsbk/ISP_AUTH_FNE_RST.h rename to src/p25/lc/tsbk/ISP_AUTH_FNE_RST.h diff --git a/p25/lc/tsbk/ISP_AUTH_RESP.cpp b/src/p25/lc/tsbk/ISP_AUTH_RESP.cpp similarity index 100% rename from p25/lc/tsbk/ISP_AUTH_RESP.cpp rename to src/p25/lc/tsbk/ISP_AUTH_RESP.cpp diff --git a/p25/lc/tsbk/ISP_AUTH_RESP.h b/src/p25/lc/tsbk/ISP_AUTH_RESP.h similarity index 100% rename from p25/lc/tsbk/ISP_AUTH_RESP.h rename to src/p25/lc/tsbk/ISP_AUTH_RESP.h diff --git a/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp b/src/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp similarity index 100% rename from p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp rename to src/p25/lc/tsbk/ISP_AUTH_SU_DMD.cpp diff --git a/p25/lc/tsbk/ISP_AUTH_SU_DMD.h b/src/p25/lc/tsbk/ISP_AUTH_SU_DMD.h similarity index 100% rename from p25/lc/tsbk/ISP_AUTH_SU_DMD.h rename to src/p25/lc/tsbk/ISP_AUTH_SU_DMD.h diff --git a/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp b/src/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp similarity index 100% rename from p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp rename to src/p25/lc/tsbk/ISP_CAN_SRV_REQ.cpp diff --git a/p25/lc/tsbk/ISP_CAN_SRV_REQ.h b/src/p25/lc/tsbk/ISP_CAN_SRV_REQ.h similarity index 100% rename from p25/lc/tsbk/ISP_CAN_SRV_REQ.h rename to src/p25/lc/tsbk/ISP_CAN_SRV_REQ.h diff --git a/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp b/src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp similarity index 100% rename from p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp rename to src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.cpp diff --git a/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h b/src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h similarity index 100% rename from p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h rename to src/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h diff --git a/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp b/src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp similarity index 100% rename from p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp rename to src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.cpp diff --git a/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h b/src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h similarity index 100% rename from p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h rename to src/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h diff --git a/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp b/src/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp similarity index 100% rename from p25/lc/tsbk/ISP_LOC_REG_REQ.cpp rename to src/p25/lc/tsbk/ISP_LOC_REG_REQ.cpp diff --git a/p25/lc/tsbk/ISP_LOC_REG_REQ.h b/src/p25/lc/tsbk/ISP_LOC_REG_REQ.h similarity index 100% rename from p25/lc/tsbk/ISP_LOC_REG_REQ.h rename to src/p25/lc/tsbk/ISP_LOC_REG_REQ.h diff --git a/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp b/src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp similarity index 100% rename from p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp rename to src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp diff --git a/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h b/src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h similarity index 100% rename from p25/lc/tsbk/ISP_SNDCP_CH_REQ.h rename to src/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h diff --git a/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp b/src/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp similarity index 100% rename from p25/lc/tsbk/ISP_U_DEREG_REQ.cpp rename to src/p25/lc/tsbk/ISP_U_DEREG_REQ.cpp diff --git a/p25/lc/tsbk/ISP_U_DEREG_REQ.h b/src/p25/lc/tsbk/ISP_U_DEREG_REQ.h similarity index 100% rename from p25/lc/tsbk/ISP_U_DEREG_REQ.h rename to src/p25/lc/tsbk/ISP_U_DEREG_REQ.h diff --git a/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp b/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp rename to src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp diff --git a/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h b/src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_ACK_RSP.h rename to src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h diff --git a/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp b/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp rename to src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp diff --git a/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h b/src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h rename to src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h diff --git a/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp b/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp rename to src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp diff --git a/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h b/src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h rename to src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h diff --git a/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp b/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp rename to src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp diff --git a/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h b/src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_GRP_AFF.h rename to src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h diff --git a/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp b/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp rename to src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp diff --git a/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h b/src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h rename to src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h diff --git a/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp b/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp rename to src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp diff --git a/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h b/src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h similarity index 100% rename from p25/lc/tsbk/MBT_IOSP_STS_UPDT.h rename to src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h diff --git a/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp b/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp similarity index 100% rename from p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp rename to src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp diff --git a/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h b/src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h similarity index 100% rename from p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h rename to src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h diff --git a/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp b/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp similarity index 100% rename from p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp rename to src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp diff --git a/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h b/src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h similarity index 100% rename from p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h rename to src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h diff --git a/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp b/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp similarity index 100% rename from p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp rename to src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp diff --git a/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h b/src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h similarity index 100% rename from p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h rename to src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h diff --git a/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp b/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp rename to src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp diff --git a/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h b/src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h similarity index 100% rename from p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h rename to src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h diff --git a/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp b/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp similarity index 100% rename from p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp rename to src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp diff --git a/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h b/src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h similarity index 100% rename from p25/lc/tsbk/MBT_OSP_AUTH_DMD.h rename to src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h diff --git a/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp b/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp rename to src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp diff --git a/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h b/src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h similarity index 100% rename from p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h rename to src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h diff --git a/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp b/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp rename to src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp diff --git a/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h b/src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h similarity index 100% rename from p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h rename to src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h diff --git a/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp b/src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp rename to src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.cpp diff --git a/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h b/src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h similarity index 100% rename from p25/lc/tsbk/OSP_ADJ_STS_BCAST.h rename to src/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h diff --git a/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp b/src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp similarity index 100% rename from p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp rename to src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.cpp diff --git a/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h b/src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h similarity index 100% rename from p25/lc/tsbk/OSP_AUTH_FNE_RESP.h rename to src/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h diff --git a/p25/lc/tsbk/OSP_DENY_RSP.cpp b/src/p25/lc/tsbk/OSP_DENY_RSP.cpp similarity index 100% rename from p25/lc/tsbk/OSP_DENY_RSP.cpp rename to src/p25/lc/tsbk/OSP_DENY_RSP.cpp diff --git a/p25/lc/tsbk/OSP_DENY_RSP.h b/src/p25/lc/tsbk/OSP_DENY_RSP.h similarity index 100% rename from p25/lc/tsbk/OSP_DENY_RSP.h rename to src/p25/lc/tsbk/OSP_DENY_RSP.h diff --git a/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp b/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp similarity index 100% rename from p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp rename to src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp diff --git a/p25/lc/tsbk/OSP_DVM_GIT_HASH.h b/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.h similarity index 100% rename from p25/lc/tsbk/OSP_DVM_GIT_HASH.h rename to src/p25/lc/tsbk/OSP_DVM_GIT_HASH.h diff --git a/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp b/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp similarity index 100% rename from p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp rename to src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp diff --git a/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h b/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h similarity index 100% rename from p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h rename to src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h diff --git a/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp b/src/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp similarity index 100% rename from p25/lc/tsbk/OSP_GRP_AFF_Q.cpp rename to src/p25/lc/tsbk/OSP_GRP_AFF_Q.cpp diff --git a/p25/lc/tsbk/OSP_GRP_AFF_Q.h b/src/p25/lc/tsbk/OSP_GRP_AFF_Q.h similarity index 100% rename from p25/lc/tsbk/OSP_GRP_AFF_Q.h rename to src/p25/lc/tsbk/OSP_GRP_AFF_Q.h diff --git a/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp b/src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp similarity index 100% rename from p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp rename to src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.cpp diff --git a/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h b/src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h similarity index 100% rename from p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h rename to src/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h diff --git a/p25/lc/tsbk/OSP_IDEN_UP.cpp b/src/p25/lc/tsbk/OSP_IDEN_UP.cpp similarity index 100% rename from p25/lc/tsbk/OSP_IDEN_UP.cpp rename to src/p25/lc/tsbk/OSP_IDEN_UP.cpp diff --git a/p25/lc/tsbk/OSP_IDEN_UP.h b/src/p25/lc/tsbk/OSP_IDEN_UP.h similarity index 100% rename from p25/lc/tsbk/OSP_IDEN_UP.h rename to src/p25/lc/tsbk/OSP_IDEN_UP.h diff --git a/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp b/src/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp similarity index 100% rename from p25/lc/tsbk/OSP_IDEN_UP_VU.cpp rename to src/p25/lc/tsbk/OSP_IDEN_UP_VU.cpp diff --git a/p25/lc/tsbk/OSP_IDEN_UP_VU.h b/src/p25/lc/tsbk/OSP_IDEN_UP_VU.h similarity index 100% rename from p25/lc/tsbk/OSP_IDEN_UP_VU.h rename to src/p25/lc/tsbk/OSP_IDEN_UP_VU.h diff --git a/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp b/src/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp similarity index 100% rename from p25/lc/tsbk/OSP_LOC_REG_RSP.cpp rename to src/p25/lc/tsbk/OSP_LOC_REG_RSP.cpp diff --git a/p25/lc/tsbk/OSP_LOC_REG_RSP.h b/src/p25/lc/tsbk/OSP_LOC_REG_RSP.h similarity index 100% rename from p25/lc/tsbk/OSP_LOC_REG_RSP.h rename to src/p25/lc/tsbk/OSP_LOC_REG_RSP.h diff --git a/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp b/src/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp similarity index 100% rename from p25/lc/tsbk/OSP_MOT_CC_BSI.cpp rename to src/p25/lc/tsbk/OSP_MOT_CC_BSI.cpp diff --git a/p25/lc/tsbk/OSP_MOT_CC_BSI.h b/src/p25/lc/tsbk/OSP_MOT_CC_BSI.h similarity index 100% rename from p25/lc/tsbk/OSP_MOT_CC_BSI.h rename to src/p25/lc/tsbk/OSP_MOT_CC_BSI.h diff --git a/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp b/src/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp rename to src/p25/lc/tsbk/OSP_MOT_GRG_ADD.cpp diff --git a/p25/lc/tsbk/OSP_MOT_GRG_ADD.h b/src/p25/lc/tsbk/OSP_MOT_GRG_ADD.h similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_ADD.h rename to src/p25/lc/tsbk/OSP_MOT_GRG_ADD.h diff --git a/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp b/src/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp rename to src/p25/lc/tsbk/OSP_MOT_GRG_DEL.cpp diff --git a/p25/lc/tsbk/OSP_MOT_GRG_DEL.h b/src/p25/lc/tsbk/OSP_MOT_GRG_DEL.h similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_DEL.h rename to src/p25/lc/tsbk/OSP_MOT_GRG_DEL.h diff --git a/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp b/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp rename to src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.cpp diff --git a/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h b/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h rename to src/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h diff --git a/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp b/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp rename to src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.cpp diff --git a/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h b/src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h similarity index 100% rename from p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h rename to src/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h diff --git a/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp b/src/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp similarity index 100% rename from p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp rename to src/p25/lc/tsbk/OSP_MOT_PSH_CCH.cpp diff --git a/p25/lc/tsbk/OSP_MOT_PSH_CCH.h b/src/p25/lc/tsbk/OSP_MOT_PSH_CCH.h similarity index 100% rename from p25/lc/tsbk/OSP_MOT_PSH_CCH.h rename to src/p25/lc/tsbk/OSP_MOT_PSH_CCH.h diff --git a/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp b/src/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/OSP_NET_STS_BCAST.cpp rename to src/p25/lc/tsbk/OSP_NET_STS_BCAST.cpp diff --git a/p25/lc/tsbk/OSP_NET_STS_BCAST.h b/src/p25/lc/tsbk/OSP_NET_STS_BCAST.h similarity index 100% rename from p25/lc/tsbk/OSP_NET_STS_BCAST.h rename to src/p25/lc/tsbk/OSP_NET_STS_BCAST.h diff --git a/p25/lc/tsbk/OSP_QUE_RSP.cpp b/src/p25/lc/tsbk/OSP_QUE_RSP.cpp similarity index 100% rename from p25/lc/tsbk/OSP_QUE_RSP.cpp rename to src/p25/lc/tsbk/OSP_QUE_RSP.cpp diff --git a/p25/lc/tsbk/OSP_QUE_RSP.h b/src/p25/lc/tsbk/OSP_QUE_RSP.h similarity index 100% rename from p25/lc/tsbk/OSP_QUE_RSP.h rename to src/p25/lc/tsbk/OSP_QUE_RSP.h diff --git a/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp b/src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp rename to src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp diff --git a/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h b/src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h similarity index 100% rename from p25/lc/tsbk/OSP_RFSS_STS_BCAST.h rename to src/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h diff --git a/p25/lc/tsbk/OSP_SCCB.cpp b/src/p25/lc/tsbk/OSP_SCCB.cpp similarity index 100% rename from p25/lc/tsbk/OSP_SCCB.cpp rename to src/p25/lc/tsbk/OSP_SCCB.cpp diff --git a/p25/lc/tsbk/OSP_SCCB.h b/src/p25/lc/tsbk/OSP_SCCB.h similarity index 100% rename from p25/lc/tsbk/OSP_SCCB.h rename to src/p25/lc/tsbk/OSP_SCCB.h diff --git a/p25/lc/tsbk/OSP_SCCB_EXP.cpp b/src/p25/lc/tsbk/OSP_SCCB_EXP.cpp similarity index 100% rename from p25/lc/tsbk/OSP_SCCB_EXP.cpp rename to src/p25/lc/tsbk/OSP_SCCB_EXP.cpp diff --git a/p25/lc/tsbk/OSP_SCCB_EXP.h b/src/p25/lc/tsbk/OSP_SCCB_EXP.h similarity index 100% rename from p25/lc/tsbk/OSP_SCCB_EXP.h rename to src/p25/lc/tsbk/OSP_SCCB_EXP.h diff --git a/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp b/src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp similarity index 100% rename from p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp rename to src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp diff --git a/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h b/src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h similarity index 100% rename from p25/lc/tsbk/OSP_SNDCP_CH_ANN.h rename to src/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h diff --git a/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp b/src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp similarity index 100% rename from p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp rename to src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp diff --git a/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h b/src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h similarity index 100% rename from p25/lc/tsbk/OSP_SNDCP_CH_GNT.h rename to src/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h diff --git a/p25/lc/tsbk/OSP_SYNC_BCAST.cpp b/src/p25/lc/tsbk/OSP_SYNC_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/OSP_SYNC_BCAST.cpp rename to src/p25/lc/tsbk/OSP_SYNC_BCAST.cpp diff --git a/p25/lc/tsbk/OSP_SYNC_BCAST.h b/src/p25/lc/tsbk/OSP_SYNC_BCAST.h similarity index 100% rename from p25/lc/tsbk/OSP_SYNC_BCAST.h rename to src/p25/lc/tsbk/OSP_SYNC_BCAST.h diff --git a/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp b/src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp similarity index 100% rename from p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp rename to src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.cpp diff --git a/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h b/src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h similarity index 100% rename from p25/lc/tsbk/OSP_SYS_SRV_BCAST.h rename to src/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h diff --git a/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp b/src/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp similarity index 100% rename from p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp rename to src/p25/lc/tsbk/OSP_TIME_DATE_ANN.cpp diff --git a/p25/lc/tsbk/OSP_TIME_DATE_ANN.h b/src/p25/lc/tsbk/OSP_TIME_DATE_ANN.h similarity index 100% rename from p25/lc/tsbk/OSP_TIME_DATE_ANN.h rename to src/p25/lc/tsbk/OSP_TIME_DATE_ANN.h diff --git a/p25/lc/tsbk/OSP_TSBK_RAW.cpp b/src/p25/lc/tsbk/OSP_TSBK_RAW.cpp similarity index 100% rename from p25/lc/tsbk/OSP_TSBK_RAW.cpp rename to src/p25/lc/tsbk/OSP_TSBK_RAW.cpp diff --git a/p25/lc/tsbk/OSP_TSBK_RAW.h b/src/p25/lc/tsbk/OSP_TSBK_RAW.h similarity index 100% rename from p25/lc/tsbk/OSP_TSBK_RAW.h rename to src/p25/lc/tsbk/OSP_TSBK_RAW.h diff --git a/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp b/src/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp similarity index 100% rename from p25/lc/tsbk/OSP_U_DEREG_ACK.cpp rename to src/p25/lc/tsbk/OSP_U_DEREG_ACK.cpp diff --git a/p25/lc/tsbk/OSP_U_DEREG_ACK.h b/src/p25/lc/tsbk/OSP_U_DEREG_ACK.h similarity index 100% rename from p25/lc/tsbk/OSP_U_DEREG_ACK.h rename to src/p25/lc/tsbk/OSP_U_DEREG_ACK.h diff --git a/p25/lc/tsbk/OSP_U_REG_CMD.cpp b/src/p25/lc/tsbk/OSP_U_REG_CMD.cpp similarity index 100% rename from p25/lc/tsbk/OSP_U_REG_CMD.cpp rename to src/p25/lc/tsbk/OSP_U_REG_CMD.cpp diff --git a/p25/lc/tsbk/OSP_U_REG_CMD.h b/src/p25/lc/tsbk/OSP_U_REG_CMD.h similarity index 100% rename from p25/lc/tsbk/OSP_U_REG_CMD.h rename to src/p25/lc/tsbk/OSP_U_REG_CMD.h diff --git a/p25/lc/tsbk/TSBKFactory.cpp b/src/p25/lc/tsbk/TSBKFactory.cpp similarity index 100% rename from p25/lc/tsbk/TSBKFactory.cpp rename to src/p25/lc/tsbk/TSBKFactory.cpp diff --git a/p25/lc/tsbk/TSBKFactory.h b/src/p25/lc/tsbk/TSBKFactory.h similarity index 100% rename from p25/lc/tsbk/TSBKFactory.h rename to src/p25/lc/tsbk/TSBKFactory.h diff --git a/p25/lookups/P25AffiliationLookup.cpp b/src/p25/lookups/P25AffiliationLookup.cpp similarity index 100% rename from p25/lookups/P25AffiliationLookup.cpp rename to src/p25/lookups/P25AffiliationLookup.cpp diff --git a/p25/lookups/P25AffiliationLookup.h b/src/p25/lookups/P25AffiliationLookup.h similarity index 100% rename from p25/lookups/P25AffiliationLookup.h rename to src/p25/lookups/P25AffiliationLookup.h diff --git a/p25/packet/Data.cpp b/src/p25/packet/Data.cpp similarity index 100% rename from p25/packet/Data.cpp rename to src/p25/packet/Data.cpp diff --git a/p25/packet/Data.h b/src/p25/packet/Data.h similarity index 100% rename from p25/packet/Data.h rename to src/p25/packet/Data.h diff --git a/p25/packet/Trunk.cpp b/src/p25/packet/Trunk.cpp similarity index 100% rename from p25/packet/Trunk.cpp rename to src/p25/packet/Trunk.cpp diff --git a/p25/packet/Trunk.h b/src/p25/packet/Trunk.h similarity index 100% rename from p25/packet/Trunk.h rename to src/p25/packet/Trunk.h diff --git a/p25/packet/Voice.cpp b/src/p25/packet/Voice.cpp similarity index 100% rename from p25/packet/Voice.cpp rename to src/p25/packet/Voice.cpp diff --git a/p25/packet/Voice.h b/src/p25/packet/Voice.h similarity index 100% rename from p25/packet/Voice.h rename to src/p25/packet/Voice.h diff --git a/remote/RESTClient.cpp b/src/remote/RESTClient.cpp similarity index 100% rename from remote/RESTClient.cpp rename to src/remote/RESTClient.cpp diff --git a/remote/RESTClient.h b/src/remote/RESTClient.h similarity index 100% rename from remote/RESTClient.h rename to src/remote/RESTClient.h diff --git a/remote/RESTClientMain.cpp b/src/remote/RESTClientMain.cpp similarity index 100% rename from remote/RESTClientMain.cpp rename to src/remote/RESTClientMain.cpp diff --git a/yaml/Yaml.cpp b/src/yaml/Yaml.cpp similarity index 100% rename from yaml/Yaml.cpp rename to src/yaml/Yaml.cpp diff --git a/yaml/Yaml.h b/src/yaml/Yaml.h similarity index 100% rename from yaml/Yaml.h rename to src/yaml/Yaml.h diff --git a/dvm-watchdog.sh b/tools/dvm-watchdog.sh similarity index 100% rename from dvm-watchdog.sh rename to tools/dvm-watchdog.sh diff --git a/start-dvm.sh b/tools/start-dvm.sh similarity index 100% rename from start-dvm.sh rename to tools/start-dvm.sh diff --git a/stop-dvm.sh b/tools/stop-dvm.sh similarity index 100% rename from stop-dvm.sh rename to tools/stop-dvm.sh diff --git a/stop-watchdog.sh b/tools/stop-watchdog.sh similarity index 100% rename from stop-watchdog.sh rename to tools/stop-watchdog.sh