From e3d13131b4f02084f1420fa1014d6be3544331b9 Mon Sep 17 00:00:00 2001 From: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Thu, 8 Apr 2021 11:00:03 +0200 Subject: [PATCH] fix for last commit (removal on one line in asn1_msg.c) --- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c | 3 +++ openair2/RRC/NR/MESSAGES/asn1_msg.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c index 1ba334da6b..824ee5ced4 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c @@ -1142,6 +1142,7 @@ bool nr_acknack_scheduling(int mod_id, } } + LOG_I(MAC,"1. DL slot %d, UL_ACK %d\n",slot,pucch->ul_slot); /* if the UE's next PUCCH occasion is after the possible UL slots (within the * same frame) or wrapped around to the next frame, then we assume there is * no possible PUCCH allocation anymore */ @@ -1252,6 +1253,8 @@ bool nr_acknack_scheduling(int mod_id, } pucch->timing_indicator = i; // index in the list of timing indicators + LOG_I(MAC,"2. DL slot %d, UL_ACK %d\n",slot,pucch->ul_slot); + pucch->dai_c++; const int pucch_res = pucch_index_used[pucch->ul_slot]; pucch->resource_indicator = pucch_res; diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c index 77cabf454e..c3da2fb031 100644 --- a/openair2/RRC/NR/MESSAGES/asn1_msg.c +++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c @@ -1039,8 +1039,6 @@ void fill_initial_SpCellConfig(rnti_t rnti, schedulingRequestResourceConfig->resource = calloc(1,sizeof(*schedulingRequestResourceConfig->resource)); *schedulingRequestResourceConfig->resource = 0; ASN_SEQUENCE_ADD(&pucch_Config->schedulingRequestResourceToAddModList->list,schedulingRequestResourceConfig); - pucch_Config->dl_DataToUL_ACK = calloc(1,sizeof(*pucch_Config->dl_DataToUL_ACK)); - } void fill_initial_cellGroupConfig(rnti_t rnti, -- 2.26.2