Merge remote-tracking branch 'origin/NR_UE_MAC_PHY_separation_improvements' into integration_2024_w35

openair1/PHY/INIT/nr_init_ue.c

@@ -35,6 +35,7 @@
 #include "PHY/NR_REFSIG/nr_mod_table.h"
 #include "openair2/COMMON/prs_nr_paramdef.h"
 #include "SCHED_NR_UE/harq_nr.h"
+#include "nr-uesoftmodem.h"
 
 void RCconfig_nrUE_prs(void *cfg)
 {
@@ -277,15 +278,14 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
   }
 
   ue->init_averaging = 1;
-
-  // enable MIB/SIB decoding by default
-  ue->decode_MIB = 1;
-  ue->decode_SIB = 1;
-
   init_nr_prach_tables(839);
   init_symbol_rotation(fp);
   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)
+    ue->received_config_request = false;
+
   return 0;
 }
 

openair1/PHY/defs_nr_UE.h

@@ -384,7 +384,7 @@ typedef struct PHY_VARS_NR_UE_s {
   NR_UE_COMMON    common_vars;
 
   nr_ue_if_module_t *if_inst;
-
+  bool received_config_request;
   fapi_nr_config_request_t nrUE_config;
   nr_synch_request_t synch_request;
 
@@ -450,11 +450,9 @@ typedef struct PHY_VARS_NR_UE_s {
   int dlsch_mtch_errors[MAX_MBSFN_AREA][NUMBER_OF_CONNECTED_gNB_MAX];
   int dlsch_mcch_trials[MAX_MBSFN_AREA][NUMBER_OF_CONNECTED_gNB_MAX];
   int dlsch_mtch_trials[MAX_MBSFN_AREA][NUMBER_OF_CONNECTED_gNB_MAX];
-  uint8_t               decode_SIB;
-  uint8_t               decode_MIB;
-  uint8_t               init_sync_frame;
+  uint8_t init_sync_frame;
   /// temporary offset during cell search prior to MIB decoding
-  int              ssb_offset;
+  int ssb_offset;
   uint16_t symbol_offset; /// offset in terms of symbols for detected ssb in sync
   int64_t max_pos_iir; /// Timing offset IIR filter
   int max_pos_acc; /// Timing offset accumuluated error for PI filter

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -549,13 +549,14 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response)
   return 0;
 }
 
-int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config)
+void nr_ue_phy_config_request(nr_phy_config_t *phy_config)
 {
-  fapi_nr_config_request_t *nrUE_config = &PHY_vars_UE_g[phy_config->Mod_id][phy_config->CC_id]->nrUE_config;
+  PHY_VARS_NR_UE *phy = PHY_vars_UE_g[phy_config->Mod_id][phy_config->CC_id];
+  fapi_nr_config_request_t *nrUE_config = &phy->nrUE_config;
   if(phy_config != NULL) {
+    phy->received_config_request = true;
     memcpy(nrUE_config, &phy_config->config_req, sizeof(fapi_nr_config_request_t));
   }
-  return 0;
 }
 
 void nr_ue_synch_request(nr_synch_request_t *synch_request)
@@ -567,8 +568,10 @@ void nr_ue_synch_request(nr_synch_request_t *synch_request)
 
 void nr_ue_sl_phy_config_request(nr_sl_phy_config_t *phy_config)
 {
-  sl_nr_phy_config_request_t *sl_config = &PHY_vars_UE_g[phy_config->Mod_id][phy_config->CC_id]->SL_UE_PHY_PARAMS.sl_config;
+  PHY_VARS_NR_UE *phy = PHY_vars_UE_g[phy_config->Mod_id][phy_config->CC_id];
+  sl_nr_phy_config_request_t *sl_config = &phy->SL_UE_PHY_PARAMS.sl_config;
   if (phy_config != NULL) {
+    phy->received_config_request = true;
     memcpy(sl_config, &phy_config->sl_config_req, sizeof(sl_nr_phy_config_request_t));
   }
 }

openair1/SCHED_NR_UE/fapi_nr_ue_l1.h

@@ -46,7 +46,7 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
 
 /**\brief NR UE FAPI-like P5 message, physical configuration from L2 to configure L1
    \param scheduled_response including transmission config(dl_config, ul_config) and data transmission (tx_req)*/
-int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config);
+void nr_ue_phy_config_request(nr_phy_config_t *phy_config);
 void nr_ue_sl_phy_config_request(nr_sl_phy_config_t *phy_config);
 
 /**\brief NR UE FAPI message to schedule a synchronization with target gNB