diff --git a/common/utils/telnetsrv/telnetsrv.c b/common/utils/telnetsrv/telnetsrv.c index a91e7b2398..d32cc88b2f 100644 --- a/common/utils/telnetsrv/telnetsrv.c +++ b/common/utils/telnetsrv/telnetsrv.c @@ -66,24 +66,27 @@ static telnetsrv_params_t telnetparams; #define TELNETSRV_OPTNAME_STATICMOD "staticmod" #define TELNETSRV_OPTNAME_SHRMOD "shrmod" +// clang-format off paramdef_t telnetoptions[] = { /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ /* configuration parameters for telnet utility */ /* optname helpstr paramflags XXXptr defXXXval type numelt */ /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ - {"listenaddr", "\n", 0, uptr : &telnetparams.listenaddr, defstrval : "0.0.0.0", TYPE_IPV4ADDR, 0}, - {"listenport", "\n", 0, uptr : &(telnetparams.listenport), defuintval : 9090, TYPE_UINT, 0}, - {"listenstdin", "enable input from stdin\n", PARAMFLAG_BOOL, uptr : &(telnetparams.listenstdin), defuintval : 0, TYPE_UINT, 0}, - {"priority", "\n", 0, uptr : NULL, defuintval : 0, TYPE_UINT, 0}, - {"loopcount", "\n", 0, uptr : &(telnetparams.loopcount), defuintval : 10, TYPE_UINT, 0}, - {"loopdelay", "\n", 0, uptr : &(telnetparams.loopdelay), defuintval : 5000, TYPE_UINT, 0}, - {"histfile", "\n", PARAMFLAG_NOFREE, strptr : &(telnetparams.histfile), defstrval : "oaitelnet.history", TYPE_STRING, 0}, - {"histsize", "\n", 0, iptr : &(telnetparams.histsize), defuintval : 50, TYPE_INT, 0}, - {"logfile", "log file when redirecting", PARAMFLAG_NOFREE, strptr : &(telnetparams.logfile), defstrval : "oaisoftmodem.log", TYPE_STRING, 0}, - {"phypbsize", "\n", 0, uptr : &(telnetparams.phyprntbuff_size), defuintval : 65000, TYPE_UINT, 0}, - {TELNETSRV_OPTNAME_STATICMOD, "\n", 0, strlistptr : NULL, defstrlistval : telnet_defstatmod, TYPE_STRINGLIST, (sizeof(telnet_defstatmod) / sizeof(char *))}, - {TELNETSRV_OPTNAME_SHRMOD, "\n", 0, strlistptr : NULL, defstrlistval : NULL, TYPE_STRINGLIST, 0}}; + {"listenaddr", "\n", 0, .uptr = &telnetparams.listenaddr, .defstrval = "0.0.0.0", TYPE_IPV4ADDR, 0}, + {"listenport", "\n", 0, .uptr = &telnetparams.listenport, .defuintval = 9090, TYPE_UINT, 0}, + {"listenstdin", "enable input from stdin\n", PARAMFLAG_BOOL, .uptr = &telnetparams.listenstdin, .defuintval = 0, TYPE_UINT, 0}, + {"priority", "\n", 0, .uptr = NULL, .defuintval = 0, TYPE_UINT, 0}, + {"loopcount", "\n", 0, .uptr = &telnetparams.loopcount, .defuintval = 10, TYPE_UINT, 0}, + {"loopdelay", "\n", 0, .uptr = &telnetparams.loopdelay, .defuintval = 5000, TYPE_UINT, 0}, + {"histfile", "\n", PARAMFLAG_NOFREE, .strptr = &telnetparams.histfile, .defstrval = "oaitelnet.history", TYPE_STRING, 0}, + {"histsize", "\n", 0, .iptr = &telnetparams.histsize, .defuintval = 50, TYPE_INT, 0}, + {"logfile", "log file when redirecting", PARAMFLAG_NOFREE, .strptr = &telnetparams.logfile, .defstrval = "oaisoftmodem.log", TYPE_STRING, 0}, + {"phypbsize", "\n", 0, .uptr = &telnetparams.phyprntbuff_size, .defuintval = 65000, TYPE_UINT, 0}, + {TELNETSRV_OPTNAME_STATICMOD, "\n", 0, .strlistptr = NULL, .defstrlistval = telnet_defstatmod, TYPE_STRINGLIST, (sizeof(telnet_defstatmod) / sizeof(char *))}, + {TELNETSRV_OPTNAME_SHRMOD, "\n", 0, .strlistptr = NULL, .defstrlistval = NULL, TYPE_STRINGLIST, 0} +}; +// clang-format on int get_phybsize(void) { return telnetparams.phyprntbuff_size; diff --git a/executables/lte-ru.c b/executables/lte-ru.c index 23e2a3e4b4..d18e928802 100644 --- a/executables/lte-ru.c +++ b/executables/lte-ru.c @@ -212,7 +212,6 @@ void fh_if4p5_south_in(RU_t *ru, uint16_t packet_type; uint32_t symbol_number=0; uint32_t symbol_mask_full; - int pultick_received=0; if ((fp->frame_type == TDD) && (subframe_select(fp,*subframe)==SF_S)) symbol_mask_full = (1<ul_symbols_in_S_subframe)-1; @@ -232,7 +231,6 @@ void fh_if4p5_south_in(RU_t *ru, if (packet_type == IF4p5_PULFFT) proc->symbol_mask[sf] = proc->symbol_mask[sf] | (1<symbol_mask[sf] = 0xffff; - pultick_received++; /* if ((proc->first_rx==0) && (f!=*frame)) LOG_E(PHY,"rx_fh_if4p5: PULTICK received frame %d != expected %d (RU %d) \n",f,*frame, ru->idx); else if ((proc->first_rx==0) && (sf!=*subframe)) LOG_E(PHY,"rx_fh_if4p5: PULTICK received subframe %d != expected %d (first_rx %d)\n",sf,*subframe,proc->first_rx); diff --git a/executables/thread-common.h b/executables/thread-common.h index 0aaeb3c30e..6eb7bdc1f4 100644 --- a/executables/thread-common.h +++ b/executables/thread-common.h @@ -11,7 +11,7 @@ static inline void set_parallel_conf(char *parallel_conf) { {NULL,-1} }; thread_struct.parallel_conf = (PARALLEL_CONF_t)map_str_to_int(config, parallel_conf); - if (thread_struct.parallel_conf == -1 ) { + if (thread_struct.parallel_conf == (unsigned int)-1) { LOG_E(ENB_APP,"Impossible value: %s\n", parallel_conf); thread_struct.parallel_conf = PARALLEL_SINGLE_THREAD; } @@ -24,7 +24,7 @@ static inline void set_worker_conf(char *worker_conf) { {NULL, -1} }; thread_struct.worker_conf = (WORKER_CONF_t)map_str_to_int(config, worker_conf); - if (thread_struct.worker_conf == -1 ) { + if (thread_struct.worker_conf == (unsigned int)-1) { LOG_E(ENB_APP,"Impossible value: %s\n", worker_conf); thread_struct.worker_conf = WORKER_DISABLE ; } diff --git a/openair1/PHY/CODING/lte_rate_matching.c b/openair1/PHY/CODING/lte_rate_matching.c index 8a1ca30474..5aedde34df 100644 --- a/openair1/PHY/CODING/lte_rate_matching.c +++ b/openair1/PHY/CODING/lte_rate_matching.c @@ -793,7 +793,6 @@ void lte_rate_matching_cc_rx(uint32_t RCC, int8_t *soft_input) { uint32_t ind=0,k; uint16_t Kw = 3*(RCC<<5); - uint32_t acc=1; int16_t w16[Kw]; #ifdef RM_DEBUG_CC uint32_t nulled=0; @@ -827,13 +826,11 @@ void lte_rate_matching_cc_rx(uint32_t RCC, if (ind==Kw) { ind=0; - acc++; } } // rescale for (ind=0; ind7) w[ind]=7; else if (w16[ind]<-8) diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c index 9242e574c7..1a4137fb29 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c @@ -371,8 +371,8 @@ void build_polar_tables(t_nrPolar_params *polarParams) { // rate matching table int iplast=polarParams->rate_matching_pattern[0]; int ccnt=0; - int groupcnt=0; #ifdef DEBUG_POLAR_ENCODER + int groupcnt=0; int firstingroup_out=0; int firstingroup_in=iplast; #endif @@ -386,8 +386,8 @@ void build_polar_tables(t_nrPolar_params *polarParams) { #endif if ((ip - iplast) == 1) ccnt++; else { - groupcnt++; #ifdef DEBUG_POLAR_ENCODER + groupcnt++; printf("group %d (size %d): (%d:%d) => (%d:%d)\n",groupcnt,ccnt+1, firstingroup_in,firstingroup_in+ccnt, firstingroup_out,firstingroup_out+ccnt); @@ -404,7 +404,9 @@ void build_polar_tables(t_nrPolar_params *polarParams) { iplast=ip; } +#ifdef DEBUG_POLAR_ENCODER groupcnt++; + #endif if ((ccnt+1) (%d:%d)\n",groupcnt,ccnt+1, diff --git a/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c b/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c index 2331e253d5..e7f46eb5ef 100644 --- a/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c +++ b/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c @@ -34,8 +34,7 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue, unsigned char p, unsigned char symbol) { - - unsigned short rb,nb_rb=0; + unsigned short rb; unsigned char aarx,l,lprime,nsymb,skip_half=0,sss_symb,pss_symb=0,rb_alloc_ind,harq_pid,uespec_pilots=0; int beamforming_mode, ch_offset; uint8_t subframe; @@ -241,7 +240,6 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue, LOG_E(PHY,"lte_dl_bf_channel_estimation(lte_dl_bf_channel_estimation.c): transmission mode not supported.\n"); } } - nb_rb++; } rxF+=24; @@ -395,8 +393,7 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue, } else { LOG_E(PHY,"lte_dl_bf_channel_estimation(lte_dl_bf_channel_estimation.c):transmission mode not supported.\n"); } - } - nb_rb++; + } } rxF+=24; @@ -645,7 +642,6 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue, LOG_E(PHY,"lte_dl_bf_channel_estimation(lte_dl_bf_channel_estimation.c):transmission mode not supported.\n"); } } - nb_rb++; } rxF+=24; diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c index 78c0dd2a15..c4ab60602d 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c @@ -512,9 +512,7 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, uint32_t high_speed_flag, LTE_DL_FRAME_PARMS *frame_parms) { - - - uint16_t rb,nb_rb=0; + uint16_t rb; uint8_t i,j,aarx; int32_t *dl_ch0,*dl_ch0_ext,*rxF,*rxF_ext; @@ -558,7 +556,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, } - nb_rb++; dl_ch0_ext+=12; rxF_ext+=12; @@ -579,7 +576,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, } } - nb_rb++; dl_ch0_ext+=8; rxF_ext+=8; @@ -596,7 +592,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, for (i=0; i<12; i++) rxF_ext[i]=rxF[i]; - nb_rb++; dl_ch0_ext+=12; rxF_ext+=12; @@ -617,7 +612,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, } } - nb_rb++; dl_ch0_ext+=8; rxF_ext+=8; @@ -652,8 +646,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, } } - - nb_rb++; dl_ch0_ext+=8; rxF_ext+=8; dl_ch0+=12; @@ -672,8 +664,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, rxF_ext[i]=rxF[(1+i-6)]; } - - nb_rb++; dl_ch0_ext+=12; rxF_ext+=12; dl_ch0+=12; @@ -688,7 +678,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, for (i=0; i<12; i++) rxF_ext[i]=rxF[i]; - nb_rb++; dl_ch0_ext+=12; rxF_ext+=12; @@ -708,7 +697,6 @@ void pdcch_extract_rbs_single(int32_t **rxdataF, } } - nb_rb++; dl_ch0_ext+=8; rxF_ext+=8; @@ -728,9 +716,7 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, uint32_t high_speed_flag, LTE_DL_FRAME_PARMS *frame_parms) { - - - uint16_t rb,nb_rb=0; + uint16_t rb; uint8_t i,aarx,j; int32_t *dl_ch0,*dl_ch0_ext,*dl_ch1,*dl_ch1_ext,*rxF,*rxF_ext; uint8_t symbol_mod; @@ -785,7 +771,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, // ((int16_t*)&rxF[i<<1])[0],((int16_t*)&rxF[i<<1])[0]); } - nb_rb++; dl_ch0_ext+=12; dl_ch1_ext+=12; rxF_ext+=12; @@ -804,7 +789,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, } } - nb_rb++; dl_ch0_ext+=8; dl_ch1_ext+=8; rxF_ext+=8; @@ -827,7 +811,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, for (i=0; i<12; i++) rxF_ext[i]=rxF[i]; - nb_rb++; dl_ch0_ext+=12; dl_ch1_ext+=12; rxF_ext+=12; @@ -852,7 +835,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, } } - nb_rb++; dl_ch0_ext+=8; dl_ch1_ext+=8; rxF_ext+=8; @@ -881,7 +863,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, rxF_ext[i]=rxF[(1+i)]; } - nb_rb++; dl_ch0_ext+=12; dl_ch1_ext+=12; rxF_ext+=12; @@ -915,8 +896,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, } } - - nb_rb++; dl_ch0_ext+=8; dl_ch1_ext+=8; rxF_ext+=8; @@ -936,7 +915,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, for (i=0; i<12; i++) rxF_ext[i]=rxF[i]; - nb_rb++; dl_ch0_ext+=12; dl_ch1_ext+=12; rxF_ext+=12; @@ -959,7 +937,6 @@ void pdcch_extract_rbs_dual(int32_t **rxdataF, } } - nb_rb++; dl_ch0_ext+=8; dl_ch1_ext+=8; rxF_ext+=8; diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c index 28b2ec784c..74e5f4ce30 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c +++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c @@ -364,7 +364,7 @@ void nr_pdcch_extract_rbs_single(uint32_t rxdataF_sz, #define NBR_RE_PER_RB_WITH_DMRS 12 // after removing the 3 DMRS RE, the RB contains 9 RE with PDCCH #define NBR_RE_PER_RB_WITHOUT_DMRS 9 - uint16_t c_rb, nb_rb = 0; + uint16_t c_rb; //uint8_t rb_count_bit; uint8_t i, j, aarx; int32_t *dl_ch0, *dl_ch0_ext, *rxF, *rxF_ext; @@ -484,7 +484,6 @@ void nr_pdcch_extract_rbs_single(uint32_t rxdataF_sz, } } - nb_rb++; dl_ch0_ext += NBR_RE_PER_RB_WITHOUT_DMRS; rxF_ext += NBR_RE_PER_RB_WITHOUT_DMRS; dl_ch0 += 12; @@ -506,7 +505,6 @@ void nr_pdcch_extract_rbs_single(uint32_t rxdataF_sz, } } - nb_rb++; dl_ch0_ext += NBR_RE_PER_RB_WITHOUT_DMRS; rxF_ext += NBR_RE_PER_RB_WITHOUT_DMRS; dl_ch0 += 12; diff --git a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c index d88c0d4a52..82bcc91911 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c +++ b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c @@ -1077,7 +1077,9 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue, //txptr = &txdataF[0][re_offset]; int k=0; +#ifdef DEBUG_NR_PUCCH_TX int kk=0; +#endif for (int n=0; n<12; n++) { if ((n==6) && ((rb+startingPRB) == (frame_parms->N_RB_DL>>1)) && ((frame_parms->N_RB_DL & 1) == 1)) { @@ -1089,9 +1091,21 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue, ((int16_t *)&txdataF[0][re_offset])[0] = d_re[i+k]; ((int16_t *)&txdataF[0][re_offset])[1] = d_im[i+k]; #ifdef DEBUG_NR_PUCCH_TX - printf("\t [nr_generate_pucch2] (n=%d,i=%d) mapping PUCCH to RE \t amp=%d \tofdm_symbol_size=%d \tN_RB_DL=%d \tfirst_carrier_offset=%d \tz_pucch[%d]=txptr(%u)=(x_n(l=%d,n=%d)=(%d,%d))\n", - n,i,amp,frame_parms->ofdm_symbol_size,frame_parms->N_RB_DL,frame_parms->first_carrier_offset,i+k,re_offset, - l,n,((int16_t *)&txdataF[0][re_offset])[0],((int16_t *)&txdataF[0][re_offset])[1]); + printf( + "\t [nr_generate_pucch2] (n=%d,i=%d) mapping PUCCH to RE \t amp=%d \tofdm_symbol_size=%d \tN_RB_DL=%d " + "\tfirst_carrier_offset=%d \tz_pucch[%d]=txptr(%u)=(x_n(l=%d,n=%d)=(%d,%d))\n", + n, + i, + amp, + frame_parms->ofdm_symbol_size, + frame_parms->N_RB_DL, + frame_parms->first_carrier_offset, + i + k, + re_offset, + l, + n, + ((int16_t *)&txdataF[0][re_offset])[0], + ((int16_t *)&txdataF[0][re_offset])[1]); #endif k++; } @@ -1101,11 +1115,23 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue, ((int16_t *)&txdataF[0][re_offset])[1] = (int16_t)((int32_t)(amp*ONE_OVER_SQRT2*(1-(2*((uint8_t)((s>>((2*m)+1))&1)))))>>15); m++; #ifdef DEBUG_NR_PUCCH_TX - printf("\t [nr_generate_pucch2] (n=%d,i=%d) mapping DM-RS to RE \t amp=%d \tofdm_symbol_size=%d \tN_RB_DL=%d \tfirst_carrier_offset=%d \tz_dm-rs[%d]=txptr(%u)=(x_n(l=%d,n=%d)=(%d,%d))\n", - n,i,amp,frame_parms->ofdm_symbol_size,frame_parms->N_RB_DL,frame_parms->first_carrier_offset,i+kk,re_offset, - l,n,((int16_t *)&txdataF[0][re_offset])[0],((int16_t *)&txdataF[0][re_offset])[1]); -#endif + printf( + "\t [nr_generate_pucch2] (n=%d,i=%d) mapping DM-RS to RE \t amp=%d \tofdm_symbol_size=%d \tN_RB_DL=%d " + "\tfirst_carrier_offset=%d \tz_dm-rs[%d]=txptr(%u)=(x_n(l=%d,n=%d)=(%d,%d))\n", + n, + i, + amp, + frame_parms->ofdm_symbol_size, + frame_parms->N_RB_DL, + frame_parms->first_carrier_offset, + i + kk, + re_offset, + l, + n, + ((int16_t *)&txdataF[0][re_offset])[0], + ((int16_t *)&txdataF[0][re_offset])[1]); kk++; +#endif } re_offset++; diff --git a/openair1/PHY/TOOLS/nr_phy_scope.c b/openair1/PHY/TOOLS/nr_phy_scope.c index 17141c7158..6d3a247338 100644 --- a/openair1/PHY/TOOLS/nr_phy_scope.c +++ b/openair1/PHY/TOOLS/nr_phy_scope.c @@ -251,9 +251,8 @@ static OAIgraph_t nrUEcommonGraph( void (*funct) (scopeGraphData_t **data, OAIgr } #ifndef WEBSRVSCOPE static void setRange(OAIgraph_t *graph, float minX, float maxX, float minY, float maxY) { - if ( maxX > graph->maxX || minX < graph->minX || - abs(maxX-graph->maxX)>abs(graph->maxX)/2 || - abs(maxX-graph->maxX)>abs(graph->maxX)/2 ) { + if (maxX > graph->maxX || minX < graph->minX || fabs(maxX - graph->maxX) > fabs(graph->maxX) / 2 + || fabs(maxX - graph->maxX) > fabs(graph->maxX) / 2) { graph->maxX/=2; graph->minX/=2; graph->maxX=max(graph->maxX,maxX); @@ -261,9 +260,8 @@ static void setRange(OAIgraph_t *graph, float minX, float maxX, float minY, floa fl_set_xyplot_xbounds(graph->graph, graph->minX*1.2, graph->maxX*1.2); } - if ( maxY > graph->maxY || minY < graph->minY || - abs(maxY-graph->maxY)>abs(graph->maxY)/2 || - abs(maxY-graph->maxY)>abs(graph->maxY)/2 ) { + if (maxY > graph->maxY || minY < graph->minY || fabs(maxY - graph->maxY) > fabs(graph->maxY) / 2 + || fabs(maxY - graph->maxY) > fabs(graph->maxY) / 2) { graph->maxY/=2; graph->minY/=2; graph->maxY=max(graph->maxY,maxY); diff --git a/openair1/SIMULATION/NR_PHY/ulschsim.c b/openair1/SIMULATION/NR_PHY/ulschsim.c index 9b973d2926..69dcbe728a 100644 --- a/openair1/SIMULATION/NR_PHY/ulschsim.c +++ b/openair1/SIMULATION/NR_PHY/ulschsim.c @@ -504,10 +504,6 @@ int main(int argc, char **argv) short channel_output_fixed[16 * 68 * 384]; short channel_output_uncoded[16 * 68 * 384]; unsigned int errors_bit_uncoded = 0; - unsigned int errors_bit = 0; - - unsigned char test_input_bit[16 * 68 * 384]; - unsigned char estimated_output_bit[16 * 68 * 384]; /////////////////////////[adk] preparing UL harq_process parameters///////////////////////// /////////// @@ -626,25 +622,6 @@ int main(int argc, char **argv) if (ret) n_errors++; - - //count errors - errors_bit = 0; - - for (i = 0; i < TBS; i++) { - estimated_output_bit[i] = (ulsch_gNB->harq_process->b[i / 8] & (1 << (i & 7))) >> (i & 7); - test_input_bit[i] = (test_input[i / 8] & (1 << (i & 7))) >> (i & 7); // Further correct for multiple segments - - if (estimated_output_bit[i] != test_input_bit[i]) { - errors_bit++; - } - } -/* - if (errors_bit > 0) { - n_false_positive++; - if (n_trials == 1) - printf("errors_bit %u (trial %d)\n", errors_bit, trial); - } - printf("\n");*/ } printf("*****************************************\n"); diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c index 2804e88cce..9ba14d4f8e 100644 --- a/openair1/SIMULATION/TOOLS/random_channel.c +++ b/openair1/SIMULATION/TOOLS/random_channel.c @@ -359,11 +359,6 @@ static struct complexd R_sqrt_22_EPA_medium[16] = {{0.8375,0.0}, {0.5249,0.0}, { void tdlModel(int tdl_paths, double *tdl_delays, double *tdl_amps_dB, double DS_TDL, channel_desc_t *chan_desc ) { int nb_rx=chan_desc-> nb_rx; int nb_tx=chan_desc-> nb_tx; - int tdl_pathsby3 = tdl_paths/3; - - if ((tdl_paths%3)>0) - tdl_pathsby3++; - chan_desc->nb_taps = tdl_paths; chan_desc->Td = tdl_delays[tdl_paths-1]*DS_TDL; printf("last path (%d) at %f * %e = %e\n",tdl_paths-1,tdl_delays[tdl_paths-1],DS_TDL,chan_desc->Td); diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 26606a9c5c..ea2b9f9543 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -252,8 +252,7 @@ void RCconfig_macrlc(void) int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc) { int num_enbs = 0; int j,k = 0; - int32_t enb_id = 0; - int nb_cc = 0; + int32_t enb_id = 0; int32_t offsetMaxLimit = 0; int32_t cycleNb = 0; @@ -390,9 +389,8 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc) { sprintf(ccspath,"%s.%s.[%i]",enbpath,ENB_CONFIG_STRING_COMPONENT_CARRIERS,j); LOG_I(RRC, "enb_config::RCconfig_RRC() parameter number: %d, total number of parameters: %zd, ccspath: %s \n \n", j, sizeof(CCsParams)/sizeof(paramdef_t), ccspath); config_get( CCsParams,sizeof(CCsParams)/sizeof(paramdef_t),ccspath); - //printf("Component carrier %d\n",component_carrier); - nb_cc++; - // Cell params, MIB/SIB1 + // printf("Component carrier %d\n",component_carrier); + // Cell params, MIB/SIB1 RRCcfg->tdd_config[j] = ccparams_lte.tdd_config; AssertFatal (ccparams_lte.tdd_config <= LTE_TDD_Config__subframeAssignment_sa6, "Failed to parse eNB configuration file %s, enb %u illegal tdd_config %d (should be 0-%d)!", diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c index 300baf4a67..6d5291775c 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c @@ -2591,24 +2591,6 @@ uint32_t nr_get_code_rate_ul(uint8_t Imcs, uint8_t table_idx) { } } -#if 0 -static inline uint8_t get_table_idx(uint8_t mcs_table, uint8_t dci_format, uint8_t rnti_type, uint8_t ss_type) { - if ((mcs_table == NFAPI_NR_MCS_TABLE_QAM256) && (dci_format == NFAPI_NR_DL_DCI_FORMAT_1_1) && ((rnti_type==NFAPI_NR_RNTI_C)||(rnti_type==NFAPI_NR_RNTI_CS))) - return 2; - else if ((mcs_table == NFAPI_NR_MCS_TABLE_QAM64_LOW_SE) && (rnti_type!=NFAPI_NR_RNTI_new) && (rnti_type==NFAPI_NR_RNTI_C) && (ss_type==NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)) - return 3; - else if (rnti_type==NFAPI_NR_RNTI_new) - return 3; - else if ((mcs_table == NFAPI_NR_MCS_TABLE_QAM256) && (rnti_type==NFAPI_NR_RNTI_CS) && (dci_format == NFAPI_NR_DL_DCI_FORMAT_1_1)) - return 2; // Condition mcs_table not configured in sps_config necessary here but not yet implemented - /*else if((mcs_table == NFAPI_NR_MCS_TABLE_QAM64_LOW_SE) && (rnti_type==NFAPI_NR_RNTI_CS)) - * table_idx = 3; - * Note: the commented block refers to the case where the mcs_table is from sps_config*/ - else - return 1; -} -#endif - // Table 5.1.2.2.1-1 38.214 uint8_t getRBGSize(uint16_t bwp_size, long rbg_size_config) { diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c index 18938cd1b9..b3389df86a 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c @@ -40,8 +40,6 @@ #include #include "nfapi_nr_interface.h" -//#define DEBUG_DCI - void fill_dci_search_candidates(const NR_SearchSpace_t *ss, fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15, const uint32_t Y) diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c index 4719c78eea..771c26daa0 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c @@ -158,15 +158,6 @@ static uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac, dci_pdu_rel15_t *dci_pdu_rel15, int slot); -static uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac, - nr_dci_format_t dci_format, - uint8_t dci_size, - uint16_t rnti, - int ss_type, - uint64_t *dci_pdu, - dci_pdu_rel15_t *dci_pdu_rel15, - int slot); - void nr_ue_init_mac(module_id_t module_idP) { LOG_I(NR_MAC, "[UE%d] Applying default macMainConfig\n", module_idP); diff --git a/openair2/LAYER2/rlc_v2/rlc_entity_um.c b/openair2/LAYER2/rlc_v2/rlc_entity_um.c index 54707875a0..06cd8c8cc4 100644 --- a/openair2/LAYER2/rlc_v2/rlc_entity_um.c +++ b/openair2/LAYER2/rlc_v2/rlc_entity_um.c @@ -241,7 +241,6 @@ void rlc_entity_um_recv_pdu(rlc_entity_t *_entity, char *buffer, int size) int data_e; int data_li; - int packet_count; int data_size; int data_start; int indicated_data_size; @@ -277,7 +276,6 @@ void rlc_entity_um_recv_pdu(rlc_entity_t *_entity, char *buffer, int size) return; } - packet_count = 1; /* go to start of data */ indicated_data_size = 0; @@ -292,7 +290,6 @@ void rlc_entity_um_recv_pdu(rlc_entity_t *_entity, char *buffer, int size) return; } indicated_data_size += data_li; - packet_count++; } rlc_pdu_decoder_align(&data_decoder);