From 9a080adec57d9761babe49d2a1238a071e670a36 Mon Sep 17 00:00:00 2001 From: Louis Adrien Dufrene Date: Tue, 13 Nov 2018 14:20:16 +0100 Subject: [PATCH] RRC inactivity timer: first commit to DRX_master --- openair2/LAYER2/MAC/eNB_scheduler_dlsch.c | 13 +------------ openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 16 ++-------------- openair2/RRC/LTE/rrc_eNB_S1AP.c | 3 +-- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c index 76dbd2a0a1..a79b273a81 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c @@ -43,10 +43,6 @@ #include "RRC/LTE/rrc_extern.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" -/************************************************/ -//#include "RRC/LTE/rrc_eNB_UE_context.h" -//#include "RRC/LTE/rrc_defs.h" -/************************************************/ //#include "LAYER2/MAC/pre_processor.c" #include "pdcp.h" @@ -470,7 +466,7 @@ schedule_ue_spec(module_id_t module_idP, int slice_idxP, int header_length_last; int header_length_total; - rrc_eNB_ue_context_t *ue_contextP; // added by LA + rrc_eNB_ue_context_t *ue_contextP = NULL; start_meas(&eNB->schedule_dlsch); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_IN); @@ -1116,13 +1112,6 @@ schedule_ue_spec(module_id_t module_idP, int slice_idxP, ue_contextP = rrc_eNB_get_ue_context(RC.rrc[module_idP], rnti); ue_contextP->ue_context.ue_rrc_inactivity_timer = 1; - LOG_W(RRC, "After reset, rrc_inactivity_timer is %d, of UE rntiP %d, ue_context_rnti %d, UE_id %d, ue_initial_id %d\n", - ue_contextP->ue_context.ue_rrc_inactivity_timer, - rnti, - ue_contextP->ue_id_rnti, - UE_id, - ue_contextP->ue_context.ue_initial_id); - } // end if (rlc_status.bytes_in_buffer > 0) } else { // no TBS left break; // break for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c index fcd87d926a..997877d7a8 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c @@ -45,10 +45,6 @@ #include "RRC/LTE/rrc_extern.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" -/************************************************/ -//#include "RRC/LTE/rrc_eNB_UE_context.h" -//#include "RRC/LTE/rrc_defs.h" -/************************************************/ #include "assertions.h" //#include "LAYER2/MAC/pre_processor.c" @@ -115,7 +111,7 @@ rx_sdu(const module_id_t enb_mod_idP, (RA_t *) & RC.mac[enb_mod_idP]->common_channels[CC_idP].ra[0]; int first_rb = 0; - rrc_eNB_ue_context_t *ue_contextP; // added by LA + rrc_eNB_ue_context_t *ue_contextP = NULL; start_meas(&mac->rx_ulsch_sdu); @@ -743,15 +739,7 @@ rx_sdu(const module_id_t enb_mod_idP, // reset RRC inactivity timer after uplane activity ue_contextP = rrc_eNB_get_ue_context(RC.rrc[enb_mod_idP], rntiP); - ue_contextP->ue_context.ue_rrc_inactivity_timer = 1; - - LOG_W(RRC, "After reset, rrc_inactivity_timer is %d, of UE rntiP %d, ue_context_rnti %d, UE_id %d, ue_initial_id %d\n", - ue_contextP->ue_context.ue_rrc_inactivity_timer, - rntiP, - ue_contextP->ue_id_rnti, - UE_id, - ue_contextP->ue_context.ue_initial_id); - + ue_contextP->ue_context.ue_rrc_inactivity_timer = 1; } else { /* rx_length[i] */ UE_list->eNB_UE_stats[CC_idP][UE_id].num_errors_rx += 1; diff --git a/openair2/RRC/LTE/rrc_eNB_S1AP.c b/openair2/RRC/LTE/rrc_eNB_S1AP.c index 5fd32d038a..b7d15da58d 100644 --- a/openair2/RRC/LTE/rrc_eNB_S1AP.c +++ b/openair2/RRC/LTE/rrc_eNB_S1AP.c @@ -36,11 +36,10 @@ # include "rrc_eNB_S1AP.h" # include "enb_config.h" # include "common/ran_context.h" -/****************************************/ + # include "s1ap_eNB_defs.h" # include "s1ap_eNB_management_procedures.h" # include "s1ap_eNB_ue_context.h" -/****************************************/ # if defined(ENABLE_ITTI) # include "asn1_conversions.h"