delete two parameters not used in NB_rrc_mac_config_req_eNB

openair2/LAYER2/MAC/IF_Module_nb_iot.c

@@ -35,6 +35,6 @@ void UL_indication(UL_IND_t UL_INFO)
     NB_eNB_dlsch_ulsch_scheduler(UL_INFO.module_id,0,UL_INFO.frame,UL_INFO.subframe);
 }
 
-void Schedule_Response(Sched_Rsp_t Sched_INFO){
+void schedule_Response(Sched_Rsp_t Sched_INFO){
       //todo
-}
\ No newline at end of file
+}

openair2/PHY_INTERFACE/IF_Module_nb_iot.h

@@ -96,7 +96,7 @@ typedef struct{
 void UL_indication(UL_IND_t UL_INFO);
 
 /*Interface for Downlink, transmitting the DLSCH SDU, DCI SDU*/
-void Schedule_Response(Sched_Rsp_t Sched_INFO);
+void schedule_Response(Sched_Rsp_t Sched_INFO);
 
 /*Interface for Configuration*/
 //void Config_Request();

openair2/RRC/LITE/L2_interface_nb_iot.c

@@ -123,9 +123,9 @@ int NB_rrc_mac_config_req_eNB(
 			   struct MultiBandInfoList_NB_r13  *multiBandInfoList, //optional SIB1
 			   struct DL_Bitmap_NB_r13          *dl_bitmap, //optional SIB1
 			   long*                            eutraControlRegionSize, //optional sib1
-			   long*							nrs_CRS_PowerOffset, //optional
-			   uint8_t                          *SIwindowsize, //maybe no more needed because TDD only
-			   uint16_t                         *SIperiod, //maybe no more needed because TDD only
+			   long*							nrs_CRS_PoweSIwindowsizerOffset, //optional
+//			   uint8_t                          *SIwindowsize, //maybe no more needed because TDD only
+//			   uint16_t                         *SIperiod, //maybe no more needed because TDD only
 			   uint32_t                         dl_CarrierFreq,
 			   uint32_t                         ul_CarrierFreq,
 			   BCCH_BCH_Message_NB_t            *mib_NB,
@@ -137,6 +137,7 @@ int NB_rrc_mac_config_req_eNB(
 			   )
 {
 
+
   //int i;
 
   int UE_id = -1;
@@ -231,7 +232,7 @@ int NB_rrc_mac_config_req_eNB(
 
 }
 
-
+//-------------------------------------------------------
 //New
 int npdsch_rep_to_array[3] ={4,8,16}; //TS 36.213 Table 16.4.1.3-3
 int sib1_startFrame_to_array[4] = {0,16,32,48};//TS 36.213 Table 16.4.1.3-4

openair2/RRC/LITE/proto_nb_iot.h

@@ -80,8 +80,8 @@ int NB_rrc_mac_config_req_eNB(
 			   struct DL_Bitmap_NB_r13          *dl_bitmap, //optional SIB1
 			   long*                            eutraControlRegionSize, //optional sib1
 			   long*							nrs_CRS_PowerOffset, //optional
-			   uint8_t                          *SIwindowsize, //maybe no more needed because TDD only
-			   uint16_t                         *SIperiod, //maybe no more needed because TDD only
+//			   uint8_t                          *SIwindowsize, //maybe no more needed because TDD only
+//			   uint16_t                         *SIperiod, //maybe no more needed because TDD only
 			   uint32_t                         dl_CarrierFreq,
 			   uint32_t                         ul_CarrierFreq,
 			   BCCH_BCH_Message_NB_t            *mib_NB,

openair2/RRC/LITE/rrc_eNB_nb_iot.c

@@ -578,8 +578,8 @@ rrc_eNB_generate_RRCConnectionSetup_NB(
 		  (DL_Bitmap_NB_r13_t*) NULL,
 		  (long*) NULL,
 		  (long*)NULL,
-		  (uint8_t*) NULL, //SIWindowSize
-		  (uint16_t*)NULL, //SIperiod
+//		  (uint8_t*) NULL, //SIWindowSize
+//		  (uint16_t*)NULL, //SIperiod
 		  0, //dl_carrierFrequency
 		  0, //ul_carrierFrequency
 		  (BCCH_BCH_Message_NB_t*) NULL,
@@ -806,8 +806,8 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
 			(struct DL_Bitmap_NB_r13*) NULL,
 			(long*)NULL,//eutraControlRegionSize
 			(long*)NULL, //nrs_CRS_PowerOffset
-			(uint8_t*)NULL,
-			(uint16_t*)NULL,
+//			(uint8_t*)NULL,
+//			(uint16_t*)NULL,
 			0, //dl_CarrierFreq
 			0, //ul_CarrierFreq
 			(BCCH_BCH_Message_NB_t*)NULL,
@@ -848,8 +848,8 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
 					  (struct DL_Bitmap_NB_r13*) NULL,
 					  (long*)NULL,//eutraControlRegionSize
 					  (long*)NULL, //nrs_CRS_PowerOffset
-					  (uint8_t*)NULL,
-					  (uint16_t*)NULL,
+//					  (uint8_t*)NULL,
+//					  (uint16_t*)NULL,
 					  0, //dl_CarrierFreq
 					  0, //ul_CarrierFreq
 					  (BCCH_BCH_Message_NB_t*)NULL,
@@ -1611,9 +1611,8 @@ init_SI_NB(
 //-----------------------------------------------------------------------------
 {
 
-	//FIXME: MP: may this two  parameters are not needed
-  uint8_t                             SIwindowsize = 1; //frame
-  uint16_t                            SIperiod = 8; // in frames
+//  uint8_t                             SIwindowsize = 1; //frame
+//  uint16_t                            SIperiod = 8; // in frames
 
 
   //copy basic parameters
@@ -1722,8 +1721,8 @@ init_SI_NB(
 								eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].sib1_NB->downlinkBitmap_r13,
 								eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].sib1_NB->eutraControlRegionSize_r13,
 								eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].sib1_NB->nrs_CRS_PowerOffset_r13,
-								&SIwindowsize,
-								&SIperiod,
+//								&SIwindowsize,
+//								&SIperiod,
 								eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].dl_CarrierFreq,
 								eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].ul_CarrierFreq,
 								(BCCH_BCH_Message_NB_t*) &
@@ -2317,6 +2316,7 @@ rrc_eNB_decode_dcch_NB(
 	/*NN: revise the condition */
 
    //MP: RRC_RECONFIGURED indicate if the default/dedicated bearer has been/not established
+
         if (ue_context_p->ue_context.Status == RRC_RECONFIGURED){ // a dedicated bearers has been established
 	  dedicated_DRB = 1;
 	  LOG_I(RRC,