Make SA the default mode, remove corresponding option

openair1/PHY/INIT/nr_init_ue.c

@@ -283,7 +283,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
   init_timeshift_rotation(fp);
 
   // initialize to false only for SA since in do-ra and phy-test it is already set to true before getting here
-  if (get_softmodem_params()->sa)
+  if (IS_SA_MODE(get_softmodem_params()))
     ue->received_config_request = false;
 
   return 0;

openair1/PHY/NR_TRANSPORT/nr_pbch.c

@@ -271,7 +271,7 @@ void nr_generate_pbch(PHY_VARS_gNB *gNB,
     pbch_a |= ((pbch_pdu[i >> 3] >> (7 - (i & 7))) & 1) << i;
 
   // NSA to signal no coreset0
-  const int ssb_sc_offset = get_softmodem_params()->sa ? config->ssb_table.ssb_subcarrier_offset.value : 31;
+  const int ssb_sc_offset = IS_SA_MODE(get_softmodem_params()) ? config->ssb_table.ssb_subcarrier_offset.value : 31;
 
   #ifdef DEBUG_PBCH_ENCODING
   for (int i = 0; i < 3; i++)

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -95,7 +95,7 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB, int frame, int slot, nfapi_n
   const int sc_offset = (fp->freq_range == FR1) ? pdu->SsbSubcarrierOffset >> scs : pdu->SsbSubcarrierOffset;
   fp->ssb_start_subcarrier = (12 * prb_offset + sc_offset);
 
-  if (fp->print_ue_help_cmdline_log && get_softmodem_params()->sa) {
+  if (fp->print_ue_help_cmdline_log && IS_SA_MODE(get_softmodem_params())) {
     fp->print_ue_help_cmdline_log = false;
     if (fp->dl_CarrierFreq != fp->ul_CarrierFreq)
       LOG_A(PHY,

openair1/SIMULATION/NR_PHY/pbchsim.c

@@ -153,7 +153,6 @@ int main(int argc, char **argv)
   int ssb_scan_threads = 0;
 
   channel_desc_t *gNB2UE;
-  get_softmodem_params()->sa = 1;
   get_softmodem_params()->usim_test = 1;
 
   //uint8_t extended_prefix_flag=0;