From c7a0c41191215d3a5771cc4724a2d8c2a3912074 Mon Sep 17 00:00:00 2001 From: Ahmed Hussein Date: Tue, 21 May 2019 16:00:32 +0200 Subject: [PATCH] removing "G" from "NR_UL_gNB_HARQ_t" and some printf's in "nr_ulsch_decoding" --- openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c | 9 ++++----- openair1/PHY/defs_gNB.h | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c index 30f5146082..6ca2733120 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c +++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c @@ -233,7 +233,6 @@ void clean_gNB_ulsch(NR_gNB_ULSCH_t *ulsch) /// code blocks after bit selection in rate matching for LDPC code (38.212 V15.4.0 section 5.4.2.1) //int16_t e[MAX_NUM_NR_DLSCH_SEGMENTS][3*8448]; ulsch->harq_processes[i]->E=0; - ulsch->harq_processes[i]->G=0; ulsch->harq_processes[i]->n_DMRS=0; @@ -346,7 +345,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB, ret = ulsch->max_ldpc_iterations; G = nr_get_G(nb_rb, number_symbols, nb_re_dmrs, length_dmrs, Qm, n_layers); - + // G = 0; // G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs, nfapi_ulsch_pdu_rel15->Qm, nfapi_ulsch_pdu_rel15->n_layers); LOG_I(PHY,"ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_symb_sch %d nb_rb %d\n",harq_pid,A,G, mcs, n_layers, nb_symb_sch,nb_rb); @@ -585,10 +584,10 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB, p_procTime); if (check_crc((uint8_t*)llrProcBuf,length_dec,harq_process->F,crc_type)) { - printf("Segment %d CRC OK\n",r); + LOG_I(PHY, "Segment %d CRC OK\n",r); ret = 2; } else { - printf("CRC NOK\n"); + LOG_I(PHY, "CRC NOK\n"); ret = 1+ulsch->max_ldpc_iterations; } @@ -598,7 +597,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB, } ret=no_iteration_ldpc; - + for (int m=0; m < Kr>>3; m ++) { harq_process->c[r][m]= (uint8_t) llrProcBuf[m]; } diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index 7f6dd2fe6e..decb1a04bd 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -234,8 +234,6 @@ typedef struct { int16_t e[MAX_NUM_NR_DLSCH_SEGMENTS][3*8448]; /// Number of bits in each code block after rate matching for LDPC code (38.212 V15.4.0 section 5.4.2.1) uint32_t E; - /// Number of soft channel bits after code block concatenation (38.212 V15.4.0 section 5.5) - uint32_t G; //////////////////////////////////////////////////////////////