maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed LOG_As and logic in NR_Cap filling

Browse Source
This commit is contained in:
Melissa Elkadi
2021-05-25 15:50:54 -07:00
parent 005c2e0121
commit f3c2a2a659
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LTE/rrc_UE.c
+13 -13
View File
@@ -1771,8 +1771,10 @@ rrc_ue_process_nrueCapabilityEnquiry(
enc_rval_nr.failed_type->name, enc_rval_nr.encoded); enc_rval_nr.failed_type->name, enc_rval_nr.encoded);
enc_rval.encoded = enc_rval.encoded + enc_rval_nr.encoded; enc_rval.encoded = enc_rval.encoded + enc_rval_nr.encoded;
xer_fprint(stdout, &asn_DEF_LTE_UL_DCCH_Message, (void *)&ul_dcch_msg); xer_fprint(stdout, &asn_DEF_LTE_UL_DCCH_Message, (void *)&ul_dcch_msg);
LOG_A(RRC, "%s: NR_UECapInfo LTE_RAT_Type_nr Encoded %zd bits (%zd bytes)\n",
__FUNCTION__, enc_rval.encoded, (enc_rval.encoded+7)/8);
} }
if (*cap_req->list.array[i] == LTE_RAT_Type_eutra_nr) { else if (*cap_req->list.array[i] == LTE_RAT_Type_eutra_nr) {
ASN_SEQUENCE_ADD(&ue_cap->criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list, ASN_SEQUENCE_ADD(&ue_cap->criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list,
&ue_CapabilityRAT_Container_mrdc); &ue_CapabilityRAT_Container_mrdc);
ue_cap->criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.array[i]->rat_Type = LTE_RAT_Type_eutra_nr; ue_cap->criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.array[i]->rat_Type = LTE_RAT_Type_eutra_nr;
@@ -1781,19 +1783,17 @@ rrc_ue_process_nrueCapabilityEnquiry(
enc_rval_eutra_nr.failed_type->name, enc_rval_eutra_nr.encoded); enc_rval_eutra_nr.failed_type->name, enc_rval_eutra_nr.encoded);
enc_rval.encoded = enc_rval.encoded + enc_rval_eutra_nr.encoded; enc_rval.encoded = enc_rval.encoded + enc_rval_eutra_nr.encoded;
xer_fprint(stdout, &asn_DEF_LTE_UL_DCCH_Message, (void *)&ul_dcch_msg); xer_fprint(stdout, &asn_DEF_LTE_UL_DCCH_Message, (void *)&ul_dcch_msg);
LOG_A(RRC, "%s: NR_UECapInfo LTE_RAT_Type_eutra_nr Encoded %zd bits (%zd bytes)\n",
__FUNCTION__, enc_rval.encoded, (enc_rval.encoded+7)/8);
} }
if (enc_rval.encoded > 0) { rrc_data_req_ue (
LOG_A(RRC, "%s: NR_UECapabilityInformation Encoded %zd bits (%zd bytes)\n", ctxt_pP,
__FUNCTION__, enc_rval.encoded, (enc_rval.encoded+7)/8); DCCH,
rrc_data_req_ue ( rrc_mui++,
ctxt_pP, SDU_CONFIRM_NO,
DCCH, (enc_rval.encoded + 7) / 8,
rrc_mui++, buffer,
SDU_CONFIRM_NO, PDCP_TRANSMISSION_MODE_CONTROL);
(enc_rval.encoded + 7) / 8,
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
}
} }
} }
openair2/RRC/NR/rrc_gNB.c
+2 -2
View File
@@ -339,8 +339,8 @@ void rrc_gNB_process_AdditionRequestInformation(const module_id_t gnb_mod_idP, x
AssertFatal(cg_configinfo->criticalExtensions.choice.c1->present == NR_CG_ConfigInfo__criticalExtensions__c1_PR_cg_ConfigInfo, AssertFatal(cg_configinfo->criticalExtensions.choice.c1->present == NR_CG_ConfigInfo__criticalExtensions__c1_PR_cg_ConfigInfo,
"ueCapabilityInformation not present\n"); "ueCapabilityInformation not present\n");
parse_CG_ConfigInfo(rrc,cg_configinfo,m); parse_CG_ConfigInfo(rrc,cg_configinfo,m);
LOG_A(NR_RRC, "[UE %d] Successfully parsed CG_ConfigInfo of size %zu bits. (%zu bytes)\n", LOG_A(NR_RRC, "Successfully parsed CG_ConfigInfo of size %zu bits. (%zu bytes)\n",
m->rnti, dec_rval.consumed, (dec_rval.consumed +7/8)); dec_rval.consumed, (dec_rval.consumed +7/8));
} }
openair2/RRC/NR/rrc_gNB_nsa.c
+1 -1
View File
@@ -124,7 +124,7 @@ void rrc_parse_ue_capabilities(gNB_RRC_INST *rrc, NR_UE_CapabilityRAT_ContainerL
if ( LOG_DEBUGFLAG(DEBUG_ASN1) && ueCapabilityRAT_Container_MRDC != NULL ) { if ( LOG_DEBUGFLAG(DEBUG_ASN1) && ueCapabilityRAT_Container_MRDC != NULL ) {
xer_fprint(stdout, &asn_DEF_NR_UE_MRDC_Capability, ue_context_p->ue_context.UE_Capability_MRDC); xer_fprint(stdout, &asn_DEF_NR_UE_MRDC_Capability, ue_context_p->ue_context.UE_Capability_MRDC);
} }
LOG_A(RRC, "Successfully decoded UE NR capabilities for RNTI %d (NR and MRDC)\n", ue_context_p->ue_id_rnti); LOG_A(NR_RRC, "Successfully decoded UE NR capabilities (NR and MRDC)\n");
rrc_add_nsa_user(rrc,ue_context_p, m); rrc_add_nsa_user(rrc,ue_context_p, m);
} }