maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix OTG issues in oaisim without s1

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7526 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-06-03 21:34:56 +00:00
parent ebd95c5b83
commit 8154c8fb8b
6 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/SIMU/USER/oaisim.c
+9 -7
View File
@@ -1198,10 +1198,7 @@ l2l1_task (void *args_p)
//end of frame
stop_meas (&oaisim_stats);
#if defined(ENABLE_ITTI)
itti_terminate_tasks(TASK_L2L1);
#endif
oai_shutdown ();
#ifdef PRINT_STATS
@@ -1226,6 +1223,10 @@ l2l1_task (void *args_p)
#endif
#if defined(ENABLE_ITTI)
itti_terminate_tasks(TASK_L2L1);
#endif
return NULL;
}
@@ -1364,7 +1365,7 @@ main (int argc, char **argv)
">>>>>>>>>>>>>>>>>>>>>>>>>>> OAIEMU Ending <<<<<<<<<<<<<<<<<<<<<<<<<<\n\n");
raise (SIGINT);
oai_shutdown ();
// oai_shutdown ();
return (0);
}
@@ -1808,9 +1809,10 @@ oai_shutdown (void)
#endif
//Perform KPI measurements
if (oai_emulation.info.otg_enabled == 1)
if (oai_emulation.info.otg_enabled == 1){
LOG_N(EMU,"calling OTG kpi gen .... \n");
kpi_gen ();
}
if (oai_emulation.info.opp_enabled == 1)
print_opp_meas ();
targets/SIMU/USER/oaisim_config.c
+2 -2
View File
@@ -450,14 +450,14 @@ int olg_config(void)
//set_log(OCM, LOG_INFO, 20);
//set_log(OTG, LOG_INFO, 1);
set_comp_log(OCG, LOG_ERR, 0x15,1);
set_comp_log(EMU, LOG_ERR, 0x15,20);
set_comp_log(EMU, LOG_DEBUG, 0x15,20);
set_comp_log(MAC, LOG_TRACE, 0x15,1);
set_comp_log(RLC, LOG_TRACE, 0x15,1);
set_comp_log(PHY, LOG_TRACE, 0x15, 1);
set_comp_log(PDCP, LOG_DEBUG, 0x15,1);
set_comp_log(RRC, LOG_DEBUG, 0x15,1);
set_comp_log(OCM, LOG_ERR, 0x15,20);
set_comp_log(OTG, LOG_INFO, 0x15,1);
set_comp_log(OTG, LOG_DEBUG, 0x15,1);
set_comp_log(OMG, LOG_INFO, 0x15,1);
set_comp_log(OPT, LOG_ERR, 0x15,1);
targets/SIMU/USER/oaisim_functions.c
+7 -3
View File
@@ -1268,6 +1268,8 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
{
#if defined(USER_MODE) && defined(OAI_EMU)
int rrc_state=0;
if (oai_emulation.info.otg_enabled ==1 ) {
int dst_id, app_id;
@@ -1277,9 +1279,11 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
for_times += 1;
// generate traffic if the ue is rrc reconfigured state
if (mac_eNB_get_rrc_status(enb_module_idP, dst_id) > 2 /*RRC_CONNECTED*/ ) {
if_times += 1;
//if ((rrc_state=mac_eNB_get_rrc_status(enb_module_idP, dst_id)) > 2 /*RRC_CONNECTED*/ ) {
if (mac_eNB_get_rrc_status(enb_module_idP, oai_emulation.info.eNB_ue_module_id_to_rnti[enb_module_idP][dst_id]) > 2 ){
if_times += 1;
for (app_id=0; app_id<MAX_NUM_APPLICATION; app_id++) {
otg_pkt = malloc (sizeof(Packet_otg_elt_t));