Rename NR_sched_pucch to NR_sched_pucch_t

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -595,7 +595,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
 
     const int current_harq_pid = slot % num_slots_per_tdd;
     NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
-    NR_sched_pucch *pucch = &sched_ctrl->sched_pucch[sched_ctrl->pucch_sched_idx][sched_ctrl->pucch_occ_idx];
+    NR_sched_pucch_t *pucch = &sched_ctrl->sched_pucch[sched_ctrl->pucch_sched_idx][sched_ctrl->pucch_occ_idx];
     harq->feedback_slot = pucch->ul_slot;
     harq->is_waiting = 1;
     UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -507,7 +507,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
                           rnti_t rnti,
                           NR_CellGroupConfig_t *secondaryCellGroup,
                           NR_UE_sched_ctrl_t *sched_ctrl,
-                          NR_sched_pucch *pucch_sched,
+                          NR_sched_pucch_t *pucch_sched,
                           nfapi_nr_dmrs_type_e dmrsConfigType,
                           uint16_t R,
                           uint8_t Qm,
@@ -1894,15 +1894,15 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP){
     UE_info->UE_sched_ctrl[UE_id].ul_rssi = 0;
     /* set illegal time domain allocation to force recomputation of all fields */
     UE_info->UE_sched_ctrl[UE_id].pusch_save.time_domain_allocation = -1;
-    UE_info->UE_sched_ctrl[UE_id].sched_pucch = (NR_sched_pucch **)malloc(num_slots_ul*sizeof(NR_sched_pucch *));
+    UE_info->UE_sched_ctrl[UE_id].sched_pucch = (NR_sched_pucch_t **)malloc(num_slots_ul*sizeof(NR_sched_pucch_t *));
     for (int s=0; s<num_slots_ul;s++)
-      UE_info->UE_sched_ctrl[UE_id].sched_pucch[s] = (NR_sched_pucch *)malloc(2*sizeof(NR_sched_pucch));
+      UE_info->UE_sched_ctrl[UE_id].sched_pucch[s] = (NR_sched_pucch_t *)malloc(2*sizeof(NR_sched_pucch_t));
 
     for (int k=0; k<num_slots_ul; k++) {
       for (int l=0; l<2; l++)
         memset((void *) &UE_info->UE_sched_ctrl[UE_id].sched_pucch[k][l],
                0,
-               sizeof(NR_sched_pucch));
+               sizeof(NR_sched_pucch_t));
     }
     LOG_I(MAC, "gNB %d] Add NR UE_id %d : rnti %x\n",
           mod_idP,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

@@ -44,7 +44,7 @@ void nr_schedule_pucch(int Mod_idP,
 
   for (int k=0; k<nr_ulmix_slots; k++) {
     for (int l=0; l<2; l++) {
-      NR_sched_pucch *curr_pucch = &UE_info->UE_sched_ctrl[UE_id].sched_pucch[k][l];
+      NR_sched_pucch_t *curr_pucch = &UE_info->UE_sched_ctrl[UE_id].sched_pucch[k][l];
       const uint16_t O_ack = curr_pucch->dai_c;
       const uint16_t O_csi = curr_pucch->csi_bits;
       const uint8_t O_sr = 0; // no SR in PUCCH implemented for now
@@ -91,7 +91,7 @@ void nr_schedule_pucch(int Mod_idP,
 
       memset(&UE_info->UE_sched_ctrl[UE_id].sched_pucch[k][l],
              0,
-             sizeof(NR_sched_pucch));
+             sizeof(NR_sched_pucch_t));
     }
   }
 }
@@ -198,7 +198,7 @@ void nr_csi_meas_reporting(int Mod_idP,
                            int n_slots_frame) {
 
   NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
-  NR_sched_pucch *curr_pucch;
+  NR_sched_pucch_t *curr_pucch;
   NR_PUCCH_ResourceSet_t *pucchresset;
   NR_CSI_ReportConfig_t *csirep;
   NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
@@ -418,7 +418,7 @@ void nr_acknack_scheduling(int Mod_idP,
 
   NR_ServingCellConfigCommon_t *scc = RC.nrmac[Mod_idP]->common_channels->ServingCellConfigCommon;
   NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
-  NR_sched_pucch *curr_pucch;
+  NR_sched_pucch_t *curr_pucch;
   int max_acknacks,pucch_res,first_ul_slot_tdd,k,i,l;
   uint8_t pdsch_to_harq_feedback[8];
   int found = 0;

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -178,7 +178,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_id,
                           rnti_t rnti,
                           NR_CellGroupConfig_t *secondaryCellGroup,
                           NR_UE_sched_ctrl_t *sched_ctrl,
-                          NR_sched_pucch *pucch_sched,
+                          NR_sched_pucch_t *pucch_sched,
                           nfapi_nr_dmrs_type_e dmrsConfigType,
                           uint16_t R,
                           uint8_t Qm,

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -282,7 +282,7 @@ typedef struct NR_sched_pucch {
   uint8_t dai_c;
   uint8_t timing_indicator;
   uint8_t resource_indicator;
-} NR_sched_pucch;
+} NR_sched_pucch_t;
 
 /* this struct is a helper: as long as the TDA and DCI format remain the same
  * over the same uBWP and search space, there is no need to recalculate all
@@ -387,7 +387,7 @@ typedef struct {
   /// the currently active BWP in UL
   NR_BWP_Uplink_t *active_ubwp;
 
-  NR_sched_pucch **sched_pucch;
+  NR_sched_pucch_t **sched_pucch;
   /// selected PUCCH index, if scheduled
   int pucch_sched_idx;
   int pucch_occ_idx;