diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c index 895506e53fe44d0f6391e2cb0b33b814f34d3e69..3f9b4422a1a5960e856b8d5a14ec00bb45908616 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c @@ -169,7 +169,7 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,unsigned char Mdlharq,unsigne } } - if ((exit_flag==0)) { + if (exit_flag==0) { for (i=0;i<Mdlharq;i++) { dlsch->harq_processes[i]->round=0; if (abstraction_flag==0) { diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c index 264ce262a7b26f3f9d12aad4b8b76732b2300a9e..6e4c7803d48310cbec1c1e19c56f3696b1f3e5d3 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c @@ -1119,7 +1119,7 @@ int dlsch_modulation(mod_sym_t **txdataF, skip_half=0; if ((frame_parms->N_RB_DL&1) == 1) { // ODD N_RB_DL - if ((rb==frame_parms->N_RB_DL>>1)) + if (rb==(frame_parms->N_RB_DL>>1)) skip_dc = 1; else skip_dc = 0; @@ -1340,7 +1340,7 @@ int mch_modulation(mod_sym_t **txdataF, if ((frame_parms->N_RB_DL&1) == 1) { // ODD N_RB_DL - if ((rb==frame_parms->N_RB_DL>>1)) + if (rb==(frame_parms->N_RB_DL>>1)) skip_dc = 1; else skip_dc = 0; diff --git a/openair1/PHY/TOOLS/file_output.c b/openair1/PHY/TOOLS/file_output.c index f2e6af253445c4d4364335adf608335ea20e2cf9..71a8f8cdad79e400b3dab21e79eb459fa5f88190 100755 --- a/openair1/PHY/TOOLS/file_output.c +++ b/openair1/PHY/TOOLS/file_output.c @@ -35,7 +35,7 @@ int write_output(const char *fname,const char *vname,void *data,int length,int dec,char format) { - FILE *fp; + FILE *fp=NULL; int i; @@ -139,9 +139,9 @@ int write_output(const char *fname,const char *vname,void *data,int length,int d if((i < 2*(length-1)) && (i > 0)) fprintf(fp,"%d + j*(%d),",((short *)data)[i],((short *)data)[i+1]); - else if ((i == 2*(length-1))) + else if (i == 2*(length-1)) fprintf(fp,"%d + j*(%d);",((short *)data)[i],((short *)data)[i+1]); - else if ((i == 0)) + else if (i == 0) fprintf(fp,"\n%d + j*(%d),",((short *)data)[i],((short *)data)[i+1]); @@ -155,7 +155,7 @@ int write_output(const char *fname,const char *vname,void *data,int length,int d if((i <(length-1))&& (i > 0)) fprintf(fp,"%d,",((short *)data)[i]); - else if ((i == (length-1))) + else if (i == (length-1)) fprintf(fp,"%d;",((short *)data)[i]); else if (i == 0) fprintf(fp,"\n%d,",((short *)data)[i]); diff --git a/openair1/SCHED/phy_procedures_lte_common.c b/openair1/SCHED/phy_procedures_lte_common.c index ae999b811516ac5f835ca5d2b004c94ed98e7799..78298d9c9ac5d7ea358165724eff7e8a6fe763ab 100755 --- a/openair1/SCHED/phy_procedures_lte_common.c +++ b/openair1/SCHED/phy_procedures_lte_common.c @@ -689,7 +689,7 @@ double aggregate_eNB_UE_localization_stats(PHY_VARS_eNB *phy_vars_eNB, int8_t UE /* current measurements shows constant UE_timing_offset = 18 and timing_advance_update = 11 at 1m. at 5m, timing_advance_update = 12*/ //time_distance = (double) 299792458*(phy_vars_eNB->eNB_UE_stats[(uint32_t)UE_id].timing_advance_update)/(sys_bw*1000000); - time_distance = (double) fabs(phy_vars_eNB->eNB_UE_stats[(uint32_t)UE_id].timing_advance_update - 11) * 4.89;// (3 x 108 x 1 / (15000 x 2048)) / 2 = 4.89 m + time_distance = (double) abs(phy_vars_eNB->eNB_UE_stats[(uint32_t)UE_id].timing_advance_update - 11) * 4.89;// (3 x 108 x 1 / (15000 x 2048)) / 2 = 4.89 m phy_vars_eNB->eNB_UE_stats[(uint32_t)UE_id].distance.time_based = time_distance; phy_vars_eNB->eNB_UE_stats[(uint32_t)UE_id].distance.power_based = power_distance; diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c index dd7f3aa7e45a87745587497380577208851055d1..0bb887d85104e3530d1bc395e5739ae3eeb209cd 100755 --- a/openair1/SCHED/phy_procedures_lte_ue.c +++ b/openair1/SCHED/phy_procedures_lte_ue.c @@ -632,7 +632,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra if ((slot_tx%2)==0) { phy_vars_ue->tx_power_dBm=-127; - if ((abstraction_flag==0)) { + if (abstraction_flag==0) { for (aa=0;aa<frame_parms->nb_antennas_tx;aa++){ memset(&phy_vars_ue->lte_ue_common_vars.txdataF[aa][subframe_tx*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti], 0, @@ -1448,7 +1448,7 @@ void lte_ue_measurement_procedures(uint16_t l, PHY_VARS_UE *phy_vars_ue,uint8_t } #ifdef DEBUG_PHY_PROC - if ((slot_rx == 2)) { // && (phy_vars_ue->frame%100==0)) { + if (slot_rx == 2) { // && (phy_vars_ue->frame%100==0)) { LOG_D(PHY,"[UE %d] frame %d, slot %d, freq_offset_filt = %d \n",Mod_id,phy_vars_ue->frame_tx, slot_rx, phy_vars_ue->lte_ue_common_vars.freq_offset); /* diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c index 0b35ebe27c08ddeba10896130eb5568299730fa8..a2537ea67c76914d021cfaf0029ff7410487a3a9 100644 --- a/openair1/SIMULATION/LTE_PHY/dlsim.c +++ b/openair1/SIMULATION/LTE_PHY/dlsim.c @@ -3154,7 +3154,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols, PHY_vars_UE->total_TBS[eNB_id] = PHY_vars_UE->total_TBS[eNB_id] + PHY_vars_UE->dlsch_ue[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]->TBS; TB0_active = 0; - if (PHY_vars_UE->dlsch_ue[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]->mimo_mode = LARGE_CDD) { //try to decode second stream + if (PHY_vars_UE->dlsch_ue[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]->mimo_mode == LARGE_CDD) { //try to decode second stream for (round = 0 ; round < PHY_vars_UE->dlsch_ue[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]->round ; round++) { dlsch0_ue_harq = PHY_vars_UE->dlsch_ue[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]; @@ -3578,7 +3578,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols, dci_errors); //fprintf(time_meas_fd,"SNR; MCS; TBS; rate; DL_DECOD_ITER; err0; trials0; err1; trials1; err2; trials2; err3; trials3; PE; dci_err;PE;ND;\n"); - fprintf(time_meas_fd,"%f;%d;%d;%f; %2.1f%;%f;%f;%d;%d;%d;%d;%d;%d;%d;%d;%e;%e;%e;%e;%d;%d;%e;%f;%f;", + fprintf(time_meas_fd,"%f;%d;%d;%f; %2.1f%%;%f;%f;%d;%d;%d;%d;%d;%d;%d;%d;%e;%e;%e;%e;%d;%d;%e;%f;%f;", SNR, mcs1, PHY_vars_eNB->dlsch_eNB[0][0]->harq_processes[0]->TBS, diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.h b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.h index d2a6030ac85e17010a8b0b2780d6918c9ab30812..6a29a957127dd177f675a29414b3aa0de0e503f5 100755 --- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.h +++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.h @@ -26,7 +26,7 @@ Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE *******************************************************************************/ -# ifndef __RLC_U_TEST_H__ +# ifndef __RLC_UM_TEST_H__ # define __RLC_UM_TEST_H__ # ifdef RLC_UM_TEST_C # define private_rlc_um_test(x) x