adding timers and contants functions and further code improvements

CMakeLists.txt

@@ -1445,7 +1445,7 @@ set(NR_L2_SRC_UE
   ${NR_RRC_DIR}/nr_rrc_config.c
   ${NR_UE_RRC_DIR}/rrc_UE.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
-  ${NR_RRC_DIR}/nr_rrc_config.c
+  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
   )
 
 set (MAC_SRC

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -39,9 +39,7 @@
 
 typedef uint32_t channel_t;
 
-int8_t
-nr_mac_rrc_data_ind_ue(
-    const module_id_t     module_id,
+int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
                               const int CC_id,
                               const uint8_t gNB_index,
                               const frame_t frame,
@@ -49,12 +47,13 @@ nr_mac_rrc_data_ind_ue(
                               const rnti_t rnti,
                               const channel_t channel,
                               const uint8_t* pduP,
-    const sdu_size_t      pdu_len){
+                              const sdu_size_t pdu_len)
+{
   sdu_size_t sdu_size = 0;
 
   switch(channel){
     case NR_BCCH_BCH:
-        AssertFatal( nr_rrc_ue_decode_NR_BCCH_BCH_Message(module_id, gNB_index, (uint8_t*)pduP, pdu_len) == 0, "UE decode BCCH-BCH error!\n");
+      AssertFatal(nr_rrc_ue_decode_NR_BCCH_BCH_Message(module_id, gNB_index, (uint8_t*)pduP, pdu_len) == 0, "UE decode BCCH-BCH error!\n");
       break;
 
     case NR_BCCH_DL_SCH:
@@ -121,9 +120,9 @@ int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
                               const uint8_t gNB_id,
                               const frame_t frameP,
                               const rb_id_t Srb_id,
-                              uint8_t           *buffer_pP){
-
-  switch(Srb_id){
+                              uint8_t *buffer_pP)
+{
+  switch(Srb_id) {
 
     case CCCH:
 
@@ -148,9 +147,9 @@ int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
 
 int8_t nr_rrc_RA_succeeded(const module_id_t mod_id, const uint8_t gNB_index)
 {
-  if (NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active == 1) {
+  if (NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active == true) {
     LOG_W(NR_RRC, "T304 was stoped with value %i\n", NR_UE_rrc_inst[mod_id].timers_and_constants.T304_cnt);
-    NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active = 0;
+    NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active = false;
     NR_UE_rrc_inst[mod_id].timers_and_constants.T304_cnt = 0;
   }
   return 0;

openair2/RRC/NR_UE/rrc_defs.h

@@ -224,6 +224,10 @@ typedef struct NR_UE_RRC_INST_s {
 
     NR_MIB_t *mib;
 
+    // active BWPs
+    NR_BWP_DownlinkDedicated_t *bwpd;
+    NR_BWP_UplinkDedicated_t *ubwpd;
+
     /* KeNB as computed from parameters within USIM card */
     uint8_t kgnb[32];
     /* Used integrity/ciphering algorithms */

openair2/RRC/NR_UE/rrc_proto.h

@@ -169,6 +169,14 @@ void process_lte_nsa_msg(nsa_msg_t *msg, int msg_len);
 
 int get_from_lte_ue_fd();
 
+void configure_spcell(NR_UE_RRC_INST_t *rrc, NR_SpCellConfig_t *spcell_config);
+void reset_rlf_timers_and_constants(NR_UE_Timers_Constants_t *tac);
+void set_default_timers_and_constants(NR_UE_Timers_Constants_t *tac);
+void nr_rrc_set_sib1_timers_and_constants(NR_UE_Timers_Constants_t *tac, NR_SIB1_t *sib1);
+void nr_rrc_set_T304(NR_UE_Timers_Constants_t *tac, NR_ReconfigurationWithSync_t *reconfigurationWithSync);
+void nr_rrc_handle_SetupRelease_RLF_TimersAndConstants(NR_UE_RRC_INST_t *rrc,
+                                                       struct NR_SetupRelease_RLF_TimersAndConstants *rlf_TimersAndConstants);
+
 /** @}*/
 #endif