Skip to content

O
OpenXG-RAN
Commit ab9d06a4 authored by cucengineer's avatar cucengineer
Browse files
Options

Added config to pdcp and rc

parent 5f199877
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 63 deletions
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @ ab9d06a4
...@@ -1056,29 +1056,25 @@ void nr_DRB_preconfiguration(uint16_t crnti) ...@@ -1056,29 +1056,25 @@ void nr_DRB_preconfiguration(uint16_t crnti)
else{ else{
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, crnti, 0, 0,0); PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, crnti, 0, 0,0);
} }
// nr_rrc_pdcp_config_asn1_req(
nr_rrc_pdcp_config_asn1_req( // &ctxt,
&ctxt, // rbconfig->srb_ToAddModList,
rbconfig->srb_ToAddModList, // rbconfig->drb_ToAddModList ,
rbconfig->drb_ToAddModList , // rbconfig->drb_ToReleaseList,
rbconfig->drb_ToReleaseList, // 0xff,
0xff, // NULL,
NULL, // NULL,
NULL, // NULL,
NULL, // NULL,
NULL, // NULL,
NULL, // Rlc_Bearer_ToAdd_list);
Rlc_Bearer_ToAdd_list);
// nr_rrc_rlc_config_asn1_req (&ctxt,
nr_rrc_rlc_config_asn1_req (&ctxt, // rbconfig->srb_ToAddModList,
rbconfig->srb_ToAddModList, // rbconfig->drb_ToAddModList,
rbconfig->drb_ToAddModList, // rbconfig->drb_ToReleaseList,
rbconfig->drb_ToReleaseList, // (LTE_PMCH_InfoList_r9_t *) NULL,
(LTE_PMCH_InfoList_r9_t *) NULL, // Rlc_Bearer_ToAdd_list);
Rlc_Bearer_ToAdd_list);
LOG_D(PDCP, "%s:%d: done RRC PDCP/RLC ASN1 request for UE rnti %x\n", __FUNCTION__, __LINE__, ctxt.rnti);
} }
uint64_t get_pdcp_optmask(void) uint64_t get_pdcp_optmask(void)
......
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
View file @ ab9d06a4
...@@ -1036,8 +1036,8 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt ...@@ -1036,8 +1036,8 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt
if (srb2add_listP != NULL) { if (srb2add_listP != NULL) {
for (i = 0; i < srb2add_listP->list.count; i++) { for (i = 0; i < srb2add_listP->list.count; i++) {
// add_srb(rnti, srb2add_listP->list.array[i]); add_srb(rnti, srb2add_listP->list.array[i]);
srb_add_drb_am(rnti, drb2add_listP->list.array[0], rlc_bearer2add_list->list.array[0]); // srb_add_drb_am(rnti, drb2add_listP->list.array[0], rlc_bearer2add_list->list.array[0]);
} }
} }
......
openair2/RRC/NR_UE/rrc_UE.c
View file @ ab9d06a4
...@@ -2041,26 +2041,27 @@ nr_sa_rrc_ue_process_radioBearerConfig( ...@@ -2041,26 +2041,27 @@ nr_sa_rrc_ue_process_radioBearerConfig(
derive_key_rrc_int(NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm, derive_key_rrc_int(NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm,
NR_UE_rrc_inst[ctxt_pP->module_id].kgnb, &kRRCint); NR_UE_rrc_inst[ctxt_pP->module_id].kgnb, &kRRCint);
// Refresh SRBs // Refresh SRBs
// nr_rrc_pdcp_config_asn1_req(ctxt_pP, nr_rrc_pdcp_config_asn1_req(ctxt_pP,
// radioBearerConfig->srb_ToAddModList, radioBearerConfig->srb_ToAddModList,
// NULL, NULL,
// NULL, NULL,
// NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm | // NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
// (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4), // (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
// kRRCenc, 0xff,
// kRRCint, kRRCenc,
// NULL, kRRCint,
// NULL, NULL,
// NULL, NULL,
// NULL); NULL,
NULL);
// Refresh SRBs // Refresh SRBs
// nr_rrc_rlc_config_asn1_req(ctxt_pP, nr_rrc_rlc_config_asn1_req(ctxt_pP,
// radioBearerConfig->srb_ToAddModList, radioBearerConfig->srb_ToAddModList,
// NULL, NULL,
// NULL, NULL,
// NULL, NULL,
// NULL NULL
// ); );
for (cnt = 0; cnt < radioBearerConfig->srb_ToAddModList->list.count; cnt++) { for (cnt = 0; cnt < radioBearerConfig->srb_ToAddModList->list.count; cnt++) {
SRB_id = radioBearerConfig->srb_ToAddModList->list.array[cnt]->srb_Identity; SRB_id = radioBearerConfig->srb_ToAddModList->list.array[cnt]->srb_Identity;
...@@ -2115,6 +2116,13 @@ nr_sa_rrc_ue_process_radioBearerConfig( ...@@ -2115,6 +2116,13 @@ nr_sa_rrc_ue_process_radioBearerConfig(
} else { } else {
LOG_D(NR_RRC, "Adding DRB %ld %p\n", DRB_id-1, radioBearerConfig->drb_ToAddModList->list.array[cnt]); LOG_D(NR_RRC, "Adding DRB %ld %p\n", DRB_id-1, radioBearerConfig->drb_ToAddModList->list.array[cnt]);
NR_UE_rrc_inst[ctxt_pP->module_id].DRB_config[gNB_index][DRB_id-1] = radioBearerConfig->drb_ToAddModList->list.array[cnt]; NR_UE_rrc_inst[ctxt_pP->module_id].DRB_config[gNB_index][DRB_id-1] = radioBearerConfig->drb_ToAddModList->list.array[cnt];
nr_rrc_ue_establish_drb(ctxt_pP->module_id,ctxt_pP->frame,gNB_index,radioBearerConfig->drb_ToAddModList->list.array[cnt]);
// MAC/PHY Configuration
LOG_I(RRC, "[FRAME %05d][RRC_UE][MOD %02d][][--- MAC_CONFIG_REQ (DRB %ld eNB %d) --->][MAC_UE][MOD %02d][]\n",
ctxt_pP->frame, ctxt_pP->module_id,
radioBearerConfig->drb_ToAddModList->list.array[cnt]->drb_Identity,
gNB_index,
ctxt_pP->module_id);
} }
} }
...@@ -2133,26 +2141,27 @@ nr_sa_rrc_ue_process_radioBearerConfig( ...@@ -2133,26 +2141,27 @@ nr_sa_rrc_ue_process_radioBearerConfig(
(NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4)); (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4));
// Refresh DRBs // Refresh DRBs
// nr_rrc_pdcp_config_asn1_req(ctxt_pP, nr_rrc_pdcp_config_asn1_req(ctxt_pP,
// NULL, NULL,
// radioBearerConfig->drb_ToAddModList, radioBearerConfig->drb_ToAddModList,
// NULL, NULL,
// NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm | // NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
// (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4), // (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
// NULL, 0xff,
// NULL, NULL,
// kUPenc, NULL,
// NULL, kUPenc,
// NR_UE_rrc_inst[ctxt_pP->module_id].defaultDRB, NULL,
// NULL); NR_UE_rrc_inst[ctxt_pP->module_id].defaultDRB,
NULL);
// Refresh DRBs // Refresh DRBs
// nr_rrc_rlc_config_asn1_req(ctxt_pP, nr_rrc_rlc_config_asn1_req(ctxt_pP,
// NULL, NULL,
// radioBearerConfig->drb_ToAddModList, radioBearerConfig->drb_ToAddModList,
// NULL, NULL,
// NULL, NULL,
// NULL NULL
// ); );
} // drb_ToAddModList } // drb_ToAddModList
if (radioBearerConfig->drb_ToReleaseList != NULL) { if (radioBearerConfig->drb_ToReleaseList != NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment