replacing NB by NB_IoT in...

replacing NB by NB_IoT in SCHED/IF_Module_L1_primitives_nb_iot.c,SCHED/defs_nb_iot.h,SCHED/phy_procedures_lte_eNb_nb_iot.c,targets/RT/USER/lte-enb.c

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -228,7 +228,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
     	case NFAPI_DL_CONFIG_NPDCCH_PDU_TYPE:
     		//Remember: there is no DCI for SI information
     		//TODO: separate the ndlsch structure configuration from the DCI (here we will encode only the DCI)
-      		NB_generate_eNB_dlsch_params(eNB,proc,dl_config_pdu);
+      		generate_eNB_dlsch_params_NB_IoT(eNB,proc,dl_config_pdu);
 
       		break;
     	case NFAPI_DL_CONFIG_NBCH_PDU_TYPE:
@@ -272,7 +272,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
     {
     	case NFAPI_HI_DCI0_NPDCCH_DCI_PDU_TYPE:
 
-      		NB_generate_eNB_ulsch_params(eNB,proc,hi_dci0_pdu);
+      		generate_eNB_ulsch_params_NB_IoT(eNB,proc,hi_dci0_pdu);
 
       		break;
     	default:
@@ -308,7 +308,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
 
   //XXX problem: although we may have nothing to transmit this function should be always triggered in order to allow the PHY layer to complete the repetitions
   //of previous Transport Blocks
-  NB_phy_procedures_eNB_TX(eNB,proc,NULL);
+  phy_procedures_eNB_TX_NB_IoT(eNB,proc,NULL);
 
 }
 

openair1/SCHED/defs_nb_iot.h

@@ -7,24 +7,24 @@
 #include "PHY/defs_nb_iot.h"
 #include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h"
 
-void process_schedule_rsp(Sched_Rsp_t *sched_rsp,
-                          PHY_VARS_eNB *eNB,
-                          eNB_rxtx_proc_t *proc);
+void process_schedule_rsp_NB_IoT(Sched_Rsp_t *sched_rsp,
+                          		 PHY_VARS_eNB *eNB,
+                          		 eNB_rxtx_proc_t *proc);
 
 /*Processing the ue-specific resources for uplink in NB-IoT*/
-void NB_phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, UL_IND_t *UL_INFO);
+void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, UL_IND_t *UL_INFO);
 
 /* For NB-IoT, we put NPBCH in later part, since it would be scheduled by MAC scheduler,this generates NRS/NPSS/NSSS*/
 void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc); 
 
 /*Generate the ulsch params and do the mapping for the FAPI style parameters to OAI, and then do the packing*/
-void NB_generate_eNB_ulsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu);
+void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu);
 
 /*Generate the dlsch params and do the mapping for the FAPI style parameters to OAI, and then do the packing*/
-void NB_generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
+void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
 
 /*Process all the scheduling result from MAC and also common signals.*/
-void NB_phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int do_meas);
+void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int do_meas);
 #endif
 
 

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -159,7 +159,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
   
 }
 
-void NB_phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,UL_IND_t *UL_INFO)
+void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,UL_IND_t *UL_INFO)
 {
   //RX processing for ue-specific resources (i
 
@@ -480,7 +480,7 @@ void NB_phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,UL_
 
 /*Generate eNB ndlsch params for NB-IoT from the NPDCCH PDU of the DCI, modify the input to the Sched Rsp variable*/
 
-void NB_generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu) 
+void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu) 
 {
   int UE_id = -1;
   NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_nb_iot;
@@ -612,7 +612,7 @@ void NB_generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi
 
 
 
-void NB_generate_eNB_ulsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu) {
+void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu) {
 
   int UE_id = -1;
   int harq_pid = 0;
@@ -933,7 +933,7 @@ extern int oai_exit;
  * (in OAI in principle is every subframe)
  */
 
-void NB_phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
+void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB *eNB,
          	 	 	 	 	  eNB_rxtx_proc_t *proc,
 							  int do_meas)
 {

targets/RT/USER/lte-enb.c

@@ -606,7 +606,7 @@ static inline int NB_rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_
    * stored the Upink information in UL_info struct, process it and made it into FAPI style,
    */
 
-  NB_phy_procedures_eNB_uespec_RX(eNB,proc,UL_INFO);
+  phy_procedures_eNB_uespec_RX_NB_IoT(eNB,proc,UL_INFO);
 
   /*
    * send the UL_Indication to higher layer that also provide a tick to the scheduler_dlsch_ulsch