Skip to content

O
OpenXG-RAN
Commit ff348384 authored by rmagueta's avatar rmagueta
Browse files
Options

Put back scheduling request configuration after the cherry-pick which solved the segfault

parent a58fd73e
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 23 deletions
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @ ff348384
...@@ -1167,9 +1167,6 @@ void fill_initial_SpCellConfig(rnti_t rnti, ...@@ -1167,9 +1167,6 @@ void fill_initial_SpCellConfig(rnti_t rnti,
srs_res0->spatialRelationInfo->referenceSignal.choice.csi_RS_Index=0; srs_res0->spatialRelationInfo->referenceSignal.choice.csi_RS_Index=0;
ASN_SEQUENCE_ADD(&srs_Config->srs_ResourceToAddModList->list,srs_res0); ASN_SEQUENCE_ADD(&srs_Config->srs_ResourceToAddModList->list,srs_res0);
if (0) {
// configure Scheduling request // configure Scheduling request
// 40 slot period // 40 slot period
pucch_Config->schedulingRequestResourceToAddModList = calloc(1,sizeof(*pucch_Config->schedulingRequestResourceToAddModList)); pucch_Config->schedulingRequestResourceToAddModList = calloc(1,sizeof(*pucch_Config->schedulingRequestResourceToAddModList));
...@@ -1191,7 +1188,7 @@ void fill_initial_SpCellConfig(rnti_t rnti, ...@@ -1191,7 +1188,7 @@ void fill_initial_SpCellConfig(rnti_t rnti,
schedulingRequestResourceConfig->resource = calloc(1,sizeof(*schedulingRequestResourceConfig->resource)); schedulingRequestResourceConfig->resource = calloc(1,sizeof(*schedulingRequestResourceConfig->resource));
*schedulingRequestResourceConfig->resource = 0; *schedulingRequestResourceConfig->resource = 0;
ASN_SEQUENCE_ADD(&pucch_Config->schedulingRequestResourceToAddModList->list,schedulingRequestResourceConfig); ASN_SEQUENCE_ADD(&pucch_Config->schedulingRequestResourceToAddModList->list,schedulingRequestResourceConfig);
}
pucch_Config->dl_DataToUL_ACK = calloc(1,sizeof(*pucch_Config->dl_DataToUL_ACK)); pucch_Config->dl_DataToUL_ACK = calloc(1,sizeof(*pucch_Config->dl_DataToUL_ACK));
long *delay[8]; long *delay[8];
for (int i=0;i<8;i++) { for (int i=0;i<8;i++) {
......
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