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

fix for last commit (removal on one line in asn1_msg.c)

Browse Source
This commit is contained in:
Raymond Knopp
2021-04-08 11:00:03 +02:00
parent 60e0048c29
commit e3d13131b4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+3
View File
@@ -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 /* 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 * same frame) or wrapped around to the next frame, then we assume there is
* no possible PUCCH allocation anymore */ * 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 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++; pucch->dai_c++;
const int pucch_res = pucch_index_used[pucch->ul_slot]; const int pucch_res = pucch_index_used[pucch->ul_slot];
pucch->resource_indicator = pucch_res; pucch->resource_indicator = pucch_res;
openair2/RRC/NR/MESSAGES/asn1_msg.c
-2
View File
@@ -1039,8 +1039,6 @@ 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));
} }
void fill_initial_cellGroupConfig(rnti_t rnti, void fill_initial_cellGroupConfig(rnti_t rnti,