diff --git a/openair1/PHY/LTE_TRANSPORT/initial_sync.c b/openair1/PHY/LTE_TRANSPORT/initial_sync.c index 50c12951c9b5fb70fc3a3e79bf36982c4a01c2e6..e64195b9fa948edd53eb6c44c481fc62d8672e92 100644 --- a/openair1/PHY/LTE_TRANSPORT/initial_sync.c +++ b/openair1/PHY/LTE_TRANSPORT/initial_sync.c @@ -502,18 +502,18 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) // First try FDD normal prefix frame_parms->Ncp=NORMAL; frame_parms->frame_type=FDD; - printf("Inside initial_sync: FDD\n"); + //printf("Inside initial_sync: FDD\n"); init_frame_parms(frame_parms,1); int *tmp; /* write_output("rxdata0.m","rxd0",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1); exit(-1); */ - printf("before lte_sync_time, ue->common_vars.eNb_id %d\n",ue->common_vars.eNb_id); + //printf("before lte_sync_time, ue->common_vars.eNb_id %d\n",ue->common_vars.eNb_id); sync_pos = lte_sync_time(ue->common_vars.rxdata, frame_parms, (int *)&tmp); - printf("after lte_sync_time, ue->common_vars.eNb_id %d\n",ue->common_vars.eNb_id); + //printf("after lte_sync_time, ue->common_vars.eNb_id %d\n",ue->common_vars.eNb_id); // write_output("rxdata1.m","rxd1",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1); if (sync_pos >= frame_parms->nb_prefix_samples) sync_pos2 = sync_pos - frame_parms->nb_prefix_samples; @@ -523,7 +523,7 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) #ifdef DEBUG_INITIAL_SYNCH LOG_I(PHY,"[UE%d] Initial sync : Estimated PSS position %d, Nid2 %d\n",ue->Mod_id,sync_pos,ue->common_vars.eNb_id); #endif - printf("[UE%d] Initial sync : Estimated PSS position %d, Nid2(eNB_id) %d\n",ue->Mod_id,sync_pos,ue->common_vars.eNb_id); + //printf("[UE%d] Initial sync : Estimated PSS position %d, Nid2(eNB_id) %d\n",ue->Mod_id,sync_pos,ue->common_vars.eNb_id); // SSS detection // PSS is hypothesized in last symbol of first slot in Frame @@ -608,7 +608,7 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) if (ret==-1) { // Now TDD normal prefix - printf("Inside initial_sync: TDD\n"); + //printf("Inside initial_sync: TDD\n"); frame_parms->Ncp=NORMAL; frame_parms->frame_type=TDD; init_frame_parms(frame_parms,1); @@ -834,12 +834,12 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) // gain control if (ret!=0) { //we are not synched, so we cannot use rssi measurement (which is based on channel estimates) rx_power = 0; - printf("Point start PSS: %d\n",sync_pos2); + //printf("Point start PSS: %d\n",sync_pos2); // do a measurement on the best guess of the PSS for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) rx_power += signal_energy(&ue->common_vars.rxdata[aarx][sync_pos2], frame_parms->ofdm_symbol_size+frame_parms->nb_prefix_samples); - printf("rx_power %d\n",rx_power); + //printf("rx_power %d\n",rx_power); /* // do a measurement on the full frame for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) @@ -860,7 +860,7 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) #ifndef OAI_BLADERF #ifndef OAI_LMSSDR phy_adjust_gain(ue,ue->measurements.rx_power_avg_dB[0],0); - printf("adjust gain 1\n"); + //printf("adjust gain 1\n"); #endif #endif #endif @@ -872,7 +872,7 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) #ifndef OAI_BLADERF #ifndef OAI_LMSSDR phy_adjust_gain(ue,dB_fixed(ue->measurements.rssi),0); - printf("adjust gain 2\n"); + //printf("adjust gain 2\n"); #endif #endif #endif @@ -893,7 +893,7 @@ int initial_sync_freq(PHY_VARS_UE *ue, runmode_t mode) int ret=-1; int i; int aarx,rx_power=0; - printf("initial_synch_freq: UE %d, eNB %d, NB_eNB_INST %d, eNB->Nid_cell %d\n",ue->Mod_id,ue->common_vars.eNb_id, NB_eNB_INST,PHY_vars_eNB_g[ue->common_vars.eNb_id][0]->frame_parms.Nid_cell); + //printf("initial_synch_freq: UE %d, eNB %d, NB_eNB_INST %d, eNB->Nid_cell %d\n",ue->Mod_id,ue->common_vars.eNb_id, NB_eNB_INST,PHY_vars_eNB_g[ue->common_vars.eNb_id][0]->frame_parms.Nid_cell); /*#ifdef OAI_USRP __m128i *rxdata128; #endif*/ @@ -915,9 +915,9 @@ int initial_sync_freq(PHY_VARS_UE *ue, runmode_t mode) // lte-gold lte_gold(frame_parms,ue->lte_gold_table[0],frame_parms->Nid_cell); - printf("binitial_synch [UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); + //printf("binitial_synch [UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); ret=pbch_detection_freq(ue,mode); - printf("ainitial_synch [UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); + //printf("ainitial_synch [UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); //init_frame_parms(frame_parms,1); //printf("dumping enb frame params\n"); //dump_frame_parms(&PHY_vars_eNB_g[0][0]->frame_parms); @@ -933,9 +933,9 @@ int initial_sync_freq(PHY_VARS_UE *ue, runmode_t mode) lte_gold(frame_parms,ue->lte_gold_table[0],frame_parms->Nid_cell); - printf("binitial_synch, second chance[UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); + //printf("binitial_synch, second chance[UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); ret = pbch_detection_freq(ue,mode); - printf("ainitial_synch, second chance[UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); + //printf("ainitial_synch, second chance[UE%d]->[eNB%d]: pbch_detection_freq returns %d, Nid_cell %d\n\n",ue->Mod_id,ue->common_vars.eNb_id,ret,frame_parms->Nid_cell); } if (ret==0) { // fake first PBCH found so indicate sync to higher layers and configure frame parameters @@ -944,7 +944,7 @@ int initial_sync_freq(PHY_VARS_UE *ue, runmode_t mode) //#ifdef DEBUG_INITIAL_SYNCH LOG_I(PHY,"[UE%d] In synch, rx_offset %d samples\n",ue->Mod_id, ue->rx_offset); //#endif - printf("[UE%d] In synch, rx_offset %d samples\n",ue->Mod_id, ue->rx_offset); + //printf("[UE%d] In synch, rx_offset %d samples\n",ue->Mod_id, ue->rx_offset); if (ue->UE_scan_carrier == 0) { #if UE_AUTOTEST_TRACE @@ -1041,12 +1041,12 @@ int initial_sync_freq(PHY_VARS_UE *ue, runmode_t mode) // gain control if (ret!=0) { //we are not synched, so we cannot use rssi measurement (which is based on channel estimates) rx_power = 0; - printf("(6144?) Point start PSS: %d\n",6*frame_parms->ofdm_symbol_size); + //printf("(6144?) Point start PSS: %d\n",6*frame_parms->ofdm_symbol_size); // do a measurement on the best guess of the PSS for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) rx_power+= signal_energy((int*)&ue->common_vars.common_vars_rx_data_per_thread[0].rxdataF[aarx][6*frame_parms->ofdm_symbol_size], frame_parms->ofdm_symbol_size); - printf("UE%d: rx_power %d\n",ue->Mod_id,rx_power); + //printf("UE%d: rx_power %d\n",ue->Mod_id,rx_power); /*common_vars.common_vars_rx_data_per_thread[0].rxdataF // do a measurement on the full frame diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c index 140c862e1dab583e4cccab79e2f6f46851be0fe8..eb671527770f3ca335ee643f61ab6da5e791ef43 100644 --- a/openair1/SCHED/phy_procedures_lte_ue.c +++ b/openair1/SCHED/phy_procedures_lte_ue.c @@ -1402,7 +1402,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, uint8_t empt } void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,runmode_t mode) { - printf("ue_prach_procedures: eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1); + //printf("ue_prach_procedures: eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1); int frame_tx = proc->frame_tx; int subframe_tx = proc->subframe_tx; int prach_power; @@ -1420,7 +1420,7 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin if (ue->mac_enabled==1){ // ask L2 for RACH transport - printf("ue_prach_procedures: ask L2 for RACH transport: %d,%d,%d\n",mode != rx_calib_ue,mode != rx_calib_ue_med,mode != no_L2_connect); + //printf("ue_prach_procedures: ask L2 for RACH transport: %d,%d,%d\n",mode != rx_calib_ue,mode != rx_calib_ue_med,mode != no_L2_connect); if ((mode != rx_calib_ue) && (mode != rx_calib_ue_med) && (mode != rx_calib_ue_byp) && (mode != no_L2_connect) ) { LOG_D(PHY,"Getting PRACH resources\n"); ue->prach_resources[eNB_id] = mac_xface->ue_get_rach(ue->Mod_id, @@ -1430,8 +1430,8 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin subframe_tx); LOG_D(PHY,"Got prach_resources for eNB %d address %p, RRCCommon %p\n",eNB_id,ue->prach_resources[eNB_id],UE_mac_inst[ue->Mod_id].radioResourceConfigCommon); LOG_D(PHY,"Prach resources %p\n",ue->prach_resources[eNB_id]); - printf("Got prach_resources for eNB %d address %p, RRCCommon %p\n",ue->common_vars.eNb_id,ue->prach_resources[eNB_id],UE_mac_inst[ue->Mod_id].radioResourceConfigCommon); - printf("Prach resources %p\n",ue->prach_resources[eNB_id]); + //printf("Got prach_resources for eNB %d address %p, RRCCommon %p\n",ue->common_vars.eNb_id,ue->prach_resources[eNB_id],UE_mac_inst[ue->Mod_id].radioResourceConfigCommon); + //printf("Prach resources %p\n",ue->prach_resources[eNB_id]); } } @@ -2540,14 +2540,14 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui ulsch_common_procedures(ue,proc, (ue->generate_ul_signal[eNB_id] == 0)); } // mode != PRACH - printf("phy_procedures_UE_TX: ue->UE_mode[eNB_id] == PRACH? %d,%d\n",ue->UE_mode[eNB_id] == PRACH,ue->frame_parms.prach_config_common.prach_Config_enabled==1); + //printf("phy_procedures_UE_TX: ue->UE_mode[eNB_id] == PRACH? %d,%d\n",ue->UE_mode[eNB_id] == PRACH,ue->frame_parms.prach_config_common.prach_Config_enabled==1); if ((ue->UE_mode[eNB_id] == PRACH) && (ue->frame_parms.prach_config_common.prach_Config_enabled==1)) { // check if we have PRACH opportunity if (is_prach_subframe(&ue->frame_parms,frame_tx,subframe_tx)) { - printf("is there a PRACH opportunity? %d\n",is_prach_subframe(&ue->frame_parms,frame_tx,subframe_tx)); + //printf("is there a PRACH opportunity? %d\n",is_prach_subframe(&ue->frame_parms,frame_tx,subframe_tx)); ue_prach_procedures(ue,proc,eNB_id,abstraction_flag,mode); } } // mode is PRACH @@ -2901,7 +2901,7 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin { //printf("PBCH: id %d\n",ue->Mod_id); // int i; - printf("ue_pbch_procedures: eNB_id %d, ue->common_vars.eNb.id %d\n",eNB_id,ue->common_vars.eNb_id); + //printf("ue_pbch_procedures: eNB_id %d, ue->common_vars.eNb.id %d\n",eNB_id,ue->common_vars.eNb_id); int pbch_tx_ant=0; uint8_t pbch_phase; uint16_t frame_tx; @@ -2925,7 +2925,7 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin for (pbch_trials=0; pbch_trials<4; pbch_trials++) { //for (pbch_phase=0;pbch_phase<4;pbch_phase++) { - printf("[UE %d] Frame %d, Trying PBCH %d (NidCell %d, eNB_id %d)\n",ue->Mod_id,frame_rx,pbch_phase,ue->frame_parms.Nid_cell,ue->common_vars.eNb_id); + //printf("[UE %d] Frame %d, Trying PBCH %d (NidCell %d, eNB_id %d)\n",ue->Mod_id,frame_rx,pbch_phase,ue->frame_parms.Nid_cell,ue->common_vars.eNb_id); if (abstraction_flag == 0) { pbch_tx_ant = rx_pbch(&ue->common_vars, ue->pbch_vars[eNB_id], @@ -3106,7 +3106,7 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t abstraction_flag) { - printf("ue_pdcch_procedures: eNB_id %d, ue->common_vars.eNb.id %d\n",eNB_id,ue->common_vars.eNb_id); + //printf("ue_pdcch_procedures: eNB_id %d, ue->common_vars.eNb.id %d\n",eNB_id,ue->common_vars.eNb_id); unsigned int dci_cnt=0, i; int frame_rx = proc->frame_rx; @@ -3725,7 +3725,7 @@ void ue_pdsch_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, int eNB_id, PDSC int harq_pid; int i_mod,eNB_id_i,dual_stream_UE; int first_symbol_flag=0; - printf("ue_pdsch_procedures: eNB_id %d, ue->common_vars.eNb.id %d\n",eNB_id,ue->common_vars.eNb_id); + //printf("ue_pdsch_procedures: eNB_id %d, ue->common_vars.eNb.id %d\n",eNB_id,ue->common_vars.eNb_id); if (dlsch0->active == 0) return; @@ -3912,7 +3912,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, int *dlsch_errors, runmode_t mode, int abstraction_flag) { - printf("ue_dlsch_procedures: eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1); + //printf("ue_dlsch_procedures: eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1); int harq_pid; int frame_rx = proc->frame_rx; int subframe_rx = proc->subframe_rx; diff --git a/openair2/LAYER2/MAC/ra_procedures.c b/openair2/LAYER2/MAC/ra_procedures.c index 913dbc3eda916bdbca3b695b07581804b6c05e8f..4d08719a7a58d8d581263865c3be7cc6a065d3c6 100644 --- a/openair2/LAYER2/MAC/ra_procedures.c +++ b/openair2/LAYER2/MAC/ra_procedures.c @@ -324,7 +324,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP,int CC_id,frame_t frameP, mac_xface->macphy_exit("MAC FATAL CC_id>0"); return 0; // not reached } - printf("ue_get_rach:UE_mode == PRACH? %d\n",UE_mode == PRACH); + //printf("ue_get_rach:UE_mode == PRACH? %d\n",UE_mode == PRACH); if (UE_mode == PRACH) { if (UE_mac_inst[module_idP].radioResourceConfigCommon) { rach_ConfigCommon = &UE_mac_inst[module_idP].radioResourceConfigCommon->rach_ConfigCommon; @@ -333,7 +333,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP,int CC_id,frame_t frameP, } if (Is_rrc_registered == 1) { - printf("ue_get_rach:Is_rrc_registered? %d\n",Is_rrc_registered == 1); + //printf("ue_get_rach:Is_rrc_registered? %d\n",Is_rrc_registered == 1); if (UE_mac_inst[module_idP].RA_active == 0) { LOG_D(MAC,"RA not active\n"); // check if RRC is ready to initiate the RA procedure @@ -345,7 +345,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP,int CC_id,frame_t frameP, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id, 0); Size16 = (uint16_t)Size; - printf("ue_get_rach:Size16 %d\n",Size16); + //printf("ue_get_rach:Size16 %d\n",Size16); // LOG_D(MAC,"[UE %d] Frame %d: Requested RRCConnectionRequest, got %d bytes\n",module_idP,frameP,Size); LOG_D(RRC, "[MSC_MSG][FRAME %05d][RRC_UE][MOD %02d][][--- MAC_DATA_REQ (RRCConnectionRequest eNB %d) --->][MAC_UE][MOD %02d][]\n", frameP, module_idP, /*eNB_indexP*/PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id, module_idP); diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c index 0ef5af3c5bdf8d034b3517d36e3b92b16775542a..12d4937ae80d04008853c5417ec62d1cf3f6c1f9 100644 --- a/openair2/LAYER2/MAC/ue_procedures.c +++ b/openair2/LAYER2/MAC/ue_procedures.c @@ -1836,7 +1836,7 @@ ue_scheduler( const int CC_id) //------------------------------------------------------------------------------ { - printf("ue_scheduler: eNB_indexp %d, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id %d \n",eNB_indexP,PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id); + //printf("ue_scheduler: eNB_indexp %d, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id %d \n",eNB_indexP,PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id); int lcid; // lcid index int TTI= 1; int bucketsizeduration = -1; @@ -1894,7 +1894,7 @@ ue_scheduler( //Rrc_xface->Frame_index=Mac_rlc_xface->frameP; //if (subframe%5 == 0) //LG#ifdef EXMIMO - printf("before pdcp_run: eNB_index %d, rnti %x\n",ctxt.eNB_index,ctxt.rnti); + //printf("before pdcp_run: eNB_index %d, rnti %x\n",ctxt.eNB_index,ctxt.rnti); pdcp_run(&ctxt); //#endif UE_mac_inst[module_idP].txFrame = txFrameP; diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c index 70295cd85c393649d6a5bbac5732af569463f114..4bc48b123bb20dbe4ce5002ddd0410fafb3cd59c 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c @@ -927,7 +927,7 @@ pdcp_run ( RRC_DCCH_DATA_REQ (msg_p).frame, 0, RRC_DCCH_DATA_REQ (msg_p).eNB_index); - printf("pdcp_run:RRC_DCCH_DATA_REQ: eNB %d, rnti %d\n",RRC_DCCH_DATA_REQ (msg_p).eNB_index,RRC_DCCH_DATA_REQ (msg_p).rnti); + //printf("pdcp_run:RRC_DCCH_DATA_REQ: eNB %d, rnti %d\n",RRC_DCCH_DATA_REQ (msg_p).eNB_index,RRC_DCCH_DATA_REQ (msg_p).rnti); LOG_I(PDCP, PROTOCOL_CTXT_FMT"Received %s from %s: instance %d, rb_id %d, muiP %d, confirmP %d, mode %d\n", PROTOCOL_CTXT_ARGS(&ctxt), msg_name, diff --git a/openair2/RRC/LITE/L2_interface.c b/openair2/RRC/LITE/L2_interface.c index b6871dc352b105b8236eeaa1dbea0c05a43fac9e..9b5dfc7b76f151cdf9d8cec7c24e8b030e28bf17 100644 --- a/openair2/RRC/LITE/L2_interface.c +++ b/openair2/RRC/LITE/L2_interface.c @@ -347,7 +347,7 @@ mac_rrc_data_ind( SRB_INFO *Srb_info; protocol_ctxt_t ctxt; sdu_size_t sdu_size = 0; - printf("mac_rrc_data_ind\n"); + //printf("mac_rrc_data_ind\n"); /* for no gcc warnings */ (void)sdu_size; @@ -564,7 +564,7 @@ rrc_data_req( ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE, ctxt_pP->instance, message_p); - printf("rrc_data_req: eNB_index %d, rnti %d\n",RRC_DCCH_DATA_REQ (message_p).eNB_index,RRC_DCCH_DATA_REQ (message_p).rnti); + //printf("rrc_data_req: eNB_index %d, rnti %d\n",RRC_DCCH_DATA_REQ (message_p).eNB_index,RRC_DCCH_DATA_REQ (message_p).rnti); return TRUE; // TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway. } @@ -607,7 +607,7 @@ rrc_data_ind( } #if defined(ENABLE_ITTI) - printf("rrc_data_ind: enable_itti\n"); + //printf("rrc_data_ind: enable_itti\n"); { MessageDef *message_p; // Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling). diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c index 7421c732cb5cd8668e5028e6d750994e38a7b073..3dbecedf80b90dc2969450b2bcb1b17771c1610a 100644 --- a/openair2/RRC/LITE/rrc_UE.c +++ b/openair2/RRC/LITE/rrc_UE.c @@ -1736,7 +1736,7 @@ rrc_ue_process_securityModeCommand( } LOG_T(RRC, "\n"); - printf("rrc_data_req: eNB_index %d\n",ctxt_pP->eNB_index); + //printf("rrc_data_req: eNB_index %d\n",ctxt_pP->eNB_index); rrc_data_req ( ctxt_pP, DCCH, @@ -2706,7 +2706,7 @@ int decode_BCCH_DLSCH_Message( # endif #endif if (bcch_message->message.present == BCCH_DL_SCH_MessageType_PR_c1) { - printf("Before SIB1: bcch_message->message.choice.c1.present %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1 %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformation %d, id %d, frame %d, CASE %s, eNB_index %d\n",bcch_message->message.choice.c1.present,BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1,BCCH_DL_SCH_MessageType__c1_PR_systemInformation,ctxt_pP->module_id,ctxt_pP->frame, ((ctxt_pP->frame % 2) == 0&&((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 0) )?"SIB1":((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 1)?"SIB2":"Other case",eNB_index); + //printf("Before SIB1: bcch_message->message.choice.c1.present %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1 %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformation %d, id %d, frame %d, CASE %s, eNB_index %d\n",bcch_message->message.choice.c1.present,BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1,BCCH_DL_SCH_MessageType__c1_PR_systemInformation,ctxt_pP->module_id,ctxt_pP->frame, ((ctxt_pP->frame % 2) == 0&&((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 0) )?"SIB1":((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 1)?"SIB2":"Other case",eNB_index); switch (bcch_message->message.choice.c1.present) { case BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1: if ((ctxt_pP->frame % 2) == 0) { @@ -4267,7 +4267,7 @@ EXPORT_SYMBOL(Rlc_info_am_config); //----------------------------------------------------------------------------- void *rrc_ue_task( void *args_p ) { - printf("rrc_ue_task\n"); + //printf("rrc_ue_task\n"); MessageDef *msg_p; const char *msg_name; instance_t instance; @@ -4318,14 +4318,14 @@ NAS_KENB_REFRESH_REQ,NAS_CELL_SELECTION_REQ,RRC_STATE_INACTIVE,RRC_STATE_IDLE,RR break; case RRC_MAC_BCCH_DATA_IND: - printf("rrc_ue_task:[UE %d] Received %s: frameP %d, eNB %d\n", ue_mod_id, msg_name, - RRC_MAC_BCCH_DATA_IND (msg_p).frame, RRC_MAC_BCCH_DATA_IND (msg_p).enb_index); + //printf("rrc_ue_task:[UE %d] Received %s: frameP %d, eNB %d\n", ue_mod_id, msg_name, + // RRC_MAC_BCCH_DATA_IND (msg_p).frame, RRC_MAC_BCCH_DATA_IND (msg_p).enb_index); LOG_D(RRC, "[UE %d] Received %s: frameP %d, eNB %d\n", ue_mod_id, msg_name, RRC_MAC_BCCH_DATA_IND (msg_p).frame, RRC_MAC_BCCH_DATA_IND (msg_p).enb_index); // PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt, instance, ENB_FLAG_NO, NOT_A_RNTI, RRC_MAC_BCCH_DATA_IND (msg_p).frame, 0); PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, ue_mod_id, ENB_FLAG_NO, NOT_A_RNTI, RRC_MAC_BCCH_DATA_IND (msg_p).frame, 0,RRC_MAC_BCCH_DATA_IND (msg_p).enb_index); - printf("decode_BCCH_DLSCH_Message for ue %d, enb %d \n",ue_mod_id,RRC_MAC_BCCH_DATA_IND (msg_p).enb_index); + //printf("decode_BCCH_DLSCH_Message for ue %d, enb %d \n",ue_mod_id,RRC_MAC_BCCH_DATA_IND (msg_p).enb_index); decode_BCCH_DLSCH_Message (&ctxt, RRC_MAC_BCCH_DATA_IND (msg_p).enb_index, RRC_MAC_BCCH_DATA_IND (msg_p).sdu, @@ -4444,7 +4444,7 @@ NAS_KENB_REFRESH_REQ,NAS_CELL_SELECTION_REQ,RRC_STATE_INACTIVE,RRC_STATE_IDLE,RR if (rrc_get_state(ue_mod_id) == RRC_STATE_INACTIVE) { // have a look at MAC/main.c void dl_phy_sync_success(...) - printf("openair_rrc_ue_init: UE %d\n",ue_mod_id); + //printf("openair_rrc_ue_init: UE %d\n",ue_mod_id); openair_rrc_ue_init(ue_mod_id,PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id); } @@ -4551,7 +4551,7 @@ NAS_KENB_REFRESH_REQ,NAS_CELL_SELECTION_REQ,RRC_STATE_INACTIVE,RRC_STATE_IDLE,RR uint8_t *buffer; LOG_D(RRC, "[UE %d] Received %s: UEid %d\n", ue_mod_id, msg_name, NAS_UPLINK_DATA_REQ (msg_p).UEid); - printf("[UE %d] Received %s: UEid %d\n", ue_mod_id, msg_name, NAS_UPLINK_DATA_REQ (msg_p).UEid); + //printf("[UE %d] Received %s: UEid %d\n", ue_mod_id, msg_name, NAS_UPLINK_DATA_REQ (msg_p).UEid); /* Create message for PDCP (ULInformationTransfer_t) */ length = do_ULInformationTransfer(&buffer, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.length, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.data); @@ -4559,7 +4559,7 @@ NAS_KENB_REFRESH_REQ,NAS_CELL_SELECTION_REQ,RRC_STATE_INACTIVE,RRC_STATE_IDLE,RR PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, ue_mod_id, ENB_FLAG_NO, UE_rrc_inst[ue_mod_id].Info[PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id].rnti, 0, 0,PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id); // check if SRB2 is created, if yes request data_req on DCCH1 (SRB2) - printf("check if SRB2 is created, if yes request data_req on DCCH1: eNB_index %d, rnti %d, UE_rrc_inst[ue_mod_id].SRB2_config[PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id] == NULL %d\n",ctxt.eNB_index, ctxt.rnti,UE_rrc_inst[ue_mod_id].SRB2_config[PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id] == NULL); + //printf("check if SRB2 is created, if yes request data_req on DCCH1: eNB_index %d, rnti %d, UE_rrc_inst[ue_mod_id].SRB2_config[PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id] == NULL %d\n",ctxt.eNB_index, ctxt.rnti,UE_rrc_inst[ue_mod_id].SRB2_config[PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id] == NULL); if(UE_rrc_inst[ue_mod_id].SRB2_config[PHY_vars_UE_g[ue_mod_id][0]->common_vars.eNb_id] == NULL) { rrc_data_req (&ctxt, diff --git a/openair2/RRC/LITE/rrc_common.c b/openair2/RRC/LITE/rrc_common.c index a3571a1e2f2f8bbad409350e7665274b1ae38a45..26aa578be5969139f6b432df1b4df63181bf5b9c 100644 --- a/openair2/RRC/LITE/rrc_common.c +++ b/openair2/RRC/LITE/rrc_common.c @@ -408,7 +408,7 @@ rrc_rx_tx( //----------------------------------------------------------------------------- { //uint8_t UE_id; - printf("rrc_rx_tx: enb_indexP %d\n",enb_indexP); + //printf("rrc_rx_tx: enb_indexP %d\n",enb_indexP); int32_t current_timestamp_ms, ref_timestamp_ms; struct timeval ts; struct rrc_eNB_ue_context_s *ue_context_p = NULL,*ue_to_be_removed = NULL; diff --git a/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf b/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf index 232b7c23c9a8d4d74912d093531ed0a5dae1b16f..6eb6b099dded03014fd8d2ac21074d801395932f 100644 --- a/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf +++ b/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf @@ -79,7 +79,7 @@ PLMN: { UE0: { USER: { - IMEI="355251051577260"; + IMEI="35525105157726"; MANUFACTURER="EURECOM"; MODEL="LTE Android PC"; PIN="0000"; @@ -89,7 +89,7 @@ UE0: MSIN="0100001111"; USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; OPC="e734f8734007d6c5ce7a0508809e7e9c"; - MSISDN="33611123456"; + MSISDN="33638020001"; }; # Home PLMN Selector with Access Technology @@ -115,7 +115,7 @@ UE0: UE1: { USER: { - IMEI="355089083845804"; + IMEI="35508908384580"; MANUFACTURER="EURECOM"; MODEL="LTE Android PC"; PIN="0000"; @@ -125,7 +125,7 @@ UE1: MSIN="0100001112"; USIM_API_K="8baf473f2f8fd09487cccbd7097c6862"; OPC="e734f8734007d6c5ce7a0508809e7e9c"; - MSISDN="33611123457"; + MSISDN="33638020002"; }; # Home PLMN Selector with Access Technology diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c index 55ac250dacee70b7df79328f2482134714c5e640..85d4596bcadd749bf7fc7dc8d1b5a252c90943e0 100644 --- a/targets/SIMU/USER/oaisim_functions.c +++ b/targets/SIMU/USER/oaisim_functions.c @@ -1920,7 +1920,7 @@ void update_ocm() UE_id, ue_data[UE_id]->x,ue_data[UE_id]->y, distance);*/ } - printf("UE %d is associated to eNB %d based on pathloss (%s domain)\n",UE_id,PHY_vars_UE_g[UE_id][CC_id]->common_vars.eNb_id,(PHY_vars_UE_g[UE_id][CC_id]->do_ofdm_mod)?"Frequency":"Time"); + //printf("UE %d is associated to eNB %d based on pathloss (%s domain)\n",UE_id,PHY_vars_UE_g[UE_id][CC_id]->common_vars.eNb_id,(PHY_vars_UE_g[UE_id][CC_id]->do_ofdm_mod)?"Frequency":"Time"); } } }