renaming functions in file: openair2/RRC/LITE/proto_NB_IoT.h

openair2/LAYER2/MAC/eNB_scheduler_ulsch_NB_IoT.c

@@ -117,7 +117,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
     /*RLF procedure this part just check UE context is NULL or not, if not, means UL in synch*/
     if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
       UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync=0;
-      NB_mac_eNB_rrc_ul_in_sync(enb_mod_idP,CC_idP,frameP,subframeP,UE_RNTI(enb_mod_idP,UE_id));
+      mac_eNB_rrc_ul_in_sync_NB_IoT(enb_mod_idP,CC_idP,frameP,subframeP,UE_RNTI(enb_mod_idP,UE_id));
     }
   }
 
@@ -160,7 +160,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
 	if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
 	  UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync=0;
 	  /*In RRC branch*/
-    //NB_mac_eNB_rrc_ul_in_sync(enb_mod_idP,CC_idP,frameP,subframeP,(((uint16_t)payload_ptr[0])<<8) + payload_ptr[1]);
+    //mac_eNB_rrc_ul_in_sync_NB_IoT(enb_mod_idP,CC_idP,frameP,subframeP,(((uint16_t)payload_ptr[0])<<8) + payload_ptr[1]);
 	}
       }
       crnti_rx=1;
@@ -268,7 +268,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
           if (Is_rrc_nb_iot_registered == 1)
         	 //MP: send directly the information to the RRC in case of CCCH (SRB0)
 
