code-cleanup-20210716

common/config/config_userapi.c

@@ -83,9 +83,14 @@ char *config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) {
   }
 
   if (*ptr == NULL) {
-    *ptr = malloc(length>40?length:40);
     // LTS: dummy fix, waiting Francois full fix in 4G branch
     // the issue is we don't know at this point the size we will get
+    // for parmeters on the command line, 
+    // The length sould probably managed, in a later version
+    // 100 is a very large value for a string parameter of today OAI
+    if (length<100)
+       length=100;
+    *ptr = malloc(length);
 
     if ( *ptr != NULL) {
       memset(*ptr,0,length);

executables/nr-softmodem-common.h

@@ -154,7 +154,4 @@ extern int emulate_rf;
 extern int numerology;
 extern int usrp_tx_thread;
 
-extern volatile int start_eNB;
-extern volatile int start_UE;
-
 #endif

executables/nr-uesoftmodem.c

@@ -107,8 +107,6 @@ int config_sync_var=-1;
 
 
 RAN_CONTEXT_t RC;
-volatile int             start_eNB = 0;
-volatile int             start_UE = 0;
 volatile int             oai_exit = 0;
 
 

openair1/PHY/NR_TRANSPORT/nr_pbch.c

@@ -42,7 +42,7 @@
 
 extern short nr_qpsk_mod_table[8];
 
-uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
+const uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
                                                     9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31
                                                    };
 
@@ -141,7 +141,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
   return 0;
 }
 
-void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
+static void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
                         uint32_t Nid,
                         uint8_t nushift,
                         uint16_t M,

openair1/PHY/NR_TRANSPORT/nr_transport_proto.h

@@ -78,19 +78,6 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
                           nfapi_nr_config_request_scf_t *config,
                           NR_DL_FRAME_PARMS *frame_parms);
 
-/*!
-\fn int nr_pbch_scrambling
-\brief PBCH scrambling function
-@param
- */
-void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
-                        uint32_t Nid,
-                        uint8_t nushift,
-                        uint16_t M,
-                        uint16_t length,
-                        uint8_t encoded,
-                        uint32_t unscrambling_mask);
-
 /*!
 \fn int nr_generate_pbch
 \brief Generation of the PBCH

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -375,8 +375,6 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc, PHY_VARS_NR_UE *ue, int n_frames)
 #endif
     //#endif
 
-    ue->is_synchronized_on_frame = is; // to notify on which of the two frames sync was successful
-
     if (ue->UE_scan_carrier == 0) {
 
     #if UE_AUTOTEST_TRACE

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -332,7 +332,7 @@ void nr_pbch_detection_mrc(NR_DL_FRAME_PARMS *frame_parms,
 #endif
 }
 
-void nr_pbch_unscrambling(NR_UE_PBCH *pbch,
+static void nr_pbch_unscrambling(NR_UE_PBCH *pbch,
                           uint16_t Nid,
                           uint8_t nushift,
                           uint16_t M,
@@ -555,7 +555,7 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
 
   nr_ue_pbch_vars->pbch_a_prime = a_reversed;
   //payload un-scrambling
-  memset(&nr_ue_pbch_vars->pbch_a_interleaved, 0, sizeof(uint32_t) );
+  nr_ue_pbch_vars->pbch_a_interleaved=0;
   M = (Lmax == 64)? (NR_POLAR_PBCH_PAYLOAD_BITS - 6) : (NR_POLAR_PBCH_PAYLOAD_BITS - 3);
   nushift = ((nr_ue_pbch_vars->pbch_a_prime>>24)&1) ^ (((nr_ue_pbch_vars->pbch_a_prime>>6)&1)<<1);
   nr_pbch_unscrambling(nr_ue_pbch_vars,frame_parms->Nid_cell,nushift,M,NR_POLAR_PBCH_PAYLOAD_BITS,1,unscrambling_mask);

openair1/PHY/defs_nr_UE.h

@@ -761,8 +761,6 @@ typedef struct {
   int UE_fo_compensation;
   /// \brief Indicator that UE is synchronized to a gNB
   int is_synchronized;
-  /// \brief Indicates on which frame is synchronized in a two frame synchronization
-  int is_synchronized_on_frame;
   /// \brief Indicator that UE lost frame synchronization
   int lost_sync;
   /// Data structure for UE process scheduling

openair1/SCHED_NR/nr_prach_procedures.c

@@ -49,9 +49,6 @@
 
 extern uint8_t nfapi_mode;
 
-extern int oai_nfapi_nr_rach_ind(nfapi_rach_indication_t *rach_ind);
-
-
 void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
 
   uint16_t max_preamble[4]={0},max_preamble_energy[4]={0},max_preamble_delay[4]={0};

openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c

@@ -231,7 +231,6 @@ void clear_UE_transport_info(uint8_t nb_UE)
 
   for (UE_id=0; UE_id<nb_UE; UE_id++)
     for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-      UE_transport_info_TB_index[UE_id][CC_id]=0;
       memset((void *)&UE_transport_info[UE_id][CC_id].cntl,0,sizeof(UE_cntl));
     }
 

openair1/SIMULATION/ETH_TRANSPORT/extern.h

@@ -57,7 +57,6 @@ extern eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
 extern uint16_t eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
 
 extern UE_transport_info_t UE_transport_info[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
-extern uint16_t UE_transport_info_TB_index[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
 
 extern UE_cntl ue_cntl_delay[NUMBER_OF_UE_MAX][MAX_NUM_CCs][2];
 

openair1/SIMULATION/ETH_TRANSPORT/vars.h

@@ -58,7 +58,6 @@ eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
 uint16_t eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
 
 UE_transport_info_t UE_transport_info[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
-uint16_t UE_transport_info_TB_index[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
 
 UE_cntl ue_cntl_delay[NUMBER_OF_UE_MAX][MAX_NUM_CCs][2];
 

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -87,7 +87,6 @@ uint16_t sl_ahead=0;
 uint64_t downlink_frequency[MAX_NUM_CCs][4];
 THREAD_STRUCT thread_struct;
 nfapi_ue_release_request_body_t release_rntis;
-msc_interface_t msc_interface;
 uint32_t N_RB_DL = 106;
 
 // dummy functions

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -83,7 +83,6 @@ double cpuf;
 uint64_t downlink_frequency[MAX_NUM_CCs][4];
 THREAD_STRUCT thread_struct;
 nfapi_ue_release_request_body_t release_rntis;
-msc_interface_t msc_interface;
 uint32_t N_RB_DL = 106;
 
 extern void fix_scd(NR_ServingCellConfig_t *scd);// forward declaration

openair1/SIMULATION/TOOLS/corr_mat.m

@@ -57,11 +57,11 @@ R22_sqrt_int(2:2:end,:,:) = imag(R22_sqrt);
 
 %%
 fid = fopen('scm_corrmat.h','w');
-fprintf(fid,'double R22_sqrt[][] = {\n');
+fprintf(fid,'static double R22_sqrt[][] = {\n');
 for i=1:size(Gamma,3)
     fprintf(fid,'{');
     fprintf(fid,'%f, ',R22_sqrt_int(:,:,i)); 
     fprintf(fid,'\b\b},\n');
 end
 fprintf(fid,'};\n');
-fclose(fid)
\ No newline at end of file
+fclose(fid)

openair1/SIMULATION/TOOLS/random_channel.c

@@ -72,7 +72,7 @@ void fill_channel_desc(channel_desc_t *chan_desc,
                        uint8_t channel_length,
                        double *amps,
                        double *delays,
-                       struct complex **R_sqrt,
+                       struct complex *R_sqrt,
                        double Td,
                        double sampling_rate,
                        double channel_bandwidth,
@@ -155,7 +155,7 @@ void fill_channel_desc(channel_desc_t *chan_desc,
       //chan_desc->R_sqrt[i]    = (struct complex*) calloc(nb_tx*nb_rx*nb_tx*nb_rx,sizeof(struct complex));
       //chan_desc->R_sqrt = (struct complex*)&R_sqrt[i][0];
       /* all chan_desc share the same R_sqrt, coming from caller */
-      chan_desc->R_sqrt[i] = R_sqrt[0];
+      chan_desc->R_sqrt[i] = R_sqrt;
     }
   }
 
@@ -177,13 +177,13 @@ void fill_channel_desc(channel_desc_t *chan_desc,
   reset_meas(&chan_desc->convolution);
 }
 
-double mbsfn_delays[] = {0,.03,.15,.31,.37,1.09,12.490,12.52,12.64,12.80,12.86,13.58,27.49,27.52,27.64,27.80,27.86,28.58};
-double mbsfn_amps_dB[] = {0,-1.5,-1.4,-3.6,-0.6,-7.0,-10,-11.5,-11.4,-13.6,-10.6,-17.0,-20,-21.5,-21.4,-23.6,-20.6,-27};
+static double mbsfn_delays[] = {0,.03,.15,.31,.37,1.09,12.490,12.52,12.64,12.80,12.86,13.58,27.49,27.52,27.64,27.80,27.86,28.58};
+static double mbsfn_amps_dB[] = {0,-1.5,-1.4,-3.6,-0.6,-7.0,-10,-11.5,-11.4,-13.6,-10.6,-17.0,-20,-21.5,-21.4,-23.6,-20.6,-27};
 
-double scm_c_delays[] = {0, 0.0125, 0.0250, 0.3625, 0.3750, 0.3875, 0.2500, 0.2625, 0.2750, 1.0375, 1.0500, 1.0625, 2.7250, 2.7375, 2.7500, 4.6000, 4.6125, 4.6250};
-double scm_c_amps_dB[] = {0.00, -2.22, -3.98, -1.86, -4.08, -5.84, -1.08, -3.30, -5.06, -9.08, -11.30, -13.06, -15.14, -17.36, -19.12, -20.64, -22.85, -24.62};
+static double scm_c_delays[] = {0, 0.0125, 0.0250, 0.3625, 0.3750, 0.3875, 0.2500, 0.2625, 0.2750, 1.0375, 1.0500, 1.0625, 2.7250, 2.7375, 2.7500, 4.6000, 4.6125, 4.6250};
+static double scm_c_amps_dB[] = {0.00, -2.22, -3.98, -1.86, -4.08, -5.84, -1.08, -3.30, -5.06, -9.08, -11.30, -13.06, -15.14, -17.36, -19.12, -20.64, -22.85, -24.62};
 
-double tdl_a_delays[] = {0.0000,
+static double tdl_a_delays[] = {0.0000,
                          0.3819,
                          0.4025,
                          0.5868,
@@ -207,7 +207,7 @@ double tdl_a_delays[] = {0.0000,
                          5.3043,
                          9.6586
                         };
-double tdl_a_amps_dB[] = {-13.4,
+static double tdl_a_amps_dB[] = {-13.4,
                           0,
                           -2.2,
                           -4,
@@ -232,7 +232,7 @@ double tdl_a_amps_dB[] = {-13.4,
                           -29.7
                           };
 
-double tdl_b_delays[] = {0.0000,
+static double tdl_b_delays[] = {0.0000,
                          0.1072,
                          0.2155,
                          0.2095,
@@ -257,7 +257,7 @@ double tdl_b_delays[] = {0.0000,
                          4.7834
                         };
 
-double tdl_b_amps_dB[] = {0,
+static double tdl_b_amps_dB[] = {0,
                           -2.2,
                           -4,
                           -3.2,
@@ -282,7 +282,7 @@ double tdl_b_amps_dB[] = {0,
                           -11.3
                           };
 
-double tdl_c_delays[] = {0,
+static double tdl_c_delays[] = {0,
                          0.2099,
                          0.2219,
                          0.2329,
@@ -308,7 +308,7 @@ double tdl_c_delays[] = {0,
                          8.6523
                         };
 
-double tdl_c_amps_dB[] = {-4.4,
+static double tdl_c_amps_dB[] = {-4.4,
                           -1.2,
                           -3.5,
                           -5.2,
@@ -334,7 +334,7 @@ double tdl_c_amps_dB[] = {-4.4,
                           -22.8
                           };
 
-double tdl_d_delays[] = {//0,
+static double tdl_d_delays[] = {//0,
   0,
   0.035,
   0.612,
@@ -350,7 +350,7 @@ double tdl_d_delays[] = {//0,
   12.525
 };
 
-double tdl_d_amps_dB[] = {//-0.2,
+static double tdl_d_amps_dB[] = {//-0.2,
   //-13.5,
   -.00147,
     -18.8,
@@ -369,7 +369,7 @@ double tdl_d_amps_dB[] = {//-0.2,
 
 #define TDL_D_RICEAN_FACTOR .046774
 
-double tdl_e_delays[] = {0,
+static double tdl_e_delays[] = {0,
                          0.5133,
                          0.5440,
                          0.5630,
@@ -385,7 +385,7 @@ double tdl_e_delays[] = {0,
                          20.6519
                         };
 
-double tdl_e_amps_dB[] = {//-0.03,
+static double tdl_e_amps_dB[] = {//-0.03,
   //-22.03,
   -.00433,
     -15.8,
@@ -405,102 +405,78 @@ double tdl_e_amps_dB[] = {//-0.03,
 
 #define TDL_E_RICEAN_FACTOR 0.0063096
 
-double epa_delays[] = { 0,.03,.07,.09,.11,.19,.41};
-double epa_amps_dB[] = {0.0,-1.0,-2.0,-3.0,-8.0,-17.2,-20.8};
+static double epa_delays[] = { 0,.03,.07,.09,.11,.19,.41};
+static double epa_amps_dB[] = {0.0,-1.0,-2.0,-3.0,-8.0,-17.2,-20.8};
 
-double eva_delays[] = { 0,.03,.15,.31,.37,.71,1.09,1.73,2.51};
-double eva_amps_dB[] = {0.0,-1.5,-1.4,-3.6,-0.6,-9.1,-7.0,-12.0,-16.9};
+static double eva_delays[] = { 0,.03,.15,.31,.37,.71,1.09,1.73,2.51};
+static double eva_amps_dB[] = {0.0,-1.5,-1.4,-3.6,-0.6,-9.1,-7.0,-12.0,-16.9};
 
-double etu_delays[] = { 0,.05,.12,.2,.23,.5,1.6,2.3,5.0};
-double etu_amps_dB[] = {-1.0,-1.0,-1.0,0.0,0.0,0.0,-3.0,-5.0,-7.0};
+static double etu_delays[] = { 0,.05,.12,.2,.23,.5,1.6,2.3,5.0};
+static double etu_amps_dB[] = {-1.0,-1.0,-1.0,0.0,0.0,0.0,-3.0,-5.0,-7.0};
 
-double default_amps_lin[] = {0.3868472, 0.3094778, 0.1547389, 0.0773694, 0.0386847, 0.0193424, 0.0096712, 0.0038685};
-double default_amp_lin[] = {1};
-
-double ts_shift_delays[] = {0, 1/7.68};
-double ts_shift_amps[] = {0, 1};
+static double default_amps_lin[] = {0.3868472, 0.3094778, 0.1547389, 0.0773694, 0.0386847, 0.0193424, 0.0096712, 0.0038685};
+static double default_amp_lin[] = {1};
 
 //correlation matrix for a 2x2 channel with full Tx correlation
-struct complex R_sqrt_22_corr_tap[16] = {{0.70711,0}, {0.0, 0.0}, {0.70711,0}, {0.0, 0.0},
+static struct complex R_sqrt_22_corr[16] = {{0.70711,0}, {0.0, 0.0}, {0.70711,0}, {0.0, 0.0},
   {0.0, 0.0}, {0.70711,0}, {0.0, 0.0}, {0.70711,0},
   {0.70711,0}, {0.0, 0.0}, {0.70711,0}, {0.0, 0.0},
   {0.0, 0.0}, {0.70711,0}, {0.0, 0.0}, {0.70711,0}
 };
-struct complex *R_sqrt_22_corr[1]     = {R_sqrt_22_corr_tap};
 
 //correlation matrix for a fully correlated 2x1 channel (h1==h2)
-struct complex R_sqrt_21_corr_tap[4]  = {{0.70711,0}, {0.70711,0}, {0.70711,0}, {0.70711,0}};
-struct complex *R_sqrt_21_corr[1]      = {R_sqrt_21_corr_tap};
+static struct complex R_sqrt_21_corr[]  = {{0.70711,0}, {0.70711,0}, {0.70711,0}, {0.70711,0}};
 
 //correlation matrix for a 2x2 channel with full Tx anti-correlation
-struct complex R_sqrt_22_anticorr_tap[16] = {{0.70711,0}, {0.0, 0.0}, {-0.70711,0}, {0.0, 0.0},
+static struct complex R_sqrt_22_anticorr[16] = {{0.70711,0}, {0.0, 0.0}, {-0.70711,0}, {0.0, 0.0},
   {0.0, 0.0}, {0.70711,0}, {0.0, 0.0}, {-0.70711,0},
   {-0.70711,0}, {0.0, 0.0}, {0.70711,0}, {0.0, 0.0},
   {0.0, 0.0}, {-0.70711,0}, {0.0, 0.0}, {0.70711,0}
 };
-struct complex *R_sqrt_22_anticorr[1]     = {R_sqrt_22_anticorr_tap};
 
 //correlation matrix for a fully anti-correlated 2x1 channel (h1==-h2)
-struct complex R_sqrt_21_anticorr_tap[4]  = {{0.70711,0}, {-0.70711,0}, {-0.70711,0}, {0.70711,0}};
-struct complex *R_sqrt_21_anticorr[1]     = {R_sqrt_21_anticorr_tap};
-
-struct complex **R_sqrt_ptr2;
+static struct complex R_sqrt_21_anticorr[4]  = {{0.70711,0}, {-0.70711,0}, {-0.70711,0}, {0.70711,0}};
 
 // full correlation matrix in vectorized form for 2x2 channel, where h1 is  perfectly orthogonal to h2
 
-struct complex R_sqrt_22_orthogonal_tap[16] = {{0.70711,0.0}, {0.0, 0.0}, {0.0,0.0}, {0.0, 0.0},
+static struct complex R_sqrt_22_orthogonal[16] = {{0.70711,0.0}, {0.0, 0.0}, {0.0,0.0}, {0.0, 0.0},
   {0.0, 0.0}, {0.0,0.0}, {0.0, 0.0}, {0.0,0.0},
   {0.0,0.0}, {0.0, 0.0}, {0.0,0.0}, {0.0, 0.0},
   {0.0, 0.0}, {0.0,0.0}, {0.0, 0.0}, {0.70711,0.0}
 };
-struct complex *R_sqrt_22_orthogonal[1]     = {R_sqrt_22_orthogonal_tap};
 
 // full correlation matrix for TM4 to make orthogonal effective channel
-
-
-
-
-struct complex R_sqrt_22_orth_eff_ch_TM4_prec_real_tap[16] = {{0.70711,0.0}, {0.0, 0.0}, {0.70711,0.0}, {0.0, 0.0},
+static struct complex R_sqrt_22_orth_eff_ch_TM4_prec_real[16] = {{0.70711,0.0}, {0.0, 0.0}, {0.70711,0.0}, {0.0, 0.0},
   {0.0, 0.0}, {0.70711,0.0}, {0.0, 0.0}, {-0.70711,0.0},
   {0.70711,0.0}, {0.0, 0.0}, {0.70711,0.0}, {0.0, 0.0},
   {0.0, 0.0}, {-0.70711,0.0}, {0.0, 0.0}, {0.70711,0.0}
 };
-struct complex *R_sqrt_22_orth_eff_ch_TM4_prec_real[1]     = {R_sqrt_22_orth_eff_ch_TM4_prec_real_tap};
 
-
-
-
-struct complex R_sqrt_22_orth_eff_ch_TM4_prec_imag_tap[16] = {{0.70711,0.0}, {0.0,0.0}, {0.0, -0.70711}, {0.0,0.0},
+static struct complex R_sqrt_22_orth_eff_ch_TM4_prec_imag[16] = {{0.70711,0.0}, {0.0,0.0}, {0.0, -0.70711}, {0.0,0.0},
   {0.0, 0.0}, {0.70711,0.0}, {0.0, 0.0}, {0.0,0.70711},
   {0.0,-0.70711}, {0.0, 0.0}, {-0.70711,0.0}, {0.0, 0.0},
   {0.0, 0.0}, {0.0,0.70711}, {0.0, 0.0}, {-0.70711,0.0}
 };
-struct complex *R_sqrt_22_orth_eff_ch_TM4_prec_imag[1]     = {R_sqrt_22_orth_eff_ch_TM4_prec_imag_tap};
 
 //Correlation matrix for EPA channel
-struct complex R_sqrt_22_EPA_low_tap[16] = {{1.0,0.0}, {0.0,0.0}, {0.0,0.0}, {0.0,0.0},
+static struct complex R_sqrt_22_EPA_low[16] = {{1.0,0.0}, {0.0,0.0}, {0.0,0.0}, {0.0,0.0},
   {0.0,0.0}, {1.0,0.0}, {0.0,0.0}, {0.0,0.0},
   {0.0,0.0}, {0.0,0.0}, {1.0,0.0}, {0.0,0.0},
   {0.0,0.0}, {0.0,0.0}, {0.0,0.0}, {1.0,0.0}
 };
-struct complex *R_sqrt_22_EPA_low[1]     = {R_sqrt_22_EPA_low_tap};
 
-struct complex R_sqrt_22_EPA_high_tap[16] = {
+static struct complex R_sqrt_22_EPA_high[16] = {
   {0.7179,0.0}, {0.4500,0.0}, {0.4500,0.0}, {0.2821,0.0},
   {0.4500,0.0}, {0.7179,0.0}, {0.2821,0.0}, {0.4500,0.0},
   {0.4500,0.0}, {0.2821,0.0}, {0.7179,0.0}, {0.4500,0.0},
   {0.2821,0.0}, {0.4500,0.0}, {0.4500,0.0}, {0.7179,0.0}
 };
-struct complex *R_sqrt_22_EPA_high[1]     = {R_sqrt_22_EPA_high_tap};
 
-struct complex R_sqrt_22_EPA_medium_tap[16] = {{0.8375,0.0}, {0.5249,0.0}, {0.1286,0.0}, {0.0806,0.0},
+static struct complex R_sqrt_22_EPA_medium[16] = {{0.8375,0.0}, {0.5249,0.0}, {0.1286,0.0}, {0.0806,0.0},
   {0.5249,0.0}, {0.8375,0.0}, {0.0806,0.0}, {0.1286,0.0},
   {0.1286,0.0}, {0.0806,0.0}, {0.8375,0.0}, {0.5249,0.0},
   {0.0806,0.0}, {0.1286,0.0}, {0.5249,0.0}, {0.8375,0.0}
 };
-struct complex *R_sqrt_22_EPA_medium[1]     = {R_sqrt_22_EPA_medium_tap};
-
-
 
 //Rayleigh1_orth_eff_ch_TM4
 
@@ -600,6 +576,7 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
   double sum_amps;
   double aoa,ricean_factor,Td,maxDoppler;
   int channel_length,nb_taps;
+  struct complex *R_sqrt_ptr2;
   chan_desc->modelid                   = channel_model;
   chan_desc->nb_tx                      = nb_tx;
   chan_desc->nb_rx                      = nb_rx;
@@ -880,7 +857,7 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
         chan_desc->R_sqrt  = (struct complex **) malloc(chan_desc->nb_taps*sizeof(struct complex **));
 
         for (i = 0; i<chan_desc->nb_taps; i++)
-          chan_desc->R_sqrt[i] = R_sqrt_22_EPA_low[0];
+          chan_desc->R_sqrt[i] = R_sqrt_22_EPA_low;
       } else {
         printf("Correlation matrices are implemented for 2 x 2 only");
       }
@@ -935,7 +912,7 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
         chan_desc->R_sqrt  = (struct complex **) malloc(chan_desc->nb_taps*sizeof(struct complex **));
 
         for (i = 0; i<chan_desc->nb_taps; i++)
-          chan_desc->R_sqrt[i] = R_sqrt_22_EPA_high[0];
+          chan_desc->R_sqrt[i] = R_sqrt_22_EPA_high;
       } else {
         printf("Correlation matrices are implemented for 2 x 2 only");
       }
@@ -990,7 +967,7 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
         chan_desc->R_sqrt  = (struct complex **) malloc(chan_desc->nb_taps*sizeof(struct complex **));
 
         for (i = 0; i<chan_desc->nb_taps; i++)
-          chan_desc->R_sqrt[i] = R_sqrt_22_EPA_medium[0];
+          chan_desc->R_sqrt[i] = R_sqrt_22_EPA_medium;
       } else {
         printf("Correlation matrices are implemented for 2 x 2 only");
       }
@@ -1397,11 +1374,13 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
 
     case TS_SHIFT:
       nb_taps = 2;
+      double ts_shift_delays[] = {0, 1/7.68};
       Td = ts_shift_delays[1];
       channel_length = 10;
       ricean_factor = 0.0;
       aoa = 0.0;
       maxDoppler = 0;
+      double ts_shift_amps[] = {0, 1};
       fill_channel_desc(chan_desc,nb_tx,
                         nb_rx,
                         nb_taps,

openair1/SIMULATION/TOOLS/scm_corrmat.h

@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-double R22_sqrt[6][32] = {
+static double R22_sqrt[6][32] = {
   {0.921700, -0.000000, 0.010380, -0.027448, -0.250153, 0.294754, 0.005961, 0.010769, 0.010380, 0.027448, 0.921700, 0.000000, -0.011595, -0.004130, -0.250153, 0.294754, -0.250153, -0.294754, -0.011595, 0.004130, 0.921700, 0.000000, 0.010380, -0.027448, 0.005961, -0.010769, -0.250153, -0.294754, 0.010380, 0.027448, 0.921700, 0.000000},
   {0.923810, 0.000000, 0.004069, 0.027832, 0.151730, 0.350180, -0.009882, 0.006114, 0.004069, -0.027832, 0.923810, 0.000000, 0.011218, -0.003029, 0.151730, 0.350180, 0.151730, -0.350180, 0.011218, 0.003029, 0.923810, -0.000000, 0.004069, 0.027832, -0.009882, -0.006114, 0.151730, -0.350180, 0.004069, -0.027832, 0.923810, 0.000000},
   {0.927613, 0.000000, 0.014253, 0.025767, -0.061171, -0.367133, 0.009258, -0.007340, 0.014253, -0.025767, 0.927613, -0.000000, -0.011138, -0.003942, -0.061171, -0.367133, -0.061171, 0.367133, -0.011138, 0.003942, 0.927613, 0.000000, 0.014253, 0.025767, 0.009258, 0.007340, -0.061171, 0.367133, 0.014253, -0.025767, 0.927613, 0.000000},
@@ -27,7 +27,7 @@ double R22_sqrt[6][32] = {
   {0.919726, -0.000000, 0.038700, -0.111146, 0.217804, 0.300925, 0.045531, -0.013659, 0.038700, 0.111146, 0.919726, 0.000000, -0.027201, 0.038983, 0.217804, 0.300925, 0.217804, -0.300925, -0.027201, -0.038983, 0.919726, 0.000000, 0.038700, -0.111146, 0.045531, 0.013659, 0.217804, -0.300925, 0.038700, 0.111146, 0.919726, 0.000000},
   {0.867608, -0.000000, 0.194097, -0.112414, -0.418811, 0.095938, -0.081264, 0.075727, 0.194097, 0.112414, 0.867608, -0.000000, -0.106125, -0.032801, -0.418811, 0.095938, -0.418811, -0.095938, -0.106125, 0.032801, 0.867608, 0.000000, 0.194097, -0.112414, -0.081264, -0.075727, -0.418811, -0.095938, 0.194097, 0.112414, 0.867608, 0.000000},
 };
-double R21_sqrt[6][8] = {
+static double R21_sqrt[6][8] = {
   {0.922167, 0.000000,-0.250280, 0.294903,-0.250280, -0.294903,0.922167, 0.000000},
   {0.924238, 0.000000,0.151801, 0.350342,0.151801, -0.350342,0.924238, 0.000000},
   {0.928080, 0.000000,-0.061202, -0.367318,-0.061202, 0.367318,0.928080, 0.000000},
@@ -35,7 +35,7 @@ double R21_sqrt[6][8] = {
   {0.927225, 0.000000,0.219580, 0.303378,0.219580, -0.303378,0.927225, 0.000000},
   {0.896133, 0.000000,-0.432581, 0.099092,-0.432581, -0.099092,0.896133, 0.000000},
 };
-double R12_sqrt[6][8] = {
+static double R12_sqrt[6][8] = {
   {0.999494, 0.000000,0.011256, -0.029765,0.011256, 0.029765,0.999494, 0.000000},
   {0.999537, 0.000000,0.004402, 0.030114,0.004402, -0.030114,0.999537, 0.000000},
   {0.999497, 0.000000,0.015358, 0.027764,0.015358, -0.027764,0.999497, 0.000000},

openair2/LAYER2/MAC/config.c

@@ -51,7 +51,7 @@
 #include "LTE_MBSFN-SubframeConfigList.h"
 #include "LTE_MBSFN-SubframeConfig.h"
 #include "LTE_PMCH-InfoList-r9.h"
-
+#include <openair2/LAYER2/MAC/mac_proto.h>
 
 extern RAN_CONTEXT_t RC;
 extern int l2_init_eNB(void);

openair2/LAYER2/MAC/config_ue.c

@@ -57,6 +57,7 @@
 #include "LTE_PMCH-InfoList-r9.h"
 
 
+#include <openair2/LAYER2/MAC/mac_proto.h>
 extern void mac_init_cell_params(int Mod_idP,int CC_idP);
 extern void phy_reset_ue(module_id_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
 

openair2/LAYER2/MAC/eNB_scheduler.c

@@ -556,10 +556,7 @@ copy_ulreq(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP) {
   }
 }
 
-extern int16_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
-extern int16_t find_ulsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
-extern void clean_eNb_ulsch(LTE_eNB_ULSCH_t *ulsch);
-extern void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch);
+#include <openair1/PHY/LTE_TRANSPORT/transport_proto.h>
 
 void
 eNB_dlsch_ulsch_scheduler(module_id_t module_idP,

openair2/LAYER2/MAC/mac_extern.h

@@ -58,7 +58,6 @@ extern unsigned char NB_eNB_INST;
 extern uint16_t NB_UE_INST;
 extern uint16_t NB_THREAD_INST;
 extern unsigned char NB_RN_INST;
-extern unsigned short NODE_ID[1];
 
 extern const int cqi_to_mcs[16];
 

openair2/LAYER2/MAC/main_ue.c

@@ -44,8 +44,7 @@
 
 
 #include "common/ran_context.h"
-extern void openair_rrc_top_init_ue( int eMBMS_active, char *uecap_xer, uint8_t cba_group_active, uint8_t HO_active);
-
+#include <openair2/RRC/LTE/rrc_proto.h>
 void dl_phy_sync_success(module_id_t module_idP, frame_t frameP, unsigned char eNB_index, uint8_t first_sync) { //init as MR
   LOG_D(MAC, "[UE %d] Frame %d: PHY Sync to eNB_index %d successful \n",
         module_idP, frameP, eNB_index);

openair2/LAYER2/MAC/rar_tools.c

@@ -41,7 +41,6 @@
 #define DEBUG_RAR
 
 extern unsigned int localRIV2alloc_LUT25[512];
-extern unsigned int distRIV2alloc_LUT25[512];
 extern unsigned short RIV2nb_rb_LUT25[512];
 extern unsigned short RIV2first_rb_LUT25[512];
 extern RAN_CONTEXT_t RC;

openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h

@@ -56,7 +56,6 @@ extern unsigned char NB_UE_INST;*/
 extern unsigned char NB_INST;
 extern unsigned char NB_eNB_INST;
 extern unsigned char NB_RN_INST;
-extern unsigned short NODE_ID[1];
 
 /* Scheduler */
 extern RAN_CONTEXT_t RC;

openair2/LAYER2/PDCP_v10.1.0/pdcp_control_primitive.c

@@ -32,7 +32,6 @@
 #include "rtos_header.h"
 #include "platform.h"
 #include "protocol_vars_extern.h"
-#include "print.h"
 //-----------------------------------------------------------------------------
 #include "rlc.h"
 #include "pdcp.h"

openair2/LAYER2/openair2_proc.c

@@ -503,8 +503,8 @@ int openair2_stats_read(char *buffer, char **my_buffer, off_t off, int length) {
         } else if(Mac_rlc_xface->Is_cluster_head[k] ==1) {
             Mod_id=k;
             len+=sprintf(&buffer[len],
-                         "-------------------------------------------------------------------CH %d: TTI: %d------------------------------------------------------------------\n",
-                         NODE_ID[Mod_id],Mac_rlc_xface->frame);
+                         "------------------------------------------------------------------- TTI: %d------------------------------------------------------------------\n",
+                         Mac_rlc_xface->frame);
 
             for(i=1; i<=NB_CNX_CH; i++) {
                 if (CH_mac_inst[Mod_id].Dcch_lchan[i].Active==1) {

openair2/MCE_APP/mce_app.c

@@ -54,7 +54,6 @@
 #   define X2AP_ENB_REGISTER_RETRY_DELAY   10
 
 #include "openair1/PHY/INIT/phy_init.h"
-extern unsigned char NB_MCE_INST;
 
 extern RAN_CONTEXT_t RC;
 

openair2/RRC/LTE/rrc_eNB.c

@@ -110,7 +110,6 @@ extern RAN_CONTEXT_t RC;
 extern eNB_MAC_INST                *eNB_mac_inst;
 extern UE_MAC_INST                 *UE_mac_inst;
 
-extern uint16_t                     two_tier_hexagonal_cellIds[7];
 
 mui_t                               rrc_eNB_mui = 0;
 
@@ -6120,7 +6119,6 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
   mobilityInfo = CALLOC(1, sizeof(*mobilityInfo));
   memset((void *)mobilityInfo, 0, sizeof(*mobilityInfo));
   mobilityInfo->targetPhysCellId = RC.rrc[ctxt_pP->module_id]->carrier[0].physCellId;
-  //(PhysCellId_t) two_tier_hexagonal_cellIds[ue_context_pP->ue_context.handover_info->modid_t];
   LOG_D(RRC, "[eNB %d] Frame %d: handover preparation: targetPhysCellId: %ld mod_id: %d ue: %x \n",
         ctxt_pP->module_id,
         ctxt_pP->frame,

openair2/RRC/LTE/rrc_extern.h

@@ -47,7 +47,6 @@ extern LTE_LogicalChannelConfig_t SRB2_logicalChannelConfig_defaultValue;
 extern unsigned char NB_INST;
 extern unsigned char NB_eNB_INST;
 extern uint16_t NB_UE_INST;
-extern unsigned short NODE_ID[1];
 extern void* bigphys_malloc(int);
 
 

openair2/RRC/NR/nr_rrc_extern.h

@@ -47,7 +47,6 @@ extern NR_LogicalChannelConfig_t NR_SRB3_logicalChannelConfig_defaultValue;
 extern unsigned char NB_INST;
 extern unsigned char NB_eNB_INST;
 extern uint16_t NB_UE_INST;
-extern unsigned short NODE_ID[1];
 extern void* bigphys_malloc(int);
 
 

openair2/UTIL/TRACE/fifo_printf.c

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*
- *                               fifo_printf.c
- *                             -------------------
- *  AUTHOR  : Lionel GAUTHIER
- *  COMPANY : EURECOM
- *  EMAIL   : Lionel.Gauthier@eurecom.fr
- *
- */
-#include "rtos_header.h"
-#include "platform.h"
-#include "protocol_vars_extern.h"
-
-#include <asm/page.h>
-#include <asm/system.h>
-#include <stdarg.h>
-
-
-#include "fifo_printf.h"
-
-#ifndef FIFO_PRINTF
-//-----------------------------------------------------------------------------
-int fifo_printf_null (const char *fmt, ...)
-{
-  return 0;
-}
-#else
-static uint8_t       fifo_printed_l1[FIFO_PRINTF_MAX_STRING_SIZE];
-static uint8_t       fifo_printed_l2[FIFO_PRINTF_MAX_STRING_SIZE];
-//-----------------------------------------------------------------------------
-void
-fifo_printf_init (void)
-{
-  //-----------------------------------------------------------------------------
-  printk ("[TRACE] INIT\n");
-  rtf_create (FIFO_PRINTF_L1_NO, FIFO_PRINTF_SIZE);
-  rtf_create (FIFO_PRINTF_L2_NO, FIFO_PRINTF_SIZE);
-}
-
-//-----------------------------------------------------------------------------
-void
-fifo_printf_clean_up (void)
-{
-  //-----------------------------------------------------------------------------
-  rtf_destroy (FIFO_PRINTF_L1_NO);
-  rtf_destroy (FIFO_PRINTF_L2_NO);
-}
-
-//-----------------------------------------------------------------------------
-int
-fifo_printf (const char *fmt, ...)
-{
-  //-----------------------------------------------------------------------------
-  int             i;
-  va_list         args;
-
-  va_start (args, fmt);
-
-  if (pthread_self () == &task_l1l) {
-    i = vsprintf (fifo_printed_l1, fmt, args);
-    va_end (args);
-
-    /* perhaps we should discard old data instead */
-    if (i > FIFO_PRINTF_MAX_STRING_SIZE) {
-      rt_printk ("[WCDMA] FIFO_PRINTF WROTE OUTSIDE ITS MEMORY BOUNDARY : ERRORS WILL OCCUR\n");
-    }
-
-    if (i <= 0) {
-      return 0;
-    }
-
-    rtf_put (FIFO_PRINTF_L1_NO, fifo_printed_l1, i);
-
-    return i;
-  }
-
-  if (pthread_self () == &task_l2) {
-    i = vsprintf (fifo_printed_l2, fmt, args);
-    va_end (args);
-
-    /* perhaps we should discard old data instead */
-    if (i > FIFO_PRINTF_MAX_STRING_SIZE) {
-      rt_printk ("[WCDMA] FIFO_PRINTF WROTE OUTSIDE ITS MEMORY BOUNDARY : ERRORS WILL OCCUR\n");
-    }
-
-    if (i <= 0) {
-      return 0;
-    }
-
-    rtf_put (FIFO_PRINTF_L2_NO, fifo_printed_l2, i);
-
-    return i;
-  }
-
-  return 0;
-}
-#endif

openair2/UTIL/TRACE/fifo_printf.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/***************************************************************************
-                          fifo_printf.h  -  description
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
-
- ***************************************************************************/
-#ifndef __FIFO_PRINTF_H__
-#    define __FIFO_PRINTF_H__
-#    define FIFO_PRINTF_MAX_STRING_SIZE   500
-#    define FIFO_PRINTF_L1_NO              63
-#    define FIFO_PRINTF_L2_NO              62
-#    define FIFO_PRINTF_SIZE            65536
-#endif

openair2/UTIL/TRACE/fifo_printf_proto_extern.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/***************************************************************************
-                          fifo_printf_proto_extern.h  -  description
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
-
-
- ***************************************************************************/
-#ifndef __FIFO_PRINTF_PROTO_EXTERN_H__
-#    define __FIFO_PRINTF_PROTO_EXTERN_H__
-#ifdef FIFO_PRINTF
-extern void     fifo_printf_init (void);
-extern void     fifo_printf_clean_up (void);
-extern int      fifo_printf (const char *fmt, ...);
-#else
-extern int      fifo_printf_null (const char *fmt, ...);
-#endif
-#endif

openair2/UTIL/TRACE/print.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/***************************************************************************
-                          print.h  -  description
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
- ***************************************************************************/
-#ifndef __PRINT_H__
-#    define __PRINT_H__
-#    define msg printf
-#endif

openair3/MME_APP/mme_app.c

@@ -54,7 +54,6 @@
 #   define X2AP_ENB_REGISTER_RETRY_DELAY   10
 
 #include "openair1/PHY/INIT/phy_init.h"
-extern unsigned char NB_MCE_INST;
 
 extern RAN_CONTEXT_t RC;
 

targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c

@@ -42,7 +42,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <linux/sysctl.h>
-#include <sys/sysctl.h>
 
 #include "common_lib.h"
 #include "ethernet_lib.h"