remove remaining ENABLE_USE_MME macros, were causing Pb in LTE UE

openair2/GNB_APP/gnb_app.c

@@ -67,7 +67,6 @@ static void configure_nr_rrc(uint32_t gnb_id) {
 /*------------------------------------------------------------------------------*/
 
 /*
-# if defined(ENABLE_USE_MME)
 static uint32_t gNB_app_register(uint32_t gnb_id_start, uint32_t gnb_id_end)//, const Enb_properties_array_t *enb_properties)
 {
   uint32_t         gnb_id;
@@ -98,7 +97,6 @@ static uint32_t gNB_app_register(uint32_t gnb_id_start, uint32_t gnb_id_end)//,
 
   return register_gnb_pending;
 }
-# endif
 */
 
 

openair2/RRC/LTE/rrc_UE.c

@@ -2918,8 +2918,8 @@ int decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index,
   LOG_I(RRC,"Setting SIStatus bit 0 to 1\n");
   UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus = 1;
   UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIB1systemInfoValueTag = sib1->systemInfoValueTag;
-#if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
-  {
+
+  if (EPC_MODE_ENABLED) {
     int cell_valid = 0;
 
     if (sib1->cellAccessRelatedInfo.cellBarred == LTE_SystemInformationBlockType1__cellAccessRelatedInfo__cellBarred_notBarred) {
@@ -2978,7 +2978,7 @@ int decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index,
       LOG_E(RRC, "Synched with a cell, but PLMN doesn't match our SIM, the message PHY_FIND_NEXT_CELL_REQ is sent but lost in current UE implementation! \n");
     }
   }
-#endif
+
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_UE_DECODE_SIB1, VCD_FUNCTION_OUT );
   return 0;
 }

openair2/RRC/NR/rrc_gNB.c

@@ -67,14 +67,9 @@
   #include "UTIL/OSA/osa_defs.h"
 #endif
 
-#if defined(ENABLE_USE_MME)
-  #include "rrc_eNB_S1AP.h"
-  #include "rrc_eNB_GTPV1U.h"
-  #if defined(ENABLE_ITTI)
-  #else
-    #include "../../S1AP/s1ap_eNB.h"
-  #endif
-#endif
+#include "rrc_eNB_S1AP.h"
+#include "rrc_eNB_GTPV1U.h"
+#include "../../S1AP/s1ap_eNB.h"
 
 #include "pdcp.h"
 #include "gtpv1u_eNB_task.h"
@@ -337,7 +332,7 @@ void *rrc_gnb_task(void *args_p) {
       /* Messages from PDCP */
 
       /*
-      #if defined(ENABLE_USE_MME)
+      if (EPC_MODE_ENABLED) {
 
             // Messages from S1AP
           case S1AP_DOWNLINK_NAS:
@@ -389,7 +384,7 @@ void *rrc_gnb_task(void *args_p) {
             }
             break;
 
-      #endif
+      } // if (EPC_MODE_ENABLED)
       */
       /* Messages from gNB app */
       case NRRRC_CONFIGURATION_REQ: