adding new file : openair1/SCHED/phy_procedures_lte_common_NB_IoT.c

+ replacing find_ue_NB by find_ue_NB_IoT

cmake_targets/CMakeLists.txt

@@ -968,6 +968,7 @@ set(SCHED_SRC
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_eNb_nb_iot.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_ue.c
   ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common_NB_IoT.c
   ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
   ${OPENAIR1_DIR}/SCHED/IF_Module_L1_primitives_nb_iot.c
   ${OPENAIR1_DIR}/SCHED/pucch_pc.c

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -135,7 +135,7 @@ void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB_NB_IoT *eNB,
 		  //int UE_id = find_dlsch(rel13->rnti,eNB,SEARCH_EXIST);
 
 
-		  UE_id =  find_ue_NB(rel13->rnti,eNB);
+		  UE_id =  find_ue_NB_IoT(rel13->rnti,eNB);
 	  	  AssertFatal(UE_id==-1,"no existing ue specific dlsch_context\n");
 
 	  	  ndlsch = eNB->ndlsch[(uint8_t)UE_id];

openair1/SCHED/defs.h

@@ -375,7 +375,7 @@ uint16_t get_Np(uint8_t N_RB_DL,uint8_t nCCE,uint8_t plus1);
 
 int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
 //NB-IoT
-int8_t find_ue_NB(uint16_t rnti, PHY_VARS_eNB *eNB);
+//int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB);
 
 int32_t add_ue(int16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
 int mac_phy_remove_ue(module_id_t Mod_idP,rnti_t rnti);

openair1/SCHED/defs_nb_iot.h

@@ -25,6 +25,9 @@ void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *
 
 /*Process all the scheduling result from MAC and also common signals.*/
 void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc,int do_meas);
+
+int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB);
+
 #endif
 
 

openair1/SCHED/phy_procedures_lte_common.c

@@ -1111,7 +1111,8 @@ int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *eNB)
   return(-1);
 }
 
-int8_t find_ue_NB(uint16_t rnti, PHY_VARS_eNB *eNB)
+/*
+int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB)
 {
 
   uint8_t i;
@@ -1126,7 +1127,7 @@ int8_t find_ue_NB(uint16_t rnti, PHY_VARS_eNB *eNB)
   return(-1);
 }
 
-
+*/
 
 
 

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -542,7 +542,7 @@ void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *
         { //managing data
 
     	  //TODO target/SIMU/USER?init_lte/init_lte_eNB we should allocate the ndlsch structures
-    	  UE_id = find_ue_NB(dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.rnti, eNB);
+    	  UE_id = find_ue_NB_IoT(dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.rnti, eNB);
     	  AssertFatal(UE_id != -1, "no ndlsch context available or no ndlsch context corresponding to that rnti\n");
 
 
@@ -633,7 +633,7 @@ void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *
 
 
 
-  UE_id = find_ue_NB(hi_dci0_pdu->npdcch_dci_pdu.npdcch_dci_pdu_rel13.rnti, eNB);
+  UE_id = find_ue_NB_IoT(hi_dci0_pdu->npdcch_dci_pdu.npdcch_dci_pdu_rel13.rnti, eNB);
   AssertFatal(UE_id == -1, "no ndlsch context available or no ndlsch context corresponding to that rnti\n");