Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08

openair1/PHY/INIT/lte_init.c

@@ -415,10 +415,8 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
         fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig,
         fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset
        );
-  LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_eNB][MOD %02"PRIu8"][]\n", eNB->Mod_id);
   LOG_I (PHY, "[eNB %" PRIu8 "] Initializing DL_FRAME_PARMS : N_RB_DL %" PRIu8 ", PHICH Resource %d, PHICH Duration %d\n",
          eNB->Mod_id, fp->N_RB_DL, fp->phich_config_common.phich_resource, fp->phich_config_common.phich_duration);
-  LOG_D (PHY, "[MSC_NEW][FRAME 00000][PHY_eNB][MOD %02" PRIu8 "][]\n", eNB->Mod_id);
   crcTableInit();
   lte_gold (fp, eNB->lte_gold_table, fp->Nid_cell);
   generate_pcfich_reg_mapping (fp);

openair1/PHY/INIT/nr_init.c

@@ -104,7 +104,6 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
 
   load_dftslib();
 
-  LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_gNB][MOD %02"PRIu8"][]\n", gNB->Mod_id);
   crcTableInit();
   init_scrambling_luts();
   init_pucch2_luts();

openair1/PHY/INIT/nr_init_ue.c

@@ -138,7 +138,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
   int n_scid;
   abstraction_flag = 0;
   LOG_I(PHY, "Initializing UE vars (abstraction %u) for gNB TXant %u, UE RXant %u\n", abstraction_flag, fp->nb_antennas_tx, fp->nb_antennas_rx);
-  //LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_gNB_INST);
   phy_init_nr_top(ue);
   // many memory allocation sizes are hard coded
   AssertFatal( fp->nb_antennas_rx <= 4, "hard coded allocation for ue_common_vars->dl_ch_estimates[gNB_id]" );

openair1/PHY/defs_UE.h

@@ -55,7 +55,6 @@
 #include <string.h>
 #include <math.h>
 #include "common_lib.h"
-#include "msc.h"
 
 #include "defs_common.h"
 #include "impl_defs_top.h"

openair1/PHY/defs_common.h

@@ -54,7 +54,6 @@
 #include <string.h>
 #include <math.h>
 #include "common_lib.h"
-#include "msc.h"
 #include <common/utils/LOG/log.h>
 #include "assertions.h"
 

openair1/PHY/defs_eNB.h

@@ -55,7 +55,6 @@
 #include <unistd.h>
 
 #include "common_lib.h"
-#include "msc.h"
 #include "defs_common.h"
 #include "defs_RU.h"
 #include "impl_defs_top.h"

openair1/PHY/defs_nr_UE.h

@@ -44,7 +44,6 @@
 #include <string.h>
 #include <math.h>
 #include "common_lib.h"
-#include "msc.h"
 #include "fapi_nr_ue_interface.h"
 #include "assertions.h"
 

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -43,7 +43,6 @@
 #include <nfapi/oai_integration/nfapi_pnf.h>
 
 #include "assertions.h"
-#include "msc.h"
 
 #include <time.h>
 

openair1/SCHED/prach_procedures.c

@@ -40,7 +40,6 @@
 
 
 #include "assertions.h"
-#include "msc.h"
 
 #include <time.h>
 

openair1/SCHED/ru_procedures.c

@@ -69,7 +69,6 @@
 
 #include "assertions.h"
 #include "common/utils/system.h"
-#include "msc.h"
 
 #include <time.h>
 

openair1/SCHED_NR/nr_prach_procedures.c

@@ -41,7 +41,6 @@
 
 
 #include "assertions.h"
-#include "msc.h"
 
 #include <time.h>
 

openair1/SCHED_NR/nr_ru_procedures.c

@@ -44,7 +44,6 @@
 #include "T.h"
 
 #include "assertions.h"
-#include "msc.h"
 
 #include <time.h>
 // RU OFDM Modulator gNodeB

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -39,7 +39,6 @@
 #include "executables/softmodem-common.h"
 
 #include "assertions.h"
-#include "msc.h"
 
 #include <time.h>
 

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -72,13 +72,11 @@ openair0_config_t openair0_cfg[MAX_CARDS];
 uint64_t downlink_frequency[MAX_NUM_CCs][4];
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
 uint16_t sl_ahead = 0;
-msc_interface_t msc_interface;
 uint32_t N_RB_DL = 106;
 
 //void dump_nr_prach_config(NR_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
 
 /* temporary dummy implem of get_softmodem_optmask, till basic simulators implemented as device */
-msc_interface_t msc_interface;
 uint64_t get_softmodem_optmask(void) {return 0;}
 softmodem_params_t *get_softmodem_params(void) {return 0;}
 int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req) { return(0);  }