Merge remote-tracking branch 'origin/ci-rfsim-add-channel' into integration_2024_w15

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -164,13 +164,19 @@
 #define PRACH_MASK_INDEX                54
 #define RESERVED_NR_DCI                 55
 
+// Define the UE L2 states with X-Macro
+#define NR_UE_L2_STATES \
+  UE_STATE(UE_NOT_SYNC) \
+  UE_STATE(UE_SYNC) \
+  UE_STATE(UE_PERFORMING_RA) \
+  UE_STATE(UE_CONNECTED) \
+  UE_STATE(UE_DETACHING)
+
 /*!\brief UE layer 2 status */
 typedef enum {
-  UE_NOT_SYNC = 0,
-  UE_SYNC,
-  UE_PERFORMING_RA,
-  UE_CONNECTED,
-  UE_DETACHING
+#define UE_STATE(state) state,
+  NR_UE_L2_STATES
+#undef UE_STATE
 } NR_UE_L2_STATE_t;
 
 typedef enum {

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -297,6 +297,13 @@ void configure_initial_pucch(PUCCH_sched_t *pucch, int res_ind);
 void nr_ue_reset_sync_state(NR_UE_MAC_INST_t *mac);
 void nr_ue_send_synch_request(NR_UE_MAC_INST_t *mac, module_id_t module_id, int cc_id, int cell_id);
 
+/**
+ * @brief   Get UE sync state
+ * @param   mod_id      UE ID
+ * @return      UE sync state
+ */
+NR_UE_L2_STATE_t nr_ue_get_sync_state(module_id_t mod_id);
+
 void init_RA(NR_UE_MAC_INST_t *mac,
              NR_PRACH_RESOURCES_t *prach_resources,
              NR_RACH_ConfigCommon_t *nr_rach_ConfigCommon,

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -115,6 +115,12 @@ void nr_ue_reset_sync_state(NR_UE_MAC_INST_t *mac)
   mac->ra.ra_state = nrRA_UE_IDLE;
 }
 
+NR_UE_L2_STATE_t nr_ue_get_sync_state(module_id_t mod_id)
+{
+  NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
+  return mac->state;
+}
+
 NR_UE_MAC_INST_t *nr_l2_init_ue(int nb_inst)
 {
   //init mac here