clang formatting

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2529,7 +2529,6 @@ uint8_t nr_get_csi_measurements(NR_UE_MAC_INST_t *mac,
 
         const int n_slots_frame = nr_slots_per_frame[scs];
         if (((n_slots_frame*frame + slot - offset)%period) == 0 && pucch_Config) {
-
           LOG_D(NR_MAC, "Preparing CSI report in frame %d slot %d CSI report ID %d\n", frame, slot, csi_report_id);
           NR_PUCCH_CSI_Resource_t *pucchcsires = csirep->reportConfigType.choice.periodic->pucch_CSI_ResourceList.list.array[0];
           NR_PUCCH_ResourceSet_t *pucchresset = pucch_Config->resourceSetToAddModList->list.array[1]; // set with formats >1

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

@@ -217,8 +217,7 @@ void nr_csi_meas_reporting(int Mod_idP,
       if ((sched_frame*n_slots_frame + sched_slot - offset)%period != 0)
         continue;
 
-      AssertFatal(is_xlsch_in_slot(RC.nrmac[Mod_idP]->ulsch_slot_bitmap[sched_slot / 64], sched_slot),
-                  "CSI reporting slot %d is not set for an uplink slot\n", sched_slot);
+      AssertFatal(is_xlsch_in_slot(RC.nrmac[Mod_idP]->ulsch_slot_bitmap[sched_slot / 64], sched_slot), "CSI reporting slot %d is not set for an uplink slot\n", sched_slot);
       LOG_D(NR_MAC, "CSI reporting in frame %d slot %d CSI report ID %ld\n", sched_frame, sched_slot, csirep->reportConfigId);
 
       const NR_PUCCH_ResourceSet_t *pucchresset = pucch_Config->resourceSetToAddModList->list.array[1]; // set with formats >1

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -984,8 +984,7 @@ void fill_initial_SpCellConfig(int uid,
     pucchcsires1->uplinkBandwidthPartId=bwp_id;
     pucchcsires1->pucch_Resource=2;
 
-    if(configuration->do_CSIRS) {
-
+    if (configuration->do_CSIRS) {
       NR_CSI_ResourceConfig_t *csires0 = calloc(1,sizeof(*csires0));
       csires0->csi_ResourceConfigId = bwp_id;
       csires0->csi_RS_ResourceSetList.present = NR_CSI_ResourceConfig__csi_RS_ResourceSetList_PR_nzp_CSI_RS_SSB;
@@ -1000,7 +999,6 @@ void fill_initial_SpCellConfig(int uid,
     }
 
     if (configuration->do_CSIRS && pdsch_AntennaPorts > 1) {
-
       NR_CSI_ResourceConfig_t *csires2 = calloc(1,sizeof(*csires2));
       csires2->csi_ResourceConfigId = bwp_id+10;
       csires2->csi_RS_ResourceSetList.present = NR_CSI_ResourceConfig__csi_RS_ResourceSetList_PR_csi_IM_ResourceSetList;
@@ -1012,21 +1010,9 @@ void fill_initial_SpCellConfig(int uid,
       csires2->resourceType = NR_CSI_ResourceConfig__resourceType_periodic;
       ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ResourceConfigToAddModList->list,csires2);
 
-      config_csi_meas_report(csi_MeasConfig,
-                             scc,
-                             pucchcsires1,
-                             pdsch_Config,
-                             &configuration->pdsch_AntennaPorts,
-                             NR_MAX_SUPPORTED_DL_LAYERS,
-                             bwp_id,
-                             uid);
+      config_csi_meas_report(csi_MeasConfig, scc, pucchcsires1, pdsch_Config, &configuration->pdsch_AntennaPorts, NR_MAX_SUPPORTED_DL_LAYERS, bwp_id, uid);
     }
-    config_rsrp_meas_report(csi_MeasConfig,
-                            scc,
-                            pucchcsires1,
-                            configuration->do_CSIRS,
-                            bwp_id+10,
-                            uid);
+    config_rsrp_meas_report(csi_MeasConfig, scc, pucchcsires1, configuration->do_CSIRS, bwp_id + 10, uid);
   }
   pdsch_servingcellconfig->codeBlockGroupTransmission = NULL;
   pdsch_servingcellconfig->xOverhead = NULL;

openair2/RRC/NR/nr_rrc_config.h

@@ -58,17 +58,12 @@ void set_dl_DataToUL_ACK(NR_PUCCH_Config_t *pucch_Config, int min_feedback_time)
 void set_pucch_power_config(NR_PUCCH_Config_t *pucch_Config, int do_csirs);
 void scheduling_request_config(const NR_ServingCellConfigCommon_t *scc,
                                NR_PUCCH_Config_t *pucch_Config);
-void config_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
-                             const NR_ServingCellConfigCommon_t *servingcellconfigcommon,
-                             NR_PUCCH_CSI_Resource_t *pucchcsires,
-                             int do_csi,
-                             int rep_id,
-                             int uid);
+void config_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, const NR_ServingCellConfigCommon_t *servingcellconfigcommon, NR_PUCCH_CSI_Resource_t *pucchcsires, int do_csi, int rep_id, int uid);
 void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
                             const NR_ServingCellConfigCommon_t *servingcellconfigcommon,
                             NR_PUCCH_CSI_Resource_t *pucchcsires,
                             struct NR_SetupRelease_PDSCH_Config *pdsch_Config,
-                            const rrc_pdsch_AntennaPorts_t* antennaports,
+                            const rrc_pdsch_AntennaPorts_t *antennaports,
                             const int max_layers,
                             int rep_id,
                             int uid);

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -411,21 +411,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
    pucchcsires1->uplinkBandwidthPartId = bwp->bwp_Id;
    pucchcsires1->pucch_Resource=2;
 
-   config_csi_meas_report(csi_MeasConfig,
-                          servingcellconfigcommon,
-                          pucchcsires1,
-                          bwp->bwp_Dedicated->pdsch_Config,
-                          pdschap,
-                          NR_MAX_SUPPORTED_DL_LAYERS,
-                          bwp->bwp_Id,
-                          uid);
-   config_rsrp_meas_report(csi_MeasConfig,
-                           servingcellconfigcommon,
-                           pucchcsires1,
-                           do_csirs,
-                           bwp->bwp_Id+10,
-                           uid);
-
+   config_csi_meas_report(csi_MeasConfig, servingcellconfigcommon, pucchcsires1, bwp->bwp_Dedicated->pdsch_Config, pdschap, NR_MAX_SUPPORTED_DL_LAYERS, bwp->bwp_Id, uid);
+   config_rsrp_meas_report(csi_MeasConfig, servingcellconfigcommon, pucchcsires1, do_csirs, bwp->bwp_Id + 10, uid);
  }
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->sCellDeactivationTimer=NULL;
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->crossCarrierSchedulingConfig=NULL;