cleanup of warnings and default parameters for simulator target

openair1/SIMULATION/RF/adc.c

@@ -38,12 +38,7 @@ void adc(double *r_re[2],
     for (aa=0; aa<nb_rx_antennas; aa++) {
       ((short *)output[aa])[((i+output_offset)<<1)]   = (short)(r_re[aa][i+input_offset]*gain);
       ((short *)output[aa])[1+((i+output_offset)<<1)] = (short)(r_im[aa][i+input_offset]*gain);
-
-      if ((r_re[aa][i+input_offset]*gain) > 30000) {
-        //("Adc outputs %d %e  %d \n",i,((short *)output[0])[((i+output_offset)<<1)], ((i+output_offset)<<1) );
-      }
     }
 
-    //printf("Adc outputs %d %e  %d \n",i,((short *)output[0])[((i+output_offset)<<1)], ((i+output_offset)<<1) );
   }
 }

openair1/SIMULATION/RF/dac.c

@@ -26,7 +26,7 @@
 #include "rf.h"
 void dac(double *s_re[2],
          double *s_im[2],
-         uint32_t **input,
+         int32_t **input,
          uint32_t input_offset,
          uint32_t nb_tx_antennas,
          uint32_t length,
@@ -76,7 +76,7 @@ void dac(double *s_re[2],
 
 double dac_fixed_gain(double *s_re[2],
                       double *s_im[2],
-                      uint32_t **input,
+                      int32_t **input,
                       uint32_t input_offset,
                       uint32_t nb_tx_antennas,
                       uint32_t length,

openair1/SIMULATION/RF/rf.h

@@ -69,14 +69,14 @@ void adc(double *r_re[2],
          double *r_im[2],
          unsigned int input_offset,
          unsigned int output_offset,
-         int **output,
+         int32_t **output,
          unsigned int nb_rx_antennas,
          unsigned int length,
          unsigned char B);
 
 void dac(double *s_re[2],
          double *s_im[2],
-         unsigned int **input,
+         int32_t **input,
          unsigned int input_offset,
          unsigned int nb_tx_antennas,
          unsigned int length,
@@ -87,7 +87,7 @@ void dac(double *s_re[2],
 
 double dac_fixed_gain(double *s_re[2],
                       double *s_im[2],
-                      unsigned int **input,
+                      int32_t **input,
                       unsigned int input_offset,
                       unsigned int nb_tx_antennas,
                       unsigned int length,

openair1/SIMULATION/TOOLS/channel_sim.c

@@ -45,7 +45,7 @@
 #include "UTIL/FIFO/types.h"
 
 #define RF
-#define DEBUG_SIM
+//#define DEBUG_SIM
 /*
 #undef LOG_D
 #define LOG_D(A,B,C...) printf(B,C)
@@ -77,17 +77,15 @@ void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM
 	       int CC_id)
 {
 
-  int32_t att_eNB_id=-1;
   int32_t **txdata,**rxdata;
 
-  uint32_t eNB_id,ru_id=0;
+  uint32_t ru_id=0;
   double tx_pwr;
   double rx_pwr;
   int32_t rx_pwr2;
   uint32_t i,aa;
   uint32_t sf_offset;
 
-  double min_path_loss=-200;
   uint8_t hold_channel=0;
   uint8_t nb_antennas_rx = RU2UE[0][0][CC_id]->nb_rx; // number of rx antennas at UE
   uint8_t nb_antennas_tx = RU2UE[0][0][CC_id]->nb_tx; // number of tx antennas at eNB
@@ -460,11 +458,11 @@ void do_UL_sig(channel_desc_t *UE2RU[NUMBER_OF_UE_MAX][NUMBER_OF_RU_MAX][MAX_NUM
 	       1e3/UE2RU[0][ru_id][CC_id]->sampling_rate,  // sampling time (ns)
 	       (double)RC.ru[ru_id]->max_rxgain-(double)RC.ru[ru_id]->att_rx - 66.227);   // rx_gain (dB) (66.227 = 20*log10(pow2(11)) = gain from the adc that will be applied later)
   
-  //#ifdef DEBUG_SIM
+#ifdef DEBUG_SIM
   rx_pwr = signal_energy_fp(r_re_p,r_im_p,nb_antennas_rx,frame_parms->samples_per_tti,0);//*(double)frame_parms->ofdm_symbol_size/(12.0*frame_parms->N_RB_DL;
   LOG_D(OCM,"[SIM][UL] rx_pwr (ADC in) %f dB for subframe %d (rx_gain %f)\n",10*log10(rx_pwr),subframe,
 	(double)RC.ru[ru_id]->max_rxgain-(double)RC.ru[ru_id]->att_rx);
-  //#endif
+#endif
   
   rxdata = RC.ru[ru_id]->common.rxdata;
   sf_offset = subframe*frame_parms->samples_per_tti;

openair1/SIMULATION/TOOLS/sim.h

@@ -373,6 +373,18 @@ void multipath_tv_channel(channel_desc_t *desc,
 double N_RB2sampling_rate(uint16_t N_RB);
 double N_RB2channel_bandwidth(uint16_t N_RB);
 
+void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM_CCs],
+               uint16_t subframe,
+               uint32_t offset,
+               uint32_t length,
+               uint8_t abstraction_flag,LTE_DL_FRAME_PARMS *ue_frame_parms,
+               uint8_t UE_id,
+               int CC_id);
+
+void do_UL_sig(channel_desc_t *UE2RU[NUMBER_OF_UE_MAX][NUMBER_OF_RU_MAX][MAX_NUM_CCs],
+               uint16_t subframe,uint8_t abstraction_flag,LTE_DL_FRAME_PARMS *frame_parms, 
+               uint32_t frame,int ru_id,uint8_t CC_id);
+
 #endif