passing rrc pointer instead of instance inside rrc functions

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -108,6 +108,16 @@ void nr_mac_rrc_msg3_ind(const module_id_t mod_id, const int rnti)
   itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(mod_id), message_p);
 }
 
+void nr_ue_rrc_timer_trigger(int instance, int frame, int gnb_id)
+{
+  MessageDef *message_p;
+  message_p = itti_alloc_new_message(TASK_RRC_NRUE, 0, NRRRC_FRAME_PROCESS);
+  NRRRC_FRAME_PROCESS(message_p).frame = frame;
+  NRRRC_FRAME_PROCESS(message_p).gnb_id = gnb_id;
+  LOG_D(NR_RRC, "RRC timer trigger: frame %d\n", frame);
+  itti_send_msg_to_task(TASK_RRC_NRUE, instance, message_p);
+}
+
 void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success)
 {
   MessageDef *message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_RA_IND);

openair2/RRC/NR_UE/rrc_proto.h

@@ -58,9 +58,7 @@ void init_nsa_message (NR_UE_RRC_INST_t *rrc, char* reconfig_file, char* rbconfi
 
 void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type, void *message, int msg_len);
 
-void nr_rrc_cellgroup_configuration(rrcPerNB_t *rrcNB,
-                                    instance_t instance,
-                                    NR_CellGroupConfig_t *cellGroupConfig);
+void nr_rrc_cellgroup_configuration(rrcPerNB_t *rrcNB, NR_UE_RRC_INST_t *rrc, NR_CellGroupConfig_t *cellGroupConfig);
 
 /**\brief interface between MAC and RRC thru SRB0 (RLC TM/no PDCP)
    \param module_id  module id
@@ -83,7 +81,7 @@ void nr_mac_rrc_sync_ind(const module_id_t module_id,
                          const frame_t frame,
                          const bool in_sync);
 
-void nr_rrc_going_to_IDLE(instance_t instance,
+void nr_rrc_going_to_IDLE(NR_UE_RRC_INST_t *rrc,
                           NR_Release_Cause_t release_cause,
                           NR_RRCRelease_t *RRCRelease);
 
@@ -95,7 +93,7 @@ void nr_mac_rrc_msg3_ind(const module_id_t mod_id, const int rnti);
 void *rrc_nrue_task(void *args_p);
 void *rrc_nrue(void *args_p);
 
-void nr_rrc_handle_timers(NR_UE_RRC_INST_t *rrc, instance_t instance);
+void nr_rrc_handle_timers(NR_UE_RRC_INST_t *rrc);
 
 /**\brief RRC NSA UE task.
    \param void *args_p Pointer on arguments to start the task. */
@@ -112,7 +110,7 @@ int get_from_lte_ue_fd();
 void nr_rrc_SI_timers(NR_UE_RRC_SI_INFO *SInfo);
 
 void nr_ue_rrc_timer_trigger(int module_id, int frame, int gnb_id);
-void handle_t300_expiry(instance_t instance);
+void handle_t300_expiry(NR_UE_RRC_INST_t *rrc);
 
 void reset_rlf_timers_and_constants(NR_UE_Timers_Constants_t *tac);
 void set_default_timers_and_constants(NR_UE_Timers_Constants_t *tac);

openair2/RRC/NR_UE/rrc_timers_and_constants.c

@@ -98,7 +98,7 @@ void nr_rrc_SI_timers(NR_UE_RRC_SI_INFO *SInfo)
   }
 }
 
-void nr_rrc_handle_timers(NR_UE_RRC_INST_t *rrc, instance_t instance)
+void nr_rrc_handle_timers(NR_UE_RRC_INST_t *rrc)
 {
   NR_UE_Timers_Constants_t *timers = &rrc->timers_and_constants;
 
@@ -107,7 +107,7 @@ void nr_rrc_handle_timers(NR_UE_RRC_INST_t *rrc, instance_t instance)
     if(timers->T300_cnt >= timers->T300_k) {
       timers->T300_active = false;
       timers->T300_cnt = 0;
-      handle_t300_expiry(instance);
+      handle_t300_expiry(rrc);
     }
   }
   if (timers->T304_active == true) {
@@ -134,7 +134,7 @@ void nr_rrc_handle_timers(NR_UE_RRC_INST_t *rrc, instance_t instance)
     if(timers->T311_cnt >= timers->T311_k) {
       // Upon T311 expiry, the UE shall perform the actions upon going to RRC_IDLE
       // with release cause 'RRC connection failure'
-      nr_rrc_going_to_IDLE(instance, RRC_CONNECTION_FAILURE, NULL);
+      nr_rrc_going_to_IDLE(rrc, RRC_CONNECTION_FAILURE, NULL);
     }
   }
 }