Revert whitespace changes

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -35,12 +35,12 @@
 #include <errno.h>
 
 extern int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind);
-
 void configure_nfapi_pnf(char *vnf_ip_addr,
                          int vnf_p5_port,
                          char *pnf_ip_addr,
                          int pnf_p7_port,
                          int vnf_p7_port);
+
 UL_IND_t *UL_INFO = NULL;
 
 nfapi_ul_config_request_t* ul_config_req = NULL;
@@ -56,8 +56,8 @@ int current_sfn_sf;
 static int ue_sock_descriptor = -1;
 
 extern nfapi_tx_request_pdu_t* tx_request_pdu[1023][10][10];
-extern int timer_subframe;
-extern int timer_frame;
+//extern int timer_subframe;
+//extern int timer_frame;
 
 extern uint16_t sf_ahead;
 
@@ -195,7 +195,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
                                  UL_IND_t *UL_INFO,
                                  uint8_t ra_PreambleIndex,
                                  uint16_t ra_RNTI) {
-  LOG_I(MAC, "fill_rach_indication_UE_MAC 1 \n");
+  LOG_D(MAC, "fill_rach_indication_UE_MAC 1 \n");
 
   pthread_mutex_lock(&fill_ul_mutex.rach_mutex);
 
@@ -241,7 +241,7 @@ void fill_rach_indication_UE_MAC(int Mod_id,
 
   // This function is currently defined only in the nfapi-RU-RAU-split so we
   // should call it when we merge with that branch.
-  // Andrew - send proxy specific socket instead of oai_nfapi_rach_ind Send the whole UL_INFO struct
+  // TODO Andrew - send proxy specific socket instead of oai_nfapi_rach_ind Send the whole UL_INFO struct
   // as soon as numberof preambles
   if (NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) {
     send_standalone_msg(UL_INFO, UL_INFO->rach_ind.header.message_id);

targets/RT/USER/lte-ue.c

@@ -1951,13 +1951,13 @@ void write_dummy(PHY_VARS_UE *UE,  openair0_timestamp timestamp) {
   //
   struct complex16 v= {0};
   void *samplesVoid[UE->frame_parms.nb_antennas_tx];
-
+  
   for ( int i=0; i < UE->frame_parms.nb_antennas_tx; i++)
     samplesVoid[i]=(void *)&v;
-
+  
   AssertFatal( 1 == UE->rfdevice.trx_write_func(&UE->rfdevice,
 						timestamp+2*UE->frame_parms.samples_per_tti,
-						samplesVoid,
+						samplesVoid, 
 						1,
 						UE->frame_parms.nb_antennas_tx,
 						1),"");
@@ -2011,7 +2011,7 @@ void *UE_thread(void *arg)
     int instance_cnt_synch = UE->proc.instance_cnt_synch;
     int is_synchronized    = UE->is_synchronized;
     AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
-
+    
     if (is_synchronized == 0) {
       if (instance_cnt_synch < 0) {  // we can invoke the synch
         // grab 10 ms of signal and wakeup synch thread
@@ -2021,7 +2021,7 @@ void *UE_thread(void *arg)
 	    for(int sf=0; sf<10; sf++) {
 	      for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
 		rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.samples_per_tti*sf];
-
+	      
               AssertFatal(UE->frame_parms.samples_per_tti == UE->rfdevice.trx_read_func(&UE->rfdevice,
 						      &timestamp,
 						      rxp,
@@ -2032,7 +2032,7 @@ void *UE_thread(void *arg)
 	  } else {
 	    for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
 	      rxp[i] = (void *)&UE->common_vars.rxdata[i][0];
-
+	    
 	    AssertFatal( UE->frame_parms.samples_per_tti*10 ==
                          UE->rfdevice.trx_read_func(&UE->rfdevice,
                                                     &timestamp,

targets/RT/USER/lte-uesoftmodem.c

@@ -632,7 +632,7 @@ int main( int argc, char **argv ) {
 
   NB_INST=1;
 
-  if(NFAPI_MODE==NFAPI_UE_STUB_PNF || NFAPI_MODE==NFAPI_MODE_STANDALONE_PNF) { // || NFAPI_MODE_STANDALONE_PNF
+  if(NFAPI_MODE==NFAPI_UE_STUB_PNF || NFAPI_MODE==NFAPI_MODE_STANDALONE_PNF) {
     PHY_vars_UE_g = malloc(sizeof(PHY_VARS_UE **)*NB_UE_INST);
 
     for (int i=0; i<NB_UE_INST; i++) {
@@ -653,10 +653,10 @@ int main( int argc, char **argv ) {
   }
 
   cpuf=get_cpu_freq_GHz();
-
-
+  
+  
 #if 0 // #ifndef DEADLINE_SCHEDULER
-
+  
   printf("NO deadline scheduler\n");
   /* Currently we set affinity for UHD to CPU 0 for eNB/UE and only if number of CPUS >2 */
   cpu_set_t cpuset;
@@ -668,7 +668,7 @@ int main( int argc, char **argv ) {
   if (get_nprocs() > 2) {
     for (j = 2; j < get_nprocs(); j++)
       CPU_SET(j, &cpuset);
-
+    
     s = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
 
     if (s != 0) {