Commit c1f3e1ad authored by Vijay Chadachan's avatar Vijay Chadachan

fix compilation errors

parent 6871388a
...@@ -75,11 +75,8 @@ int create_tasks_mbms(uint32_t enb_nb) { ...@@ -75,11 +75,8 @@ int create_tasks_mbms(uint32_t enb_nb) {
if(!EPC_MODE_ENABLED){ if(!EPC_MODE_ENABLED){
// rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL); // rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
// AssertFatal(rc >= 0, "Create task for SCTP failed\n"); // AssertFatal(rc >= 0, "Create task for SCTP failed\n");
<<<<<<< HEAD
rc = itti_create_task(TASK_UDP, udp_eNB_task, NULL); rc = itti_create_task(TASK_UDP, udp_eNB_task, NULL);
AssertFatal(rc >= 0, "Create task for UDP failed\n"); AssertFatal(rc >= 0, "Create task for UDP failed\n");
=======
>>>>>>> FRD-1198-2023-w-11-oai-rebase
rc = itti_create_task(TASK_GTPV1_U, gtpv1uTask, NULL); rc = itti_create_task(TASK_GTPV1_U, gtpv1uTask, NULL);
AssertFatal(rc >= 0, "Create task for GTPV1U failed\n"); AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
} }
......
...@@ -242,10 +242,6 @@ void oai_create_enb(void) { ...@@ -242,10 +242,6 @@ void oai_create_enb(void) {
NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() eNB Cell %d is now configured\n", __FUNCTION__,CC_id); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() eNB Cell %d is now configured\n", __FUNCTION__,CC_id);
} }
do {
NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() Waiting for eNB to become configured (by RRC/PHY) - need to wait otherwise NFAPI messages won't contain correct values\n", __FUNCTION__);
usleep(50000);
} while(eNB->configured != 1);
NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() eNB is now configured\n", __FUNCTION__); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() eNB is now configured\n", __FUNCTION__);
} }
...@@ -659,7 +655,7 @@ int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, ...@@ -659,7 +655,7 @@ int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id,
static uint8_t first_time = 1; static uint8_t first_time = 1;
int CC_id=0; int CC_id=0;
/* MultiCell: Function modify for Multiple CC */ /* MultiCell: Function modify for Multiple CC */
/*for (int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) */{ /*for (int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {*/
if (first_time) { if (first_time) {
NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] subframe indication %d\n", NFAPI_SFNSF2DEC(sfn_sf)); NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] subframe indication %d\n", NFAPI_SFNSF2DEC(sfn_sf));
first_time = 0; first_time = 0;
......
...@@ -439,7 +439,7 @@ void config_common(gNB_MAC_INST *nrmac, int pdsch_AntennaPorts, int pusch_Antenn ...@@ -439,7 +439,7 @@ void config_common(gNB_MAC_INST *nrmac, int pdsch_AntennaPorts, int pusch_Antenn
} }
} }
#if 0
int rrc_mac_config_dedicate_scheduling(module_id_t Mod_idP, NR_DcchDtchConfig_t *dcchDtchConfig) int rrc_mac_config_dedicate_scheduling(module_id_t Mod_idP, NR_DcchDtchConfig_t *dcchDtchConfig)
{ {
gNB_MAC_INST *nrmac = RC.nrmac[Mod_idP]; gNB_MAC_INST *nrmac = RC.nrmac[Mod_idP];
...@@ -457,6 +457,7 @@ int rrc_mac_config_dedicate_scheduling(module_id_t Mod_idP, NR_DcchDtchConfig_t ...@@ -457,6 +457,7 @@ int rrc_mac_config_dedicate_scheduling(module_id_t Mod_idP, NR_DcchDtchConfig_t
} }
return 0; return 0;
} }
#endif
int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP, rnti_t rnti, NR_SubcarrierSpacing_t subcarrierSpacing, uint32_t rrc_reconfiguration_delay) { int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP, rnti_t rnti, NR_SubcarrierSpacing_t subcarrierSpacing, uint32_t rrc_reconfiguration_delay) {
......
...@@ -47,7 +47,7 @@ int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP, ...@@ -47,7 +47,7 @@ int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP,
NR_SubcarrierSpacing_t subcarrierSpacing, NR_SubcarrierSpacing_t subcarrierSpacing,
uint32_t rrc_reconfiguration_delay); uint32_t rrc_reconfiguration_delay);
int rrc_mac_config_dedicate_scheduling(module_id_t Mod_idP, NR_DcchDtchConfig_t *dcchDtchConfig); //int rrc_mac_config_dedicate_scheduling(module_id_t Mod_idP, NR_DcchDtchConfig_t *dcchDtchConfig);
void nr_mac_config_scc(gNB_MAC_INST *nrmac, void nr_mac_config_scc(gNB_MAC_INST *nrmac,
rrc_pdsch_AntennaPorts_t pdsch_AntennaPorts, rrc_pdsch_AntennaPorts_t pdsch_AntennaPorts,
......
...@@ -182,7 +182,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration ...@@ -182,7 +182,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
NULL); NULL);
mac_common_config_done = 1; mac_common_config_done = 1;
} }
rrc_mac_config_dedicate_scheduling(rrc->module_id, rrc->carrier.dcchDtchConfig); //rrc_mac_config_dedicate_scheduling(rrc->module_id, rrc->carrier.dcchDtchConfig);
} }
/* set flag to indicate that cell information is configured. This is required /* set flag to indicate that cell information is configured. This is required
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment