Remove useless function definitions

Unused code

CMakeLists.txt

@@ -1283,12 +1283,6 @@ set (MISC_NFAPI_LTE
 
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
 
-set (MISC_NFAPI_NR
- ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
- )
-
-add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
-
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -2091,7 +2085,7 @@ if (${T_TRACER})
         oai_eth_transpro HASHTABLE UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
-        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
+        MISC_NFAPI_LTE_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
         GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU

openair1/SCHED/nfapi_lte_dummy.c

@@ -9,30 +9,12 @@ typedef struct pnf_p7_t pnf_p7_t;
 typedef struct vnf_t vnf_t;
 typedef struct vnf_p7_t vnf_p7_t;
 
-void handle_nfapi_nr_pdcch_pdu(PHY_VARS_gNB *gNB,
-			       int frame, int slot,
-			       nfapi_nr_dl_tti_pdcch_pdu *pdcch_pdu){}
-
-void handle_nr_nfapi_ssb_pdu(PHY_VARS_gNB *gNB,int frame,int slot,
-                             nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu){}
-
-void handle_nr_nfapi_pdsch_pdu(processingData_L1tx_t *msgTx,
-			       nfapi_nr_dl_tti_pdsch_pdu *pdsch_pdu,
-                            uint8_t *sdu){
-}
-void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx,
-			       int frame, int slot,
-			       nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu){
-                    }                           
 int l1_north_init_gNB(void){return 0;}
 
 int slot_ahead = 6;
 //uint8_t nfapi_mode=0;
 NR_IF_Module_t *NR_IF_Module_init(int Mod_id) {return NULL;}
 
-void handle_nfapi_nr_ul_dci_pdu(PHY_VARS_gNB *gNB,
-			       int frame, int slot,
-			       nfapi_nr_ul_dci_request_pdus_t *ul_dci_request_pdu){}
 void nr_fill_ulsch(PHY_VARS_gNB *gNB,
                    int frame,
                    int slot,

openair1/SCHED/nfapi_nr_dummy.c

-//Dummy NR defs to avoid linking errors
-
-#include "PHY/defs_gNB.h"
-#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h"
-#include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
-#include "openair1/PHY/LTE_TRANSPORT/transport_common.h"
-
-void handle_nfapi_nr_pdcch_pdu(PHY_VARS_gNB *gNB,
-			       int frame, int slot,
-			       nfapi_nr_dl_tti_pdcch_pdu *pdcch_pdu){}
-
-void handle_nr_nfapi_ssb_pdu(PHY_VARS_gNB *gNB,int frame,int slot,
-                             nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu){}
-
-void handle_nr_nfapi_pdsch_pdu(processingData_L1tx_t *msgTx,
-			       nfapi_nr_dl_tti_pdsch_pdu *pdsch_pdu,
-                            uint8_t *sdu){
-}
-void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx,
-			       int frame, int slot,
-			       nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu){
-                    }
-int l1_north_init_gNB(void){return 0;}
-
-int slot_ahead = 6;
-//uint8_t nfapi_mode=0;
-NR_IF_Module_t *NR_IF_Module_init(int Mod_id) {return NULL;}
-
-void handle_nfapi_nr_ul_dci_pdu(PHY_VARS_gNB *gNB,
-			       int frame, int slot,
-			       nfapi_nr_ul_dci_request_pdus_t *ul_dci_request_pdu){}
-void nr_fill_ulsch(PHY_VARS_gNB *gNB,
-                   int frame,
-                   int slot,
-                   nfapi_nr_pusch_pdu_t *ulsch_pdu){}
-void nr_fill_pucch(PHY_VARS_gNB *gNB,
-                   int frame,
-                   int slot,
-                   nfapi_nr_pucch_pdu_t *pucch_pdu){}
-void nr_schedule_rx_prach(PHY_VARS_gNB *gNB, int SFN, int Slot, nfapi_nr_prach_pdu_t *prach_pdu)
-{
-}
-
-void  nr_phy_config_request(NR_PHY_Config_t *gNB){}
-
-void install_nr_schedule_handlers(NR_IF_Module_t *if_inst){}
-
-//void nr_dump_frame_parms(NR_DL_FRAME_PARMS *fp){}
-

openair1/SCHED_NR/fapi_nr_l1.c

@@ -38,8 +38,7 @@
 #include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
 #include "nfapi/oai_integration/nfapi_vnf.h"
 
-void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx,int frame,int slot,
-                             nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu)
+static void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx, int frame, int slot, nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu)
 {
 
   AssertFatal(dl_tti_pdu->ssb_pdu.ssb_pdu_rel15.bchPayloadFlag== 1, "bchPayloadFlat %d != 1\n",
@@ -56,7 +55,7 @@ void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx,int frame,int slot,
   }
 }
 
-void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx, int frame, int slot, nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu)
+static void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx, int frame, int slot, nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu)
 {
   int found = 0;
 

openair1/SCHED_NR/fapi_nr_l1.h

@@ -34,36 +34,4 @@
 #include "SCHED_NR/sched_nr.h"
 #include "nfapi_nr_interface_scf.h"
 
-// added
-void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx,
-						int frame,int slot,
-						nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu);
-
 void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO);
-
-void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx,
-			       int frame, int slot,
-			       nfapi_nr_dl_tti_csi_rs_pdu *csirs_pdu);
-
-void handle_nfapi_nr_pdcch_pdu(PHY_VARS_gNB *gNB,
-			       int frame, int subframe,
-			       nfapi_nr_dl_tti_pdcch_pdu *dcl_dl_pdu);
-
-void handle_nr_nfapi_pdsch_pdu(processingData_L1tx_t *msgTx,
-			       nfapi_nr_dl_tti_pdsch_pdu *pdsch_pdu,
-                            uint8_t *sdu);
-
-void nr_fill_indication(PHY_VARS_gNB *gNB,
-                        int frame,
-                        int slot_rx,
-                        int UE_id,
-                        uint8_t harq_pid,
-                        uint8_t crc_flag,
-                        int dtx_flag,
-                        nfapi_nr_crc_t *crc,
-                        nfapi_nr_rx_data_pdu_t *pdu);
-//added
-
-void handle_nfapi_nr_ul_dci_pdu(PHY_VARS_gNB *gNB,
-			       int frame, int slot,
-			       nfapi_nr_ul_dci_request_pdus_t *ul_dci_request_pdu);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -46,6 +46,16 @@
 //#define DEBUG_RXDATA
 //#define SRS_IND_DEBUG
 
+static void nr_fill_indication(PHY_VARS_gNB *gNB,
+                               int frame,
+                               int slot_rx,
+                               int ULSCH_id,
+                               uint8_t harq_pid,
+                               uint8_t crc_flag,
+                               int dtx_flag,
+                               nfapi_nr_crc_t *crc,
+                               nfapi_nr_rx_data_pdu_t *pdu);
+
 int beam_index_allocation(bool das,
                           int fapi_beam_index,
                           nfapi_nr_analog_beamforming_ve_t *analog_bf,
@@ -537,15 +547,15 @@ static int nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, boo
   return ret_nr_ulsch_decoding;
 }
 
-void nr_fill_indication(PHY_VARS_gNB *gNB,
-                        int frame,
-                        int slot_rx,
-                        int ULSCH_id,
-                        uint8_t harq_pid,
-                        uint8_t crc_flag,
-                        int dtx_flag,
-                        nfapi_nr_crc_t *crc,
-                        nfapi_nr_rx_data_pdu_t *pdu)
+static void nr_fill_indication(PHY_VARS_gNB *gNB,
+                               int frame,
+                               int slot_rx,
+                               int ULSCH_id,
+                               uint8_t harq_pid,
+                               uint8_t crc_flag,
+                               int dtx_flag,
+                               nfapi_nr_crc_t *crc,
+                               nfapi_nr_rx_data_pdu_t *pdu)
 {
   NR_gNB_ULSCH_t *ulsch = &gNB->ulsch[ULSCH_id];
   NR_UL_gNB_HARQ_t *harq_process = ulsch->harq_process;