remove unnecessary compiler directives;

DVMProject · Mar 11, 2023 · 7b20b3c · 7b20b3c
1 parent 938fef0
commit 7b20b3c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 33 deletions.
diff --git a/Defines.h b/Defines.h
@@ -114,15 +114,6 @@ typedef unsigned long long  ulong64_t;
 
 #define DSP_FW_API 
 
-// Allow the DMR protocol
-#define ENABLE_DMR
-
-// Allow the P25 protocol
-#define ENABLE_P25
-
-// Allow the NXDN protocol
-#define ENABLE_NXDN
-
 // Normal Boxcar Filter for P25
 //#define P25_RX_NORMAL_BOXCAR
 
@@ -154,21 +145,9 @@ typedef unsigned long long  ulong64_t;
 // Pass RSSI information to the host
 // #define SEND_RSSI_DATA
 
-#if defined(ENABLE_DMR)
 #define DESCR_DMR        "DMR, "
-#else
-#define DESCR_DMR        ""
-#endif
-#if defined(ENABLE_P25)
 #define DESCR_P25        "P25, "
-#else
-#define DESCR_P25        ""
-#endif
-#if defined(ENABLE_NXDN)
 #define DESCR_NXDN       "NXDN, "
-#else
-#define DESCR_NXDN       ""
-#endif
 
 #if defined(EXTERNAL_OSC)
 #define DESCR_OSC        "TCXO, "

diff --git a/FirmwareMain.cpp b/FirmwareMain.cpp
@@ -62,21 +62,9 @@
 
 DVM_STATE m_modemState = STATE_IDLE;
 
-#ifdef ENABLE_DMR
 bool m_dmrEnable = true;
-#else
-bool m_dmrEnable = false;
-#endif
-#ifdef ENABLE_P25
 bool m_p25Enable = true;
-#else
-bool m_p25Enable = false;
-#endif
-#ifdef ENABLE_NXDN
 bool m_nxdnEnable = true;
-#else
-bool m_nxdnEnable = false;
-#endif
 
 bool m_dcBlockerEnable = true;
 bool m_cosLockoutEnable = false;