-            NB_mac_rrc_data_ind_eNB(
+            mac_rrc_data_ind_eNB_NB_IoT(
               enb_mod_idP,
               CC_idP,
               frameP,
@@ -316,7 +316,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
           LOG_D(MAC,"[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
                 enb_mod_idP,CC_idP,frameP, rx_lengths[i], UE_id, rx_lcids[i]);
 
-          NB_mac_rlc_data_ind(
+        mac_rlc_data_ind_NB_IoT(
 			   enb_mod_idP,
 			   rntiP,
 			   enb_mod_idP,
@@ -361,7 +361,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
 	    UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] = 0;*/
 	  if ((rx_lengths[i] <SCH_PAYLOAD_SIZE_MAX) &&  (rx_lengths[i] > 0) ) {   // MAX SIZE OF transport block
 
-	    NB_mac_rlc_data_ind(
+	    mac_rlc_data_ind_NB_IoT(
 			     enb_mod_idP,
 			     rntiP,
 			     enb_mod_idP,

openair2/LAYER2/MAC/main_NB_IoT.c

@@ -137,7 +137,7 @@ int mac_top_init_NB_IoT()
   if (Is_rrc_nb_iot_registered == 1) {
     LOG_I(MAC,"[MAIN] calling RRC NB-IoT\n");
 #ifndef CELLULAR //nothing to be done yet for cellular
-    openair_rrc_top_init_eNB_NB();
+    openair_rrc_top_init_eNB_NB_IoT();
 #endif
   } else {
     LOG_I(MAC,"[MAIN] Running without an RRC\n");

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -1680,7 +1680,7 @@ pdcp_config_set_security(
   }
   /*]SecurityModeFailure*/
   else if(security_modeP == -1){
-	  // in this way in NB_pdcp_data_req function you never call "pdcp_apply_security"
+	  // in this way in pdcp_data_req_NB_IoT function you never call "pdcp_apply_security"
 	  // and we never call pdcp_validate_security in NB_pdcp_data_indi
 	    	pdcp_pP->security_activated = 0;
 	    	pdcp_pP->cipheringAlgorithm = 0;

openair2/PHY_INTERFACE/IF_Module_NB_IoT.h

@@ -78,7 +78,7 @@ typedef struct{
 	module_id_t mod_id;
 	int CC_id;
 	uint16_t rnti;
-	int get_MIB; //should be different from 0 only when the mib!= null (NB_rrc_mac_config_req_eNB)
+	int get_MIB; //should be different from 0 only when the mib!= null (NB_rrc_mac_config_req_eNB_IoT)
 	int get_COMMON;
 	int get_DEDICATED;
 

openair2/RRC/LITE/rrc_common_NB_IoT.c

@@ -89,12 +89,12 @@ rrc_t310_expiration_NB(
                            UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
                            0);
 
-      NB_rrc_rlc_config_req(
-    		  	  	  	  	 ctxt_pP,
-							 SRB_FLAG_YES,
-							 CONFIG_ACTION_REMOVE,
-							 UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
-							 Rlc_info_am_NB);
+      rrc_rlc_config_req_NB_IoT(
+    		  	  	  	  	        ctxt_pP,
+							                  SRB_FLAG_YES,
+							                  CONFIG_ACTION_REMOVE,
+							                  UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
+							                  Rlc_info_am_NB);
 
 
       UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Active = 0;
@@ -110,10 +110,9 @@ rrc_t310_expiration_NB(
 
 
 //configure  BCCH & CCCH Logical Channels and associated rrc_buffers, configure associated SRBs
-//called by openair_rrc_eNB_configuration_NB
+//called by openair_rrc_eNB_configuration_NB_IoT
 //-----------------------------------------------------------------------------
-void
-openair_eNB_rrc_on_NB(
+void openair_eNB_rrc_on_NB_IoT(
   const protocol_ctxt_t* const ctxt_pP
 )
 //-----------------------------------------------------------------------------
@@ -124,9 +123,9 @@ openair_eNB_rrc_on_NB(
     LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" OPENAIR RRC-NB IN....\n",
           PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
     for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
-      rrc_config_buffer_NB (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].SI, BCCH, 1);
+      rrc_config_buffer_NB_IoT (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].SI, BCCH, 1);
       eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].SI.Active = 1;
-      rrc_config_buffer_NB (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].Srb0, CCCH, 1);
+      rrc_config_buffer_NB_IoT (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].Srb0, CCCH, 1);
       eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].Srb0.Active = 1;
     }
     //no UE side
@@ -135,8 +134,7 @@ openair_eNB_rrc_on_NB(
 
 
 //-----------------------------------------------------------------------------
-void
-rrc_config_buffer_NB(
+void rrc_config_buffer_NB_IoT(
   SRB_INFO_NB* Srb_info,
   uint8_t Lchan_type,
   uint8_t Role
@@ -157,7 +155,7 @@ int rrc_init_global_param_NB_IoT( void )
 {
 
   //may no more used (defined in rlc_rrc.c)
-  rrc_rlc_register_rrc_NB (NB_rrc_data_ind, NULL); //register with rlc
+  rrc_rlc_register_rrc_NB_IoT (rrc_data_ind_NB_IoT, NULL); //register with rlc
 
   //XXX MP: most probably ALL of this stuff are no more needed (also the one not commented)
 
@@ -172,7 +170,7 @@ int rrc_init_global_param_NB_IoT( void )
 
 #ifndef NO_RRM
 
-if (L3_xface_init_NB ()) { //XXX to be modified???
+if (L3_xface_init_NB_IoT ()) { //XXX to be modified???
     return (-1);
   }
 
@@ -185,7 +183,7 @@ if (L3_xface_init_NB ()) { //XXX to be modified???
 #ifndef NO_RRM
 //-----------------------------------------------------------------------------
 int
-L3_xface_init_NB( //Exact copy of the LTE implementation
+L3_xface_init_NB_IoT( //Exact copy of the LTE implementation
   void
 )
 //-----------------------------------------------------------------------------
@@ -240,9 +238,8 @@ L3_xface_init_NB( //Exact copy of the LTE implementation
 
 //------------------------------------------------------------------------------
 //specialized function for the eNB initialization (NB-IoT)
-//(OLD was called in MAC/main.c--> mac_top_init)(NEW is called in directly in "openair_rrc_eNB_configuration_NB")
-void
-openair_rrc_top_init_eNB_NB(void)//MP: XXX Raymond put this directly the definition on rrc_eNB.c file
+//(OLD was called in MAC/main.c--> mac_top_init)(NEW is called in directly in "openair_rrc_eNB_configuration_NB_IoT")
+void openair_rrc_top_init_eNB_NB_IoT(void)//MP: XXX Raymond put this directly the definition on rrc_eNB.c file
 //-----------------------------------------------------------------------------
 {
 
@@ -272,7 +269,7 @@ openair_rrc_top_init_eNB_NB(void)//MP: XXX Raymond put this directly the definit
 //-----------------------------------------------------------------------------
 //XXX MP: most probably is not needed
 RRC_status_t
-rrc_rx_tx_NB(
+rrc_rx_tx_NB_IoT(
   protocol_ctxt_t* const ctxt_pP,
   const uint8_t      enb_indexP,
   const int          CC_id
@@ -421,7 +418,7 @@ rrc_rx_tx_NB(
       }
     }
     if (ue_to_be_removed)
-    	rrc_eNB_free_UE_NB(ctxt_pP->module_id,ue_to_be_removed);
+    	rrc_eNB_free_UE_NB_IoT(ctxt_pP->module_id,ue_to_be_removed);
 //no localization in NB-IoT
 
     (void)ts; /* remove gcc warning "unused variable" */

openair2/RRC/LITE/rrc_eNB_UE_context.c

@@ -333,7 +333,7 @@ void rrc_eNB_remove_ue_context_NB(
     "0 Removed UE %"PRIx16" ",
     ue_context_pP->ue_context.rnti);
 
-  rrc_eNB_free_mem_UE_context_NB(ctxt_pP, ue_context_pP);
+  rrc_eNB_free_mem_UE_context_NB_IoT(ctxt_pP, ue_context_pP);
   uid_linear_allocator_free_NB(rrc_instance_pP, ue_context_pP->local_uid);
   free(ue_context_pP);
   LOG_I(RRC,