Cleaning some parts of RRC code no more useful. Code compile. 145 warnings

openair1/PHY/INIT/defs_nb_iot.h

@@ -65,13 +65,13 @@ void NB_phy_config_sib2_eNB(uint8_t Mod_id,
                          nfapi_nb_iot_config_t *config,
 						 nfapi_rf_config_t *rf_config,
 						 nfapi_uplink_reference_signal_config_t* ul_nrs_config,
-						 extra_phyConfigCommon_t* extra_phy_parms
+						 extra_phyConfig_t* extra_phy_parms
                          );
 
 void NB_phy_config_dedicated_eNB(module_id_t Mod_id,
                               int CC_id,
                               rnti_t rnti,
-							  extra_phyConfigCommon_t* extra_phy_parms);
+							  extra_phyConfig_t* extra_phy_parms);
 
 
 

openair1/PHY/INIT/lte_init_nb_iot.c

@@ -193,7 +193,7 @@ void NB_phy_config_sib2_eNB(uint8_t Mod_id,
                          nfapi_nb_iot_config_t *config,
 						 nfapi_rf_config_t *rf_config,
 						 nfapi_uplink_reference_signal_config_t* ul_nrs_config,
-						 extra_phyConfigCommon_t* extra_phy_parms
+						 extra_phyConfig_t* extra_phy_parms
                          )
 {
 	NB_DL_FRAME_PARMS *fp = &PHY_vars_eNB_g[Mod_id][CC_id]->frame_parms;
@@ -327,8 +327,7 @@ void NB_phy_config_sib2_eNB(uint8_t Mod_id,
 	  //fp->npusch_config_common.srs_SubframeConfig /*OPTIONAL*/
 
 
-      //TODO:should change the part that implement the ul hopping in NB-IoT?? (
-	  //init_ul_hopping(fp);
+	  //No Frequency hopping in NULSCH for NB-IoT and not init_ncs_cell used for PUCCH
 
 
 	  /*UL Power Control Config Common---------------------------------------------------------*/
@@ -345,9 +344,6 @@ void NB_phy_config_sib2_eNB(uint8_t Mod_id,
 		  fp->DL_gap_config.dl_GapThreshold = config->dl_gap_threshold.value;
 	  }
 
-	  //TODO
-	  //init_ncs_cell(fp,PHY_vars_eNB_g[Mod_id][CC_id]->ncs_cell);
-	  //init_ul_hopping(fp);
 
 }
 
@@ -356,7 +352,7 @@ void NB_phy_config_sib2_eNB(uint8_t Mod_id,
 void NB_phy_config_dedicated_eNB(uint8_t Mod_id,
                               int CC_id,
                               uint16_t rnti,
-							  extra_phyConfigCommon_t *extra_parms
+							  extra_phyConfig_t *extra_parms
 							  )
 {
 	  PHY_VARS_eNB *eNB = PHY_vars_eNB_g[Mod_id][CC_id];

openair2/PHY_INTERFACE/IF_Module_nb_iot.h

@@ -65,12 +65,12 @@ typedef struct{
 	 * In OAI at least are needed when we manage the phy_procedures_eNB_TX in which we call the phy_config_dedicated_eNB_step2
 	 * that use the physicalConfigDedicated info previously stored in the PHY_VARS_eNB structure through the phy_config_dedicated procedure
 	 */
-	PhysicalConfigDedicated_NB_r13_t *phy_config_dedicated;
+	//PhysicalConfigDedicated_NB_r13_t *phy_config_dedicated;
 
 
 
 
-}extra_phyConfigCommon_t;
+}extra_phyConfig_t;
 
 typedef struct{
 
@@ -104,7 +104,7 @@ typedef struct{
 	nfapi_config_request_t* cfg;
 
 	/*MP: MISSED COMMON CONFIG. of SIB2-NB in FAPI SPECS (may non needed)*/
-	extra_phyConfigCommon_t extra_phy_parms;
+	extra_phyConfig_t extra_phy_parms;
 
 }PHY_Config_t;
 

openair2/RRC/LITE/L2_interface_nb_iot.c

@@ -3276,11 +3276,11 @@ void rrc_rlc_register_rrc_NB (rrc_data_ind_cb_NB_t NB_rrc_data_indP, rrc_data_co
 	//map the function pointer to the function in input
 	//rlc_rrc_data_ind  and rlc_rrc_data_conf are protected internal functions in the rlc.c file
 	 rlc_rrc_data_ind_NB  = NB_rrc_data_indP;
-	 rlc_rrc_data_conf = rrc_data_confP;
+	//rlc_rrc_data_conf = rrc_data_confP; not used since only asn.1 function are considered
 }
 
 /*--------------------------------------------RLC-PDCP--------------------------------------------------*/
-//XXX to be integrated in the flow
+//XXX to be integrated in the data flow for NB-IoT
 //called by rlc_am_send_sdu and rlc_tm_send_sdu
 //defined in rlc.c
 //--------------------------------------------

openair2/RRC/LITE/rrc_common.c

@@ -96,73 +96,20 @@ rrc_init_global_param(
 //-----------------------------------------------------------------------------
 {
 
-  //#ifdef USER_MODE
-  //  Rrc_xface = (RRC_XFACE*)malloc16(sizeof(RRC_XFACE));
-  //#endif //USRE_MODE
 
-  //  Rrc_xface->openair_rrc_top_init = openair_rrc_top_init;
-  //  Rrc_xface->openair_rrc_eNB_init = openair_rrc_eNB_init;
-  //  Rrc_xface->openair_rrc_UE_init  = openair_rrc_ue_init;
-  //  Rrc_xface->mac_rrc_data_ind     = mac_rrc_data_ind;
-  //Rrc_xface->mac_rrc_data_req     = mac_rrc_data_req;
-  // Rrc_xface->rrc_data_indP        = (void *)rlcrrc_data_ind;
-  //  Rrc_xface->rrc_rx_tx            = rrc_rx_tx;
-  //  Rrc_xface->mac_rrc_meas_ind     = mac_rrc_meas_ind;
-  //  Rrc_xface->get_rrc_status       = get_rrc_status;
-
-  //Rrc_xface->rrc_get_status = ...
-
-  //  Mac_rlc_xface->mac_out_of_sync_ind=mac_out_of_sync_ind;
-
-#ifndef NO_RRM
-  //  Rrc_xface->fn_rrc=fn_rrc;
-#endif
-  //  LOG_D(RRC, "[RRC]INIT_GLOBAL_PARAM: Mac_rlc_xface %p, rrc_rlc_register %p,rlcrrc_data_ind%p\n",Mac_rlc_xface,Mac_rlc_xface->rrc_rlc_register_rrc,rlcrrc_data_ind);
-  /*
-   if((Mac_rlc_xface==NULL) || (Mac_rlc_xface->rrc_rlc_register_rrc==NULL) ||
-   (rlcrrc_data_ind==NULL)) {
-   LOG_E(RRC,"Data structured is not initialized \n");
-   return -1;
-   }
-   */
   rrc_rlc_register_rrc (rrc_data_ind, NULL); //register with rlc
 
-  DCCH_LCHAN_DESC.transport_block_size = 4;
-  DCCH_LCHAN_DESC.max_transport_blocks = 16;
-  DCCH_LCHAN_DESC.Delay_class = 1;
-  DTCH_DL_LCHAN_DESC.transport_block_size = 52;
-  DTCH_DL_LCHAN_DESC.max_transport_blocks = 20;
-  DTCH_DL_LCHAN_DESC.Delay_class = 1;
-  DTCH_UL_LCHAN_DESC.transport_block_size = 52;
-  DTCH_UL_LCHAN_DESC.max_transport_blocks = 20;
-  DTCH_UL_LCHAN_DESC.Delay_class = 1;
-
-  Rlc_info_um.rlc_mode = RLC_MODE_UM;
-  Rlc_info_um.rlc.rlc_um_info.timer_reordering = 5;
-  Rlc_info_um.rlc.rlc_um_info.sn_field_length = 10;
-  Rlc_info_um.rlc.rlc_um_info.is_mXch = 0;
-  //Rlc_info_um.rlc.rlc_um_info.sdu_discard_mode=16;
-
-  Rlc_info_am_config.rlc_mode = RLC_MODE_AM;
-  Rlc_info_am_config.rlc.rlc_am_info.max_retx_threshold = 50;
-  Rlc_info_am_config.rlc.rlc_am_info.poll_pdu = 8;
-  Rlc_info_am_config.rlc.rlc_am_info.poll_byte = 1000;
-  Rlc_info_am_config.rlc.rlc_am_info.t_poll_retransmit = 15;
-  Rlc_info_am_config.rlc.rlc_am_info.t_reordering = 50;
-  Rlc_info_am_config.rlc.rlc_am_info.t_status_prohibit = 10;
-#ifndef NO_RRM
+  //no more LCHAN_DESCH used
+  //no more static configuration of RLC params
+  //no more L3_xface_init called
 
-  if (L3_xface_init ()) {
-    return (-1);
-  }
-
-#endif
 
   return 0;
 }
 
 #ifndef NO_RRM
 //-----------------------------------------------------------------------------
+//NO more USED
 int
 L3_xface_init(
   void
@@ -325,18 +272,19 @@ openair_rrc_top_init(
     eNB_rrc_inst = NULL;
   }
 
-#ifndef NO_RRM
-#ifndef USER_MODE
-
-  Header_buf=(char*)malloc16(sizeof(msg_head_t));
-  Data=(char*)malloc16(2400);
-  Header_read_idx=0;
-  Data_read_idx=0;
-  Header_size=sizeof(msg_head_t);
-
-#endif //NO_RRM
-  Data_to_read = 0;
-#endif //USER_MODE
+//#ifndef NO_RRM
+//#ifndef USER_MODE
+//
+//  //no more used since are exploited by RRC_xface
+//  Header_buf=(char*)malloc16(sizeof(msg_head_t));
+//  Data=(char*)malloc16(2400);
+//  Header_read_idx=0;
+//  Data_read_idx=0;
+//  Header_size=sizeof(msg_head_t);
+//
+//#endif //NO_RRM
+//  Data_to_read = 0;
+//#endif //USER_MODE
 }
 
 //-----------------------------------------------------------------------------

openair2/RRC/LITE/rrc_common_nb_iot.c

@@ -270,19 +270,6 @@ openair_rrc_top_init_eNB_NB(void)//MP: XXX Raymond put this directly the definit
   }
 
 
-//XXX this stuff below i think are no more used
-#ifndef NO_RRM
-#ifndef USER_MODE
-
-  Header_buf=(char*)malloc16(sizeof(msg_head_t));
-  Data=(char*)malloc16(2400);
-  Header_read_idx=0;
-  Data_read_idx=0;
-  Header_size=sizeof(msg_head_t);
-
-#endif //NO_RRM
-  Data_to_read = 0;
-#endif //USER_MODE
 }
 
 //-----------------------------------------------------------------------------