removing min_fb_time from acknack scheduling

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2097,7 +2097,6 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
                                 int bwp_id,
                                 NR_SearchSpace__searchSpaceType_PR ss_type,
                                 int *max_fb_time,
-                                int *min_fb_time,
                                 uint8_t *pdsch_to_harq_feedback) {
 
   NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
@@ -2136,10 +2135,9 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
   // common search type uses DCI format 1_0
   if (ss_type == NR_SearchSpace__searchSpaceType_PR_common) {
     for (int i=0; i<8; i++) {
-      pdsch_to_harq_feedback[i] = i+1; // TODO take into account the min feedback time here
+      pdsch_to_harq_feedback[i] = i+1;
       if(pdsch_to_harq_feedback[i]>*max_fb_time)
         *max_fb_time = pdsch_to_harq_feedback[i];
-      *min_fb_time = 6;
     }
   }
   else {
@@ -2162,10 +2160,10 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
 
     if (ss->searchSpaceType->choice.ue_Specific->dci_Formats == NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_0_And_1_0) {
       for (int i=0; i<8; i++) {
-        pdsch_to_harq_feedback[i] = i+1; // TODO take into account the min feedback time here
+        pdsch_to_harq_feedback[i] = i+1;
         if(pdsch_to_harq_feedback[i]>*max_fb_time)
           *max_fb_time = pdsch_to_harq_feedback[i];
-        *min_fb_time = 6;
+
       }
     }
     else {
@@ -2175,8 +2173,6 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
           pdsch_to_harq_feedback[i] = *ubwpd->pucch_Config->choice.setup->dl_DataToUL_ACK->list.array[i];
           if(pdsch_to_harq_feedback[i]>*max_fb_time)
             *max_fb_time = pdsch_to_harq_feedback[i];
-          if(pdsch_to_harq_feedback[i]<*min_fb_time)
-            *min_fb_time = pdsch_to_harq_feedback[i];
         }
       }
       else

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

@@ -1257,8 +1257,7 @@ int nr_acknack_scheduling(int mod_id,
   if (sched_ctrl->active_ubwp) bwp_Id = sched_ctrl->active_ubwp->bwp_Id;
 
   int max_fb_time = 0;
-  int min_fb_time = 6;
-  get_pdsch_to_harq_feedback(mod_id, UE_id, bwp_Id, ss_type, &max_fb_time, &min_fb_time, pdsch_to_harq_feedback);
+  get_pdsch_to_harq_feedback(mod_id, UE_id, bwp_Id, ss_type, &max_fb_time, pdsch_to_harq_feedback);
   int max_absslot = frame*n_slots_frame + slot + max_fb_time;
 
   LOG_D(NR_MAC, "In %s: 1b. DL %d.%d, UL_ACK %d.%d, DAI_C %d\n", __FUNCTION__, frame,slot,pucch->frame,pucch->ul_slot,pucch->dai_c);
@@ -1304,7 +1303,7 @@ int nr_acknack_scheduling(int mod_id,
                 "expected no SR/AckNack for UE %d in %4d.%2d, but has %d/%d for %4d.%2d\n",
                 UE_id, frame, slot, pucch->sr_flag, pucch->dai_c, pucch->frame, pucch->ul_slot);
     pucch->frame = frame;
-    pucch->ul_slot = tdd ? first_ul_slot_tdd : first_ul_slot_tdd + min_fb_time;
+    pucch->ul_slot = first_ul_slot_tdd;
   }
 
   // Find the right timing_indicator value.

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -213,7 +213,6 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
                                 int bwp_id,
                                 NR_SearchSpace__searchSpaceType_PR ss_type,
                                 int *max_fb_time,
-                                int *min_fb_time,
                                 uint8_t *pdsch_to_harq_feedback);
   
 void nr_configure_css_dci_initial(nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,