Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements

2022-02-02 18:13:46 +01:00
parent 10da153332 b65f31a3fa
commit 2408f82ace
61 changed files with 1918 additions and 257 deletions
@@ -55,6 +55,7 @@
 #include <errno.h>
 #include <string.h>

+const uint8_t nr_rv_round_map[4] = { 0, 2, 3, 1 };
 uint16_t nr_pdcch_order_table[6] = { 31, 31, 511, 2047, 2047, 8191 };

 uint8_t vnf_first_sched_entry = 1;
@@ -53,7 +53,6 @@
 //#define UL_HARQ_PRINT
 extern RAN_CONTEXT_t RC;

-const uint8_t nr_rv_round_map[4] = {0, 2, 3, 1};
 //#define ENABLE_MAC_PAYLOAD_DEBUG 1

 //uint8_t mac_pdu[MAX_NR_DLSCH_PAYLOAD_BYTES];
@@ -2180,7 +2180,8 @@ nr_rrc_ue_establish_srb2(
                                    NULL,
                                    radioBearerConfig->drb_ToAddModList,
                                    NULL,
-                                    0,
+                                    NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm
+                                      | (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
                                    NULL,
                                    NULL,
                                    kUPenc,