apply last diff from ssr to local orange_cdrx branch. Remove SSR comments

openair2/COMMON/rrc_messages_types.h

@@ -36,7 +36,7 @@
 #include "LTE_SystemInformationBlockType2.h"
 #include "LTE_SL-OffsetIndicator-r12.h"
 #include "LTE_SubframeBitmapSL-r12.h"
-#include "LTE_DRX-Config.h"                   // Add DRX SSR 2018-10
+#include "LTE_DRX-Config.h"
 #include "LTE_SL-CP-Len-r12.h"
 #include "LTE_SL-PeriodComm-r12.h"
 #include "LTE_SL-DiscResourcePool-r12.h"
@@ -142,14 +142,14 @@ typedef struct RadioResourceConfig_s {
   long                    bcch_modificationPeriodCoeff;
   long                    pcch_defaultPagingCycle;
   long                    pcch_nB;
-  LTE_DRX_Config_PR                                   drx_Config_present;                   // Add DRX SSR 2018-10
-  long                                                drx_onDurationTimer;                  // Add DRX SSR 2018-10
-  long                                                drx_InactivityTimer;                  // Add DRX SSR 2018-10
-  long                                                drx_RetransmissionTimer;              // Add DRX SSR 2018-10
-  LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR  drx_longDrx_CycleStartOffset_present; // Add DRX SSR 2018-10
-  long                                                drx_longDrx_CycleStartOffset;         // Add DRX SSR 2018-10
-  long                                                drx_shortDrx_Cycle;                   // Add DRX SSR 2018-10
-  long                                                drx_shortDrx_ShortCycleTimer;         // Add DRX SSR 2018-10
+  LTE_DRX_Config_PR                                   drx_Config_present;
+  long                                                drx_onDurationTimer;
+  long                                                drx_InactivityTimer;
+  long                                                drx_RetransmissionTimer;
+  LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR  drx_longDrx_CycleStartOffset_present;
+  long                                                drx_longDrx_CycleStartOffset;
+  long                                                drx_shortDrx_Cycle;
+  long                                                drx_shortDrx_ShortCycleTimer;
   long                    ue_TimersAndConstants_t300;
   long                    ue_TimersAndConstants_t301;
   long                    ue_TimersAndConstants_t310;

openair2/LAYER2/MAC/pre_processor.c

@@ -1653,7 +1653,7 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
   UE_sched_ctrl *ue_sched_ctl;
   int N_RB_UL = 0;
   uint16_t available_rbs, first_rb_offset;
-  rnti_t rntiTable[MAX_MOBILES_PER_ENB];        // Rnti array => Add SSR 12-2018
+  rnti_t rntiTable[MAX_MOBILES_PER_ENB];
 
   // sort ues
   LOG_D(MAC, "In ulsch_preprocessor: sort ue \n");

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -317,10 +317,9 @@ uint8_t do_MIB_SL(const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index,
   return((enc_rval.encoded+7)/8);
 }
 
-// Begin add DRX SSR 2018-11
+
 LTE_DRX_Config_t *do_DrxConfig(uint8_t Mod_id, int CC_id, RrcConfigurationReq *configuration, LTE_UE_EUTRA_Capability_t *UEcap)
 {
-  // Begin add DRX SSR 2018-12
   LTE_DRX_Config_t *drxConfig = NULL;
   BIT_STRING_t *featureGroupIndicators = NULL;
   bool ueSupportCdrxShortFlag = false;
@@ -335,7 +334,6 @@ LTE_DRX_Config_t *do_DrxConfig(uint8_t Mod_id, int CC_id, RrcConfigurationReq *c
       } else LOG_W(RRC,"[do_DrxConfig] Not enough featureGroupIndicators bits\n");
     } else LOG_W(RRC,"[do_DrxConfig] No featureGroupIndicators pointer\n");
   } else LOG_W(RRC,"[do_DrxConfig] No UEcap pointer\n");
-  // End add DRX SSR 2018-12
 
   drxConfig = (LTE_DRX_Config_t *) malloc(sizeof(LTE_DRX_Config_t));
   if (drxConfig == NULL) return NULL;
@@ -419,8 +417,6 @@ LTE_DRX_Config_t *do_DrxConfig(uint8_t Mod_id, int CC_id, RrcConfigurationReq *c
   }
   return drxConfig;
 }
-// End add DRX SSR 2018-11
-
 
 uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
 		int Mod_id,int CC_id

openair2/RRC/LTE/MESSAGES/asn1_msg.h

@@ -71,7 +71,7 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
 	       );
 
 /**
-\brief Generate configuration for DRX_Config (Add DRX SSR 2018-11)
+\brief Generate configuration for DRX_Config
 @param Mod_id Instance of eNB
 @param CC_id Id of component to configure
 @param configuration Pointer Configuration Request structure

openair2/RRC/LTE/rrc_defs.h

@@ -200,7 +200,7 @@ void *send_UE_status_notification(void *);
 /* for ImsiMobileIdentity_t */
 #include "MobileIdentity.h"
 
-#include "LTE_DRX-Config.h"   // Add DRX SSR 2018-11
+#include "LTE_DRX-Config.h"
 
 /* correct Rel(8|10)/Rel14 differences
  * the code is in favor of Rel14, those defines do the translation