Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
Conflicts: cmake_targets/CMakeLists.txt cmake_targets/autotests/test_case_list.xml cmake_targets/build_oai openair1/PHY/CODING/TESTBENCH/polartest.c openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c openair1/PHY/CODING/nr_polar_init.c openair1/SCHED_NR_UE/phy_procedures_nr_ue.c openair1/SCHED_NR_UE/pucch_uci_ue_nr.c openair1/SIMULATION/NR_PHY/dlschsim.c openair1/SIMULATION/NR_PHY/dlsim.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
|
||||
|
||||
#include "coding_defs.h"
|
||||
#include "assertions.h"
|
||||
|
||||
/*ref 36-212 v8.6.0 , pp 8-9 */
|
||||
/* the highest degree is set by default */
|
||||
@@ -275,7 +276,7 @@ int check_crc(uint8_t* decoded_bytes, uint32_t n, uint32_t F, uint8_t crc_type)
|
||||
break;
|
||||
|
||||
default:
|
||||
crc_len=3;
|
||||
AssertFatal(1,"Invalid crc_type \n");
|
||||
}
|
||||
|
||||
for (int i=0; i<crc_len; i++)
|
||||
@@ -309,6 +310,9 @@ int check_crc(uint8_t* decoded_bytes, uint32_t n, uint32_t F, uint8_t crc_type)
|
||||
crc = crc8(decoded_bytes,
|
||||
n-8)>>24;
|
||||
break;
|
||||
|
||||
default:
|
||||
AssertFatal(1,"Invalid crc_type \n");
|
||||
}
|
||||
|
||||
if (crc == oldcrc)
|
||||
|
||||
Reference in New Issue
Block a user