Add max_bits to know when PUCCH full

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

@@ -52,6 +52,14 @@ void nr_schedule_pucch(int Mod_idP,
         || slotP != curr_pucch->ul_slot)
       continue;
 
+    AssertFatal(curr_pucch->max_bits > 0,
+                "%d.%d inconsistent PUCCH %d for UE %04x: O_uci = %d but max_bits = 0\n",
+                frameP,
+                slotP,
+                i,
+                UE_info->rnti[UE_id],
+                O_ack + O_csi + O_sr);
+
     nfapi_nr_ul_tti_request_t *future_ul_tti_req =
         &RC.nrmac[Mod_idP]->UL_tti_req_ahead[0][curr_pucch->ul_slot];
     AssertFatal(future_ul_tti_req->SFN == curr_pucch->frame
@@ -221,7 +229,8 @@ void nr_csi_meas_reporting(int Mod_idP,
       // find free PUCCH that is in order with possibly existing PUCCH
       // schedulings (other CSI, SR)
       NR_sched_pucch_t *curr_pucch = &sched_ctrl->sched_pucch[1];
-      AssertFatal(curr_pucch->csi_bits == 0
+      AssertFatal(curr_pucch->max_bits == 0
+                  && curr_pucch->csi_bits == 0
                   && !curr_pucch->sr_flag
                   && curr_pucch->dai_c == 0,
                   "PUCCH not free at index 1 for UE %04x\n",
@@ -231,6 +240,7 @@ void nr_csi_meas_reporting(int Mod_idP,
       curr_pucch->resource_indicator = res_index;
       curr_pucch->csi_bits +=
           nr_get_csi_bitlen(&UE_info->csi_report_template[UE_id][csi_report_id]);
+      curr_pucch->max_bits = curr_pucch->csi_bits;
 
       // going through the list of PUCCH resources to find the one indexed by resource_id
       uint16_t *vrb_map_UL =
@@ -460,6 +470,7 @@ bool nr_acknack_scheduling(int mod_id,
     const int pucch_res = 0;
     curr_pucch->resource_indicator = pucch_res;
     curr_pucch->ul_slot = first_ul_slot_tdd;
+    curr_pucch->max_bits = max_acknacks;
 
     /* verify that at that slot and symbol, resources are free.
      * Note: this does not handle potential mux of PUCCH in the same symbol! */

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -278,6 +278,7 @@ typedef struct NR_sched_pucch {
   int csi_bits;
   bool simultaneous_harqcsi;
   uint8_t dai_c;
+  uint8_t max_bits;
   uint8_t timing_indicator;
   uint8_t resource_indicator;
 } NR_sched_pucch_t;