Accounting for wrap in slot comparison in gNB

executables/nr-ue.c

@@ -458,7 +458,10 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
     mac->dl_info.dci_ind = NULL;
     mac->dl_info.rx_ind = NULL;
 
-    nr_ue_dl_indication(&mac->dl_info, &ul_time_alignment);
+    if (is_nr_DL_slot(mac->scc->tdd_UL_DL_ConfigurationCommon, ul_info.slot_rx))
+    {
+      nr_ue_dl_indication(&mac->dl_info, &ul_time_alignment);
+    }
 
     if (pthread_mutex_unlock(&mac->mutex_dl_info)) abort();
 

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -434,7 +434,6 @@ typedef struct {
   // Defined for abstracted mode
   nr_downlink_indication_t dl_info;
   NR_UE_HARQ_STATUS_t dl_harq_info[16];
-
   bool expected_dci;
   bool index_has_dci[16];
   int active_harq_sfn_slot;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

@@ -1268,7 +1268,7 @@ int nr_acknack_scheduling(int mod_id,
     // Find the right timing_indicator value.
     int i = 0;
     while (i < 8) {
-      if (pdsch_to_harq_feedback[i] == pucch->ul_slot - slot)
+      if (pdsch_to_harq_feedback[i] == (pucch->ul_slot - slot) % n_slots_frame)
         break;
       ++i;
     }
@@ -1315,7 +1315,7 @@ int nr_acknack_scheduling(int mod_id,
     while (i < 8) {
       LOG_D(NR_MAC,"pdsch_to_harq_feedback[%d] = %d (pucch->ul_slot %d - slot %d)\n",
             i,pdsch_to_harq_feedback[i],pucch->ul_slot,slot);
-      if (pdsch_to_harq_feedback[i] == pucch->ul_slot - slot) {
+      if (pdsch_to_harq_feedback[i] == (pucch->ul_slot - slot) % n_slots_frame) {
         ind_found = i;
         break;
       }