Applied clang formatting

executables/nr-ru.c

@@ -777,8 +777,13 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
   void *txp[ru->nb_tx];
   unsigned int txs;
   int i;
-  T(T_ENB_PHY_OUTPUT_SIGNAL, T_INT(0), T_INT(0), T_INT(frame), T_INT(slot),
-    T_INT(0), T_BUFFER(&ru->common.txdata[0][fp->get_samples_slot_timestamp(slot,fp,0)], fp->get_samples_per_slot(slot,fp) * 4));
+  T(T_ENB_PHY_OUTPUT_SIGNAL,
+    T_INT(0),
+    T_INT(0),
+    T_INT(frame),
+    T_INT(slot),
+    T_INT(0),
+    T_BUFFER(&ru->common.txdata[0][fp->get_samples_slot_timestamp(slot, fp, 0)], fp->get_samples_per_slot(slot, fp) * 4));
   int sf_extension = 0;
   int siglen=fp->get_samples_per_slot(slot,fp);
   radio_tx_burst_flag_t flags_burst = TX_BURST_INVALID;

executables/nr-softmodem-common.h

@@ -88,8 +88,8 @@
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
 #define CONFIG_HLP_DISABLETIMECORR "disable UE timing correction\n"
 #define CONFIG_HLP_RRC_CFG_PATH  "path for RRC configuration\n"
-#define CONFIG_HLP_RE_CFG_FILE   "filename for reconfig.raw in phy-test mode\n"
-#define CONFIG_HLP_RB_CFG_FILE   "filename for rbconfig.raw in phy-test mode\n"
+#define CONFIG_HLP_RE_CFG_FILE "filename for reconfig.raw in phy-test mode\n"
+#define CONFIG_HLP_RB_CFG_FILE "filename for rbconfig.raw in phy-test mode\n"
 #define CONFIG_HLP_UECAP_FILE    "path for UE Capabilities file\n"
 
 #define CONFIG_HLP_NUMEROLOGY    "adding numerology for 5G\n"

executables/nr-ue.c

@@ -944,17 +944,14 @@ void *UE_thread(void *arg)
   return NULL;
 }
 
-void init_NR_UE(int nb_inst,
-                char* uecap_file,
-                char* rrc_config_path, 
-                char* reconfig_file, 
-                char* rbconfig_file) {
+void init_NR_UE(int nb_inst, char *uecap_file, char *rrc_config_path, char *reconfig_file, char *rbconfig_file)
+{
   int inst;
   NR_UE_MAC_INST_t *mac_inst;
   NR_UE_RRC_INST_t* rrc_inst;
   
   for (inst=0; inst < nb_inst; inst++) {
-    AssertFatal((rrc_inst = nr_l3_init_ue(uecap_file,rrc_config_path, reconfig_file, rbconfig_file)) != NULL, "can not initialize RRC module\n");
+    AssertFatal((rrc_inst = nr_l3_init_ue(uecap_file, rrc_config_path, reconfig_file, rbconfig_file)) != NULL, "can not initialize RRC module\n");
     AssertFatal((mac_inst = nr_l2_init_ue(rrc_inst)) != NULL, "can not initialize L2 module\n");
     AssertFatal((mac_inst->if_module = nr_ue_if_module_init(inst)) != NULL, "can not initialize IF module\n");
   }

executables/nr-uesoftmodem.c

@@ -123,8 +123,8 @@ char             *usrp_args = NULL;
 char             *tx_subdev = NULL;
 char             *rx_subdev = NULL;
 char       *rrc_config_path = NULL;
-char         *reconfig_file = NULL;
-char         *rbconfig_file = NULL;
+char *reconfig_file = NULL;
+char *rbconfig_file = NULL;
 char            *uecap_file = NULL;
 int               dumpframe = 0;
 
@@ -474,7 +474,7 @@ int main( int argc, char **argv ) {
 #endif
   LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
 
-  init_NR_UE(1,uecap_file,rrc_config_path,reconfig_file,rbconfig_file);
+  init_NR_UE(1, uecap_file, rrc_config_path, reconfig_file, rbconfig_file);
 
   int mode_offset = get_softmodem_params()->nsa ? NUMBER_OF_UE_MAX : 1;
   uint16_t node_number = get_softmodem_params()->node_number;

executables/nr-uesoftmodem.h

@@ -93,7 +93,7 @@ extern nrUE_params_t *get_nrUE_params(void);
 // In nr-ue.c
 extern int setup_nr_ue_buffers(PHY_VARS_NR_UE **phy_vars_ue, openair0_config_t *openair0_cfg);
 extern void fill_ue_band_info(void);
-extern void init_NR_UE(int, char*, char*, char*, char*);
+extern void init_NR_UE(int, char *, char *, char *, char *);
 extern void init_NR_UE_threads(int);
 extern void reset_opp_meas(void);
 extern void print_opp_meas(void);

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -187,7 +187,7 @@ int nr_pbch_detection(UE_nr_rxtx_proc_t * proc, PHY_VARS_NR_UE *ue, int pbch_ini
 
 
 #ifdef DEBUG_INITIAL_SYNCH
-    LOG_I(PHY,"[UE%d] Initial sync: pbch decoded sucessfully, ssb index %d\n",ue->Mod_id, frame_parms->ssb_index);
+    LOG_I(PHY, "[UE%d] Initial sync: pbch decoded sucessfully, ssb index %d\n", ue->Mod_id, frame_parms->ssb_index);
 #endif
     return(0);
   } else {

openair1/PHY/defs_nr_common.h

@@ -289,11 +289,11 @@ typedef struct {
     int32_t sfn;
     int8_t  slot;
     int8_t  rxAnt_idx;
-    float   dl_toa;
+    float dl_toa;
     int32_t dl_aoa;
-    float   snr;
-    float   rsrp;
-    float   rsrp_dBm;
+    float snr;
+    float rsrp;
+    float rsrp_dBm;
     int32_t reserved;
 } prs_meas_t;
 

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -943,13 +943,7 @@ void pbch_pdcch_processing(PHY_VARS_NR_UE *ue,
                         (j%fp->symbols_per_slot),
                         rxdataF);
           }
-          nr_prs_channel_estimation(gNB_id,
-                                    rsc_id,
-                                    i,
-                                    ue,
-                                    proc,
-                                    fp,
-                                    rxdataF);
+          nr_prs_channel_estimation(gNB_id, rsc_id, i, ue, proc, fp, rxdataF);
         }
       } // for i
     } // for rsc_id

openair2/RRC/NR_UE/main_ue.c

@@ -34,8 +34,9 @@
 #include "rrc_proto.h"
 #include "common/utils/LOG/log.h"
 
-NR_UE_RRC_INST_t* nr_l3_init_ue(char* uecap, char* rrc_config_path, char* reconfig_file, char* rbconfig_file){
-    //LOG_I(RRC, "[MAIN] NR UE MAC initialization...\n");
+NR_UE_RRC_INST_t* nr_l3_init_ue(char* uecap, char* rrc_config_path, char* reconfig_file, char* rbconfig_file)
+{
+  // LOG_I(RRC, "[MAIN] NR UE MAC initialization...\n");
 
-    return openair_rrc_top_init_ue_nr(uecap,rrc_config_path,reconfig_file,rbconfig_file);
+  return openair_rrc_top_init_ue_nr(uecap, rrc_config_path, reconfig_file, rbconfig_file);
 }

openair2/RRC/NR_UE/rrc_UE.c

@@ -344,7 +344,6 @@ void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type,
 
 }
 
-
 NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* uecap_file, char* rrc_config_path, char* reconfig_file, char* rbconfig_file)
 {
   if(NB_NR_UE_INST > 0) {
@@ -371,11 +370,11 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* uecap_file, char* rrc_config_
       FILE *fd;
       char filename[1024];
       if (rrc_config_path && reconfig_file)
-        sprintf(filename,"%s/%s",rrc_config_path,reconfig_file);
+        sprintf(filename, "%s/%s", rrc_config_path, reconfig_file);
       else
         sprintf(filename,"reconfig.raw");
-      
-      LOG_I(NR_RRC, "using %s for rrc init[1/2]\n",filename);
+
+      LOG_I(NR_RRC, "using %s for rrc init[1/2]\n", filename);
       fd = fopen(filename,"r");
       char buffer[1024];
       AssertFatal(fd,
@@ -387,11 +386,11 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* uecap_file, char* rrc_config_
       fclose(fd);
       process_nsa_message(NR_UE_rrc_inst, nr_SecondaryCellGroupConfig_r15, buffer,msg_len);
       if (rrc_config_path && rbconfig_file)
-        sprintf(filename,"%s/%s",rrc_config_path,rbconfig_file);
+        sprintf(filename, "%s/%s", rrc_config_path, rbconfig_file);
       else
         sprintf(filename,"rbconfig.raw");
-      
-      LOG_I(NR_RRC, "using %s for rrc init[2/2]\n",filename);
+
+      LOG_I(NR_RRC, "using %s for rrc init[2/2]\n", filename);
       fd = fopen(filename,"r");
       AssertFatal(fd,
                   "cannot read file %s: errno %d, %s\n",
@@ -418,7 +417,6 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* uecap_file, char* rrc_config_
   return NR_UE_rrc_inst;
 }
 
-
 int8_t nr_ue_process_rlc_bearer_list(NR_CellGroupConfig_t *cell_group_config){
 
     return 0;

openair2/RRC/NR_UE/rrc_proto.h

@@ -56,16 +56,14 @@ extern queue_t nr_ul_tti_req_queue;
 //  main_rrc.c
 //
 /**\brief Layer 3 initialization*/
-NR_UE_RRC_INST_t* nr_l3_init_ue(char*,char*,char*,char*);
+NR_UE_RRC_INST_t *nr_l3_init_ue(char *, char *, char *, char *);
 
 //
 //  UE_rrc.c
 //
 
 /**\brief Initial the top level RRC structure instance*/
-NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char*,char*,char*,char*);
-
-
+NR_UE_RRC_INST_t *openair_rrc_top_init_ue_nr(char *, char *, char *, char *);
 
 /**\brief Decode RRC Connection Reconfiguration, sent from E-UTRA RRC Connection Reconfiguration v1510 carring EN-DC config
    \param buffer  encoded NR-RRC-Connection-Reconfiguration/Secondary-Cell-Group-Config message.