From 573e7d3a4ae9207543b0fcb1e2422c1410219e7e Mon Sep 17 00:00:00 2001 From: mir Date: Tue, 27 Feb 2024 16:08:31 +0100 Subject: [PATCH] Comments from MR --- openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c | 2 +- openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c | 4 ++-- openair1/PHY/NR_UE_TRANSPORT/sss_nr.c | 6 ++---- openair1/PHY/defs_nr_UE.h | 3 --- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c index 4eac4279a4..61525c6905 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c @@ -116,7 +116,7 @@ int8_t polar_decoder(double *input, } //The index of the last 1-valued bit that appears in each column. - AssertFatal(polarParams->crcParityBits > 0, "UB for VLA"); + AssertFatal(polarParams->crcParityBits > 0, "UB for VLA. crcParityBits negative\n"); uint16_t last1ind[polarParams->crcParityBits]; for (int j=0; jcrcParityBits; j++) { diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c index 8fb8f61ec9..f730bdebe3 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c @@ -698,7 +698,8 @@ void nr_dlsch_deinterleaving(uint8_t symbol, N_bundle = nb_rb_pdsch/L; C=N_bundle/R; - uint32_t *bundle_deint = calloc(N_bundle, sizeof(uint32_t)); + uint32_t bundle_deint[N_bundle]; + memset(bundle_deint, 0 , sizeof(bundle_deint)); printf("N_bundle %u L %d nb_rb_pdsch %d\n",N_bundle, L,nb_rb_pdsch); @@ -726,7 +727,6 @@ void nr_dlsch_deinterleaving(uint8_t symbol, //printf("k %d m %d bundle_deint %d llr_deint %d\n", k, m, bundle_deint[k], llr_deint[bundle_deint[k]*nb_re*L+m]); } } - free(bundle_deint); } //============================================================================================== diff --git a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c index c190eef15b..ac2ae3ac5e 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c +++ b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c @@ -370,10 +370,8 @@ bool rx_sss_nr(PHY_VARS_NR_UE *ue, c16_t rxdataF[][ue->frame_parms.samples_per_slot_wCP]) { uint8_t i; - c16_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR]; - memset(pss_ext, 0, NB_ANTENNAS_RX * LENGTH_SSS_NR * sizeof(c16_t)); - c16_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR]; - memset(sss_ext, 0, NB_ANTENNAS_RX * LENGTH_SSS_NR * sizeof(c16_t)); + c16_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR] = {0}; + c16_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR] = {0}; uint8_t Nid2 = GET_NID2(ue->common_vars.nid2); uint16_t Nid1; uint8_t phase; diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h index aae2338540..969cac85f5 100644 --- a/openair1/PHY/defs_nr_UE.h +++ b/openair1/PHY/defs_nr_UE.h @@ -86,9 +86,6 @@ #define openair_sched_exit() exit(-1) #define bzero(s,n) (memset((s),0,(n))) -//#define cmax(a,b) ((a>b) ? (a) : (b)) -//#define cmin(a,b) ((ac) ? (cmax(a,b)) : (c)) /// suppress compiler warning for unused arguments #define UNUSED(x) (void)x;