improvements in config_common_ue

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h

@@ -662,7 +662,7 @@ typedef struct
 typedef struct 
 {
   uint8_t prach_sequence_length;//RACH sequence length. Only short sequence length is supported for FR2. [38.211, sec 6.3.3.1] Value: 0 = Long sequence 1 = Short sequence
-  uint8_t prach_sub_c_spacing;//Subcarrier spacing of PRACH. [38.211 sec 4.2] Value:0->4
+  uint8_t prach_sub_c_spacing;//Subcarrier spacing of PRACH. [38.211 sec 4.2] Value: 0: 15 kHz 1: 30 kHz 2: 60 kHz 3: 120 kHz 4: 1.25 kHz 5: 5 kHz
   uint8_t restricted_set_config;//PRACH restricted set config Value: 0: unrestricted 1: restricted set type A 2: restricted set type B
   uint8_t num_prach_fd_occasions;//Corresponds to the parameter 𝑀 in [38.211, sec 6.3.3.2] which equals the higher layer parameter msg1FDM Value: 1,2,4,8
   fapi_nr_num_prach_fd_occasions_t* num_prach_fd_occasions_list;

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -435,13 +435,12 @@ typedef struct nr_lcordered_info_s {
 /*!\brief Top level UE MAC structure */
 typedef struct {
   NR_UE_L2_STATE_t state;
-  int                             servCellIndex;
-  long                            physCellId;
-  ////  MAC config
-  int                             first_sync_frame;
-  bool                            get_sib1;
-  bool                            get_otherSI;
-  NR_MIB_t                        *mib;
+  int servCellIndex;
+  long physCellId;
+  int first_sync_frame;
+  bool get_sib1;
+  bool get_otherSI;
+  NR_MIB_t *mib;
   struct NR_SI_SchedulingInfo *si_SchedulingInfo;
   int si_window_start;
   ssb_list_info_t ssb_list;

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -39,6 +39,12 @@
 #define NR_DL_MAX_DAI                            (4)                      /* TS 38.213 table 9.1.3-1 Value of counter DAI for DCI format 1_0 and 1_1 */
 #define NR_DL_MAX_NB_CW                          (2)                      /* number of downlink code word */
 
+#define updateMACie(destination, origin, type) {  \
+  type *tmp = origin;                             \
+  origin = destination;                           \
+  destination = tmp;                              \
+}                                                 \
+
 /**\brief initialize the field in nr_mac instance
    \param module_id      module id */
 void nr_ue_init_mac(module_id_t module_idP);

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -167,6 +167,7 @@ void nr_ue_init_mac(module_id_t module_idP)
   mac->get_sib1 = false;
   mac->get_otherSI = false;
   mac->phy_config_request_sent = false;
+  memset(&mac->phy_config, 0, sizeof(mac->phy_config));
   mac->state = UE_NOT_SYNC;
   mac->si_window_start = -1;
   mac->servCellIndex = 0;