noS1: Introduce NR DRB preconfiguration and PDCP RLC configuration triggering

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -873,7 +873,8 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt
     const NR_DRB_ToAddModList_t   * const drb2add_listP,
     const NR_DRB_ToReleaseList_t  * const drb2release_listP,
     const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
-    NR_CellGroupConfig_t *SCell_GroupConfig)
+    struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list)
+    //NR_CellGroupConfig_t *SCell_GroupConfig)
 {
   int rnti = ctxt_pP->rnti;
   int i;
@@ -905,7 +906,7 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt
 
   if (drb2add_listP != NULL) {
     for (i = 0; i < drb2add_listP->list.count; i++) {
-      add_drb(rnti, drb2add_listP->list.array[i], SCell_GroupConfig->rlc_BearerToAddModList->list.array[i]);
+      add_drb(rnti, drb2add_listP->list.array[i], rlc_bearer2add_list->list.array[i]);
     }
   }
 

openair2/RRC/NR/rrc_gNB_nsa.c

@@ -279,7 +279,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
       ue_context_p->ue_context.rb_config->drb_ToAddModList,
       ue_context_p->ue_context.rb_config->drb_ToReleaseList,
       (LTE_PMCH_InfoList_r9_t *) NULL,
-      ue_context_p->ue_context.secondaryCellGroup);
+      ue_context_p->ue_context.secondaryCellGroup->rlc_BearerToAddModList);
 
 }