From 9586db6bfd3626e71b76752498190d40b9fd88c7 Mon Sep 17 00:00:00 2001 From: Romain Beurdouche Date: Fri, 3 Jan 2025 13:11:46 +0000 Subject: [PATCH] fix(nrLDPC_decoder): Rename E in Kprime in segment decoder parameters to comply with standard naming --- openair1/PHY/CODING/TESTBENCH/ldpctest.c | 2 +- .../nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c | 2 +- openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c | 2 +- openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h | 2 +- openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openair1/PHY/CODING/TESTBENCH/ldpctest.c b/openair1/PHY/CODING/TESTBENCH/ldpctest.c index 1dad28c95e..1d0bdfb16b 100644 --- a/openair1/PHY/CODING/TESTBENCH/ldpctest.c +++ b/openair1/PHY/CODING/TESTBENCH/ldpctest.c @@ -323,7 +323,7 @@ one_measurement_t test_ldpc(short max_iterations, decParams[j].R = code_rate_vec[R_ind]; // 13; decParams[j].numMaxIter = max_iterations; decParams[j].outMode = nrLDPC_outMode_BIT; - decParams[j].E = block_length; + decParams[j].Kprime = block_length; ldpc_toCompare.LDPCinit(); } for (int j = 0; j < n_segments; j++) { diff --git a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c index e1fec76e23..29d155e95c 100644 --- a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c +++ b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c @@ -193,7 +193,7 @@ static void nr_process_decode_segment(void *arg) memset(rdata->c, 0, Kr_bytes); p_decoderParms->crc_type = crcType(rdata->C, A); - p_decoderParms->E = lenWithCrc(rdata->C, A); + p_decoderParms->Kprime = lenWithCrc(rdata->C, A); // set first 2*Z_c bits to zeros diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c index 4ac8f4799e..fcee71c151 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c @@ -855,7 +855,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, nrLDPC_llr2bitPacked(p_out, p_llrOut, numLLR); else // if (outMode == nrLDPC_outMode_BITINT8) nrLDPC_llr2bit(p_out, p_llrOut, numLLR); - if (p_decParams->check_crc((uint8_t*)p_out, p_decParams->E, p_decParams->crc_type)) { + if (p_decParams->check_crc((uint8_t*)p_out, p_decParams->Kprime, p_decParams->crc_type)) { LOG_D(PHY, "Segment CRC OK, exiting LDPC decoder\n"); break; } diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h index 25e78a542a..57701ce7df 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h @@ -86,7 +86,7 @@ typedef struct nrLDPC_dec_params { uint16_t Z; /**< Lifting size */ uint8_t R; /**< Decoding rate: Format 15,13,... for code rates 1/5, 1/3,... */ uint8_t numMaxIter; /**< Maximum number of iterations */ - int E; + int Kprime; /**< Size of the payload bits and CRC bits in the code block */ e_nrLDPC_outMode outMode; /**< Output format */ int crc_type; int (*check_crc)(uint8_t* decoded_bytes, uint32_t n, uint8_t crc_type); diff --git a/openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu b/openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu index ee08e9287c..aa85716947 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu +++ b/openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu @@ -518,7 +518,7 @@ extern "C" int32_t LDPCdecoder(t_nrLDPC_dec_params *p_decParams, init_LLR_DMA(p_decParams, p_llr, p_out); uint16_t Zc = p_decParams->Z; uint8_t BG = p_decParams->BG; - int block_length = p_decParams->E; + int block_length = p_decParams->Kprime; uint8_t row, col; if (BG == 1) { row = 46;