fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp)

2021-06-21 21:01:59 +02:00
parent 83950e6c57
commit aef67d0310
24 changed files with 32 additions and 81 deletions
@@ -195,21 +195,13 @@ typedef uint8_t            mme_code_t;
 typedef uint32_t           m_tmsi_t;

 //Random UE identity length = 40 bits
-#if ! defined(NOT_A_RANDOM_UE_IDENTITY)
  #define NOT_A_RANDOM_UE_IDENTITY (uint64_t)0xFFFFFFFF
-#endif
-#if ! defined(NOT_A_RNTI)
  #define NOT_A_RNTI (rnti_t)0
-#endif
-#if ! defined(M_RNTI)
  #define M_RNTI     (rnti_t)0xFFFD
-#endif
-#if ! defined(P_RNTI)
  #define P_RNTI     (rnti_t)0xFFFE
-#endif
-#if ! defined(SI_RNTI)
  #define SI_RNTI    (rnti_t)0xFFFF
-#endif
+#define CBA_RNTI   (rnti_t)0xfff4
+#define OAI_C_RNTI (rnti_t)0x1234
 typedef enum config_action_e {
  CONFIG_ACTION_NULL              = 0,
  CONFIG_ACTION_ADD               = 1,