using different resource (with different symbol) in case 2 pucch in a slot

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1780,11 +1780,15 @@ void nr_acknack_scheduling(int Mod_idP,
 
 int get_pucch_resource(NR_UE_list_t *UE_list,int UE_id,int k,int l) {
 
-  // to be updated later
-  // for now we are just using resource 0 for acknack pucch
+  // to be updated later, for now simple implementation
   // use the second allocation just in case there is csi in the first
-  if (l==1 && UE_list->UE_sched_ctrl[UE_id].sched_pucch[k][0].csi_bits==0)
-    return -1;
+  // in that case use second resource (for a different symbol) see 9.2 in 38.213
+  if (l==1) {
+    if (UE_list->UE_sched_ctrl[UE_id].sched_pucch[k][0].csi_bits==0)
+      return -1;
+    else
+      return 1;
+  }
   else
     return 0;
 

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -906,7 +906,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  ASN_SEQUENCE_ADD(&pucch_Config->resourceToAddModList->list,pucchres1);
 
  pucchres2->pucch_ResourceId=3;
- pucchres2->startingPRB=32;
+ pucchres2->startingPRB=40;
  pucchres2->intraSlotFrequencyHopping=NULL;
  pucchres2->secondHopPRB=NULL;
  pucchres2->format.present= NR_PUCCH_Resource__format_PR_format2;
@@ -917,7 +917,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  ASN_SEQUENCE_ADD(&pucch_Config->resourceToAddModList->list,pucchres2);
 
  pucchres3->pucch_ResourceId=4;
- pucchres3->startingPRB=32;
+ pucchres3->startingPRB=40;
  pucchres3->intraSlotFrequencyHopping=NULL;
  pucchres3->secondHopPRB=NULL;
  pucchres3->format.present= NR_PUCCH_Resource__format_PR_format2;