issue 403 -> astyle on modified files

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -28,13 +28,13 @@
 typedef unsigned __int128 uint128_t;
 
 uint16_t nr_get_dci_size(nfapi_nr_dci_format_e format,
-                        nfapi_nr_rnti_type_e rnti_type,
-                        uint16_t N_RB,
-                        nfapi_nr_config_request_t* config);
+                         nfapi_nr_rnti_type_e rnti_type,
+                         uint16_t N_RB,
+                         nfapi_nr_config_request_t *config);
 
 uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars,
                             uint32_t **gold_pdcch_dmrs,
-                            int32_t* txdataF,
+                            int32_t *txdataF,
                             int16_t amp,
                             NR_DL_FRAME_PARMS frame_parms,
                             nfapi_nr_config_request_t config);
@@ -43,7 +43,7 @@ void nr_pdcch_scrambling(uint32_t *in,
                          uint16_t size,
                          uint32_t Nid,
                          uint32_t n_RNTI,
-                         uint32_t* out);
+                         uint32_t *out);
 
 void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
                            int frame,
@@ -53,7 +53,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
                            nfapi_nr_dl_config_dci_dl_pdu *pdu,
                            nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu);
 
-void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m);
+void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t *dci_alloc, uint16_t n_shift, uint8_t m);
 
 
 #endif //__PHY_NR_TRANSPORT_DCI__H

openair1/PHY/NR_TRANSPORT/nr_transport.h

@@ -36,7 +36,7 @@ int nr_generate_pss(  int16_t *d_pss,
                       int32_t *txdataF,
                       int16_t amp,
                       uint8_t ssb_start_symbol,
-                      nfapi_nr_config_request_t* config,
+                      nfapi_nr_config_request_t *config,
                       NR_DL_FRAME_PARMS *frame_parms);
 
 /*!
@@ -49,7 +49,7 @@ int nr_generate_sss(  int16_t *d_sss,
                       int32_t *txdataF,
                       int16_t amp,
                       uint8_t ssb_start_symbol,
-                      nfapi_nr_config_request_t* config,
+                      nfapi_nr_config_request_t *config,
                       NR_DL_FRAME_PARMS *frame_parms);
 
 /*!
@@ -62,7 +62,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
                           int32_t *txdataF,
                           int16_t amp,
                           uint8_t ssb_start_symbol,
-                          nfapi_nr_config_request_t* config,
+                          nfapi_nr_config_request_t *config,
                           NR_DL_FRAME_PARMS *frame_parms);
 
 /*!
@@ -94,7 +94,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
                      uint8_t Lmax,
                      uint8_t ssb_index,
                      int sfn,
-                     nfapi_nr_config_request_t* config,
+                     nfapi_nr_config_request_t *config,
                      NR_DL_FRAME_PARMS *frame_parms);
 
 /*!

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -39,7 +39,7 @@
 #include <time.h>
 
 #if defined(ENABLE_ITTI)
-#   include "intertask_interface.h"
+  #include "intertask_interface.h"
 #endif
 
 extern uint8_t nfapi_mode;
@@ -77,31 +77,29 @@ int return_ssb_type(nfapi_config_request_t *cfg)
 }*/
 
 // First SSB starting symbol candidate is used and type B is chosen for 30kHz SCS
-int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp)
-{
+int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp) {
   int mu = cfg->subframe_config.numerology_index_mu.value;
   int symbol = 0;
 
   switch(mu) {
+    case NR_MU_0:
+      symbol = 2;
+      break;
 
-  case NR_MU_0:
-    symbol = 2;
-    break;
-
-  case NR_MU_1: // case B
-    symbol = 4;
-    break;
+    case NR_MU_1: // case B
+      symbol = 4;
+      break;
 
-  case NR_MU_3:
-    symbol = 4;
-    break;
+    case NR_MU_3:
+      symbol = 4;
+      break;
 
-  case NR_MU_4:
-    symbol = 8;
-    break;
+    case NR_MU_4:
+      symbol = 8;
+      break;
 
-  default:
-    AssertFatal(0==1, "Invalid numerology index %d for the synchronization block\n", mu);
+    default:
+      AssertFatal(0==1, "Invalid numerology index %d for the synchronization block\n", mu);
   }
 
   if (cfg->sch_config.half_frame_index.value)
@@ -110,99 +108,90 @@ int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *f
   return symbol;
 }
 
-void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp)
-{
+void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp) {
   fp->ssb_start_subcarrier = (12 * cfg->sch_config.n_ssb_crb.value + cfg->sch_config.ssb_subcarrier_offset.value)/(1<<cfg->subframe_config.numerology_index_mu.value);
   LOG_D(PHY, "SSB first subcarrier %d (%d,%d)\n", fp->ssb_start_subcarrier,cfg->sch_config.n_ssb_crb.value,cfg->sch_config.ssb_subcarrier_offset.value);
 }
 
 void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
-
   NR_DL_FRAME_PARMS *fp=&gNB->frame_parms;
   nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
   int **txdataF = gNB->common_vars.txdataF;
   uint8_t *pbch_pdu=&gNB->pbch_pdu[0];
   int ss_slot = (cfg->sch_config.half_frame_index.value)? 10 : 0;
   uint8_t Lmax, ssb_index=0, n_hf=0;
-
   LOG_D(PHY,"common_signal_procedures: frame %d, slot %d\n",frame,slot);
-
   int ssb_start_symbol = nr_get_ssb_start_symbol(cfg, fp);
   nr_set_ssb_first_subcarrier(cfg, fp);
   Lmax = (fp->dl_CarrierFreq < 3e9)? 4:8;
 
-
-  if (slot == ss_slot)
-  {
+  if (slot == ss_slot) {
     // Current implementation is based on SSB in first half frame, first candidate
     LOG_D(PHY,"SS TX: frame %d, slot %d, start_symbol %d\n",frame,slot, ssb_start_symbol);
-
     nr_generate_pss(gNB->d_pss, txdataF[0], AMP, ssb_start_symbol, cfg, fp);
     nr_generate_sss(gNB->d_sss, txdataF[0], AMP, ssb_start_symbol, cfg, fp);
 
-    if (!(frame&7)){
+    if (!(frame&7)) {
       LOG_D(PHY,"%d.%d : pbch_configured %d\n",frame,slot,gNB->pbch_configured);
+
       if (gNB->pbch_configured != 1)return;
+
       gNB->pbch_configured = 0;
     }
 
     nr_generate_pbch_dmrs(gNB->nr_gold_pbch_dmrs[n_hf][ssb_index],txdataF[0], AMP, ssb_start_symbol, cfg, fp);
-
     nr_generate_pbch(&gNB->pbch,
-                      pbch_pdu,
-                      gNB->nr_pbch_interleaver,
-                      txdataF[0],
-                      AMP,
-                      ssb_start_symbol,
-                      n_hf,Lmax,ssb_index,
-                      frame, cfg, fp);
+                     pbch_pdu,
+                     gNB->nr_pbch_interleaver,
+                     txdataF[0],
+                     AMP,
+                     ssb_start_symbol,
+                     n_hf,Lmax,ssb_index,
+                     frame, cfg, fp);
   }
-
 }
 
 void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
-			   gNB_L1_rxtx_proc_t *proc,
-			   int do_meas)
-{
+                           gNB_L1_rxtx_proc_t *proc,
+                           int do_meas) {
   int aa;
   int frame=proc->frame_tx;
-
   int slot=proc->slot_tx;
   uint8_t num_dci=0,num_pdsch_rnti;
-
   NR_DL_FRAME_PARMS *fp=&gNB->frame_parms;
   nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
-
   int offset = gNB->CC_id;
 
   if ((cfg->subframe_config.duplex_mode.value == TDD) && (nr_slot_select(cfg,slot)==SF_UL)) return;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+offset,1);
+
   if (do_meas==1) start_meas(&gNB->phy_proc_tx);
 
   // clear the transmit data array for the current subframe
-  for (aa=0; aa<1/*15*/; aa++) {      
+  for (aa=0; aa<1/*15*/; aa++) {
     memset(gNB->common_vars.txdataF[aa],0,fp->samples_per_slot_wCP*sizeof(int32_t));
   }
 
   if (nfapi_mode == 0 || nfapi_mode == 1) {
     nr_common_signal_procedures(gNB,frame, slot);
     //if (frame == 9)
-      //write_output("txdataF.m","txdataF",gNB->common_vars.txdataF[aa],fp->samples_per_frame_wCP, 1, 1);
+    //write_output("txdataF.m","txdataF",gNB->common_vars.txdataF[aa],fp->samples_per_frame_wCP, 1, 1);
   }
 
   num_dci = gNB->pdcch_vars.num_dci;
-
   num_pdsch_rnti = gNB->pdcch_vars.num_pdsch_rnti;
+
   if (num_dci) {
     LOG_I(PHY, "[gNB %d] Frame %d slot %d \
     Calling nr_generate_dci_top (number of DCI %d)\n", gNB->Mod_id, frame, slot, num_dci);
 
-    if (nfapi_mode == 0 || nfapi_mode == 1){
+    if (nfapi_mode == 0 || nfapi_mode == 1) {
       nr_generate_dci_top(gNB->pdcch_vars,
                           gNB->nr_gold_pdcch_dmrs[slot],
                           gNB->common_vars.txdataF[0],
                           AMP, *fp, *cfg);
+
       if (num_pdsch_rnti) {
         LOG_I(PHY, "PDSCH generation started (%d)\n", num_pdsch_rnti);
         nr_generate_pdsch(*gNB->dlsch[0][0],
@@ -213,6 +202,6 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
       }
     }
   }
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+offset,0);
 
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+offset,0);
 }

targets/RT/USER/nr-ue.c

@@ -992,20 +992,21 @@ void *UE_thread(void *arg) {
       proc->frame_tx = (proc->frame_tx + 1)%MAX_FRAME_NUMBER;
       proc->nr_tti_tx %= nb_slot_frame;
     }
+
     if(slot_nr == 0) {
       UE->proc.proc_rxtx[0].frame_rx++;
-      
+
       //UE->proc.proc_rxtx[1].frame_rx++;
       for (th_id=1; th_id < RX_NB_TH; th_id++) {
-	UE->proc.proc_rxtx[th_id].frame_rx = UE->proc.proc_rxtx[0].frame_rx;
+        UE->proc.proc_rxtx[th_id].frame_rx = UE->proc.proc_rxtx[0].frame_rx;
       }
     }
-    
+
     if (UE->mode != loop_through_memory) {
       for (i=0; i<UE->frame_parms.nb_antennas_rx; i++)
         rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.ofdm_symbol_size+
-						    UE->frame_parms.nb_prefix_samples0+
-						    slot_nr*UE->frame_parms.samples_per_slot];
+                 UE->frame_parms.nb_prefix_samples0+
+                 slot_nr*UE->frame_parms.samples_per_slot];
 
       for (i=0; i<UE->frame_parms.nb_antennas_tx; i++)
         txp[i] = (void *)&UE->common_vars.txdata[i][((slot_nr+2)%NR_NUMBER_OF_SUBFRAMES_PER_FRAME)*UE->frame_parms.samples_per_slot];
@@ -1060,17 +1061,14 @@ void *UE_thread(void *arg) {
       pickTime(gotIQs);
       // operate on thread sf mod 2
       AssertFatal(pthread_mutex_lock(&proc->mutex_rxtx) ==0,"");
-
-
-
 #ifdef SAIF_ENABLED
 
-        if (!(proc->frame_rx%4000)) {
-          printf("frame_rx=%d rx_thread_busy=%ld - rate %8.3f\n",
-                 proc->frame_rx, g_ue_rx_thread_busy,
-                 (float)g_ue_rx_thread_busy/(proc->frame_rx*10+1)*100.0);
-          fflush(stdout);
-        }
+      if (!(proc->frame_rx%4000)) {
+        printf("frame_rx=%d rx_thread_busy=%ld - rate %8.3f\n",
+               proc->frame_rx, g_ue_rx_thread_busy,
+               (float)g_ue_rx_thread_busy/(proc->frame_rx*10+1)*100.0);
+        fflush(stdout);
+      }
 
 #endif
 
@@ -1114,7 +1112,6 @@ void *UE_thread(void *arg) {
       //                    pickStaticTime(lastTime);
     } //UE->mode != loop_through_memory
     else {
-
       processSubframeRX(UE,proc);
       getchar();
     } // else loop_through_memory
@@ -1142,6 +1139,7 @@ void init_UE_threads(PHY_VARS_NR_UE *UE) {
   pthread_mutex_init(&UE->proc.mutex_synch,NULL);
   pthread_cond_init(&UE->proc.cond_synch,NULL);
   UE->proc.instance_cnt_synch = -1;
+
   // the threads are not yet active, therefore access is allowed without locking
   for (int i=0; i<RX_NB_TH; i++) {
     rtd = calloc(1, sizeof(struct nr_rxtx_thread_data));