Remove unused variables from softmodems, focusing on NR UE: chain_offset, card_offset, numerology,

oaisim_flag, dumpframe, rx_input_level_dBm, emulate_rf

executables/lte-enb.c

@@ -107,8 +107,6 @@ extern int oai_exit;
 
 extern int transmission_mode;
 
-extern int oaisim_flag;
-
 #include "executables/thread-common.h"
 //extern PARALLEL_CONF_t get_thread_parallel_conf(void);
 //extern WORKER_CONF_t   get_thread_worker_conf(void);

executables/lte-softmodem.c

@@ -157,7 +157,6 @@ eth_params_t *eth_params;
 
 double cpuf;
 
-int oaisim_flag=0;
 
 /* hardcoded into gtp_itf.cpp */
 bool sdap_data_req(protocol_ctxt_t *ctxt_p,

executables/lte-softmodem.h

@@ -123,7 +123,6 @@ extern int32_t  uplink_frequency_offset[MAX_NUM_CCs][4];
 
 extern int rx_input_level_dBm;
 
-extern int oaisim_flag;
 extern int oai_exit;
 
 extern openair0_config_t openair0_cfg[MAX_CARDS];

executables/lte-uesoftmodem.c

@@ -165,7 +165,6 @@ double cpuf;
 extern char uecap_xer[1024];
 char uecap_xer_in=0;
 
-int oaisim_flag=0;
 
 /* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
  * this is very hackish - find a proper solution

executables/nr-softmodem-common.h

@@ -133,9 +133,6 @@ extern int sync_var;
 extern uint64_t downlink_frequency[MAX_NUM_CCs][4];
 extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
 
-extern int rx_input_level_dBm;
-
-extern int oaisim_flag;
 extern int oai_exit;
 
 extern openair0_config_t openair0_cfg[MAX_CARDS];

executables/nr-softmodem.c

@@ -137,8 +137,6 @@ uint8_t dci_Format = 0;
 uint8_t nb_antenna_tx = 1;
 uint8_t nb_antenna_rx = 1;
 
-int rx_input_level_dBm;
-
 int otg_enabled;
 
 #include <SIMULATION/ETH_TRANSPORT/proto.h>

executables/nr-uesoftmodem.c

@@ -124,12 +124,10 @@ char       *rrc_config_path = NULL;
 char *reconfig_file = NULL;
 char *rbconfig_file = NULL;
 char            *uecap_file = NULL;
-int               dumpframe = 0;
 
 uint64_t        downlink_frequency[MAX_NUM_CCs][4];
 int32_t         uplink_frequency_offset[MAX_NUM_CCs][4];
 uint64_t        sidelink_frequency[MAX_NUM_CCs][4];
-int             rx_input_level_dBm;
 
 #if MAX_NUM_CCs == 1
 rx_gain_t                rx_gain_mode[MAX_NUM_CCs][4] = {{max_gain,max_gain,max_gain,max_gain}};
@@ -147,13 +145,6 @@ openair0_config_t openair0_cfg[MAX_CARDS];
 int16_t           node_synch_ref[MAX_NUM_CCs];
 int               otg_enabled;
 double            cpuf;
-
-
-int          chain_offset = 0;
-int           card_offset = 0;
-int            numerology = 0;
-int           oaisim_flag = 0;
-int            emulate_rf = 0;
 uint32_t       N_RB_DL    = 106;
 
 // NTN cellSpecificKoffset-r17, but in slots for DL SCS
@@ -251,8 +242,8 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
   UE->rx_total_gain_dB     = (int)rx_gain[CC_id][0] + rx_gain_off;
   UE->tx_total_gain_dB     = (int)tx_gain[CC_id][0];
   UE->tx_power_max_dBm     = tx_max_power[CC_id];
-  UE->rf_map.card          = card_offset;
-  UE->rf_map.chain         = CC_id + chain_offset;
+  UE->rf_map.card          = 0;
+  UE->rf_map.chain         = CC_id + 0;
   UE->max_ldpc_iterations  = nrUE_params.max_ldpc_iterations;
   UE->ldpc_offload_enable  = nrUE_params.ldpc_offload_flag;
   UE->UE_scan_carrier      = nrUE_params.UE_scan_carrier;