renaming function: replacing NB_generate_eNB_dlsch_params_from_dci by...

renaming function: replacing NB_generate_eNB_dlsch_params_from_dci by generate_eNB_dlsch_params_from_dci_NB_IoT, in files
LTE_TRANSPORT/dci_tools_nb_iot.c /LTE_TRANSPORT/proto_nb_iot.h SCHED/phy_procedures_lte_eNb_nb_iot.c

openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c

@@ -140,17 +140,16 @@ int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
 //map the Isf (DCI param) to the number of subframes (Nsf)
 int resource_to_subframe[8] = {1,2,3,4,5,6,8,10}; 
 
-int NB_generate_eNB_dlsch_params_from_dci(PHY_VARS_eNB *eNB,
-                                        int frame,
-                                       uint8_t subframe,
-                                       DCI_CONTENT *DCI_Content,
-                                       uint16_t rnti,
-                                       DCI_format_NB_t dci_format,
-                                       NB_IoT_eNB_NDLSCH_t *ndlsch,
-                                       NB_DL_FRAME_PARMS *frame_parms,
-                                       uint8_t aggregation,
-									   uint8_t npdcch_start_symbol
-                                       )
+int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
+                                              int frame,
+                                              uint8_t subframe,
+                                              DCI_CONTENT *DCI_Content,
+                                              uint16_t rnti,
+                                              DCI_format_NB_t dci_format,
+                                              NB_IoT_eNB_NDLSCH_t *ndlsch,
+                                              NB_DL_FRAME_PARMS *frame_parms,
+                                              uint8_t aggregation,
+									                            uint8_t npdcch_start_symbol)
 {
 
   NB_IoT_DL_eNB_HARQ_t* ndlsch_harq = ndlsch->harq_process;

openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h

@@ -104,17 +104,16 @@ int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
 									                            uint8_t npdcch_start_symbol);
 
 /*Use the DL DCI Information to configure PHY and also Pack the DCI*/
-int NB_generate_eNB_dlsch_params_from_dci(PHY_VARS_eNB *eNB,
-                                        int frame,
-                                       uint8_t subframe,
-                                       DCI_CONTENT *DCI_Content,
-                                       uint16_t rnti,
-                                       DCI_format_NB_t dci_format,
-                                       NB_IoT_eNB_NDLSCH_t *ndlsch,
-                                       NB_DL_FRAME_PARMS *frame_parms,
-                                       uint8_t aggregation,
-									   uint8_t npdcch_start_symbol
-                                       );
+int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
+                                              int frame,
+                                              uint8_t subframe,
+                                              DCI_CONTENT *DCI_Content,
+                                              uint16_t rnti,
+                                              DCI_format_NB_t dci_format,
+                                              NB_IoT_eNB_NDLSCH_t *ndlsch,
+                                              NB_DL_FRAME_PARMS *frame_parms,
+                                              uint8_t aggregation,
+									                            uint8_t npdcch_start_symbol);
 
 /*Function for DCI encoding, scrambling, modulation*/
 uint8_t generate_dci_top_NB_IoT(

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -525,17 +525,16 @@ void NB_generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi
           ndlsch->ndlsch_type = RAR;
 
           LOG_D(PHY,"Generating dlsch params for RA_RNTI and packing DCI\n");
-          NB_generate_eNB_dlsch_params_from_dci(eNB,
-                                                frame,
-                                                subframe,
-                                                DCI_Content,
-                                                dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.rnti,
-                                                DCI_format,
-                                                ndlsch,
-                                                fp,
-                                                dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.aggregation_level,
-												dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.start_symbol
-                                                );
+          generate_eNB_dlsch_params_from_dci_NB_IoT(eNB,
+                                                    frame,
+                                                    subframe,
+                                                    DCI_Content,
+                                                    dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.rnti,
+                                                    DCI_format,
+                                                    ndlsch,
+                                                    fp,
+                                                    dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.aggregation_level,
+												                            dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.start_symbol);
 
           //eNB->dlsch_ra_NB->nCCE[subframe] = eNB->DCI_pdu->dci_alloc.firstCCE;
         }
@@ -584,17 +583,16 @@ void NB_generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi
               //parameters we don't consider pdsch config dedicated since not calling the phy config dedicated step2
 
         	  LOG_D(PHY,"Generating dlsch params for DCIN1 data and packing DCI\n");
-              NB_generate_eNB_dlsch_params_from_dci(eNB,
-                                                    frame,
-                                                    subframe,
-                                                    DCI_Content,
-                                                    dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.rnti,
-                                                    DCI_format,
-                                                    ndlsch,
-                                                    fp,
-                                                    dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.aggregation_level,
-													dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.start_symbol
-                                                    ); 
+            generate_eNB_dlsch_params_from_dci_NB_IoT(eNB,
+                                                      frame,
+                                                      subframe,
+                                                      DCI_Content,
+                                                      dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.rnti,
+                                                      DCI_format,
+                                                      ndlsch,
+                                                      fp,
+                                                      dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.aggregation_level,
+													                            dl_config_pdu->npdcch_pdu.npdcch_pdu_rel13.start_symbol); 
 
               //eNB->ndlsch[(uint8_t)UE_id]->nCCE[subframe] = eNB->DCI_pdu->dci_alloc[i].firstCCE;