From cf07c4d394a4c1bfc17dac27d3fbc539b58cd618 Mon Sep 17 00:00:00 2001
From: Louis Adrien Dufrene <swmt1841@yd-CZC6227X3N.orangeai.mey>
Date: Tue, 20 Nov 2018 16:39:05 +0100
Subject: [PATCH] astyle applied
---
openair2/COMMON/rrc_messages_types.h | 130 +++++++++++++--------------
openair2/ENB_APP/enb_config.c | 3 +-
openair2/RRC/LTE/rrc_eNB.c | 9 +-
3 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index d7f6a67d78a..c1b554c216d 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -33,9 +33,9 @@
#include "rrc_types.h"
#include "s1ap_messages_types.h"
#ifdef CMAKER
-#include "LTE_SystemInformationBlockType2.h"
+ #include "LTE_SystemInformationBlockType2.h"
#else
-#include "RRC/LTE/MESSAGES/LTE_SystemInformationBlockType2.h"
+ #include "RRC/LTE/MESSAGES/LTE_SystemInformationBlockType2.h"
#endif
#include "LTE_SL-OffsetIndicator-r12.h"
#include "LTE_SubframeBitmapSL-r12.h"
@@ -47,19 +47,19 @@
//-------------------------------------------------------------------------------------------//
// Messages for RRC logging
#if defined(DISABLE_ITTI_XER_PRINT)
-#include "LTE_BCCH-DL-SCH-Message.h"
-#include "LTE_DL-CCCH-Message.h"
-#include "LTE_DL-DCCH-Message.h"
-#include "LTE_UE-EUTRA-Capability.h"
-#include "LTE_UL-CCCH-Message.h"
-#include "LTE_UL-DCCH-Message.h"
+ #include "LTE_BCCH-DL-SCH-Message.h"
+ #include "LTE_DL-CCCH-Message.h"
+ #include "LTE_DL-DCCH-Message.h"
+ #include "LTE_UE-EUTRA-Capability.h"
+ #include "LTE_UL-CCCH-Message.h"
+ #include "LTE_UL-DCCH-Message.h"
-typedef BCCH_DL_SCH_Message_t RrcDlBcchMessage;
-typedef DL_CCCH_Message_t RrcDlCcchMessage;
-typedef DL_DCCH_Message_t RrcDlDcchMessage;
-typedef UE_EUTRA_Capability_t RrcUeEutraCapability;
-typedef UL_CCCH_Message_t RrcUlCcchMessage;
-typedef UL_DCCH_Message_t RrcUlDcchMessage;
+ typedef BCCH_DL_SCH_Message_t RrcDlBcchMessage;
+ typedef DL_CCCH_Message_t RrcDlCcchMessage;
+ typedef DL_DCCH_Message_t RrcDlDcchMessage;
+ typedef UE_EUTRA_Capability_t RrcUeEutraCapability;
+ typedef UL_CCCH_Message_t RrcUlCcchMessage;
+ typedef UL_DCCH_Message_t RrcUlDcchMessage;
#endif
//-------------------------------------------------------------------------------------------//
@@ -103,7 +103,7 @@ typedef struct RrcConfigurationReq_s {
uint8_t num_plmn;
uint32_t rrc_inactivity_timer_thres; // for testing, maybe change later
-
+
paging_drx_t default_drx;
int16_t nb_cc;
lte_frame_type_t frame_type[MAX_NUM_CCs];
@@ -125,9 +125,9 @@ typedef struct RrcConfigurationReq_s {
long pucch_delta_shift[MAX_NUM_CCs];
long pucch_nRB_CQI[MAX_NUM_CCs];
long pucch_nCS_AN[MAX_NUM_CCs];
-//#if (LTE_RRC_VERSION < MAKE_VERSION(10, 0, 0))
+ //#if (LTE_RRC_VERSION < MAKE_VERSION(10, 0, 0))
long pucch_n1_AN[MAX_NUM_CCs];
-//#endif
+ //#endif
long pdsch_referenceSignalPower[MAX_NUM_CCs];
long pdsch_p_b[MAX_NUM_CCs];
long pusch_n_SB[MAX_NUM_CCs];
@@ -189,7 +189,7 @@ typedef struct RrcConfigurationReq_s {
LTE_SL_OffsetIndicator_r12_PR rxPool_ResourceConfig_offsetIndicator_present[MAX_NUM_CCs];
long rxPool_ResourceConfig_offsetIndicator_choice[MAX_NUM_CCs];
LTE_SubframeBitmapSL_r12_PR rxPool_ResourceConfig_subframeBitmap_present[MAX_NUM_CCs];
- char* rxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
+ char *rxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
long rxPool_ResourceConfig_subframeBitmap_choice_bs_size[MAX_NUM_CCs];
long rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
@@ -205,7 +205,7 @@ typedef struct RrcConfigurationReq_s {
LTE_SL_OffsetIndicator_r12_PR discRxPool_ResourceConfig_offsetIndicator_present[MAX_NUM_CCs];
long discRxPool_ResourceConfig_offsetIndicator_choice[MAX_NUM_CCs];
LTE_SubframeBitmapSL_r12_PR discRxPool_ResourceConfig_subframeBitmap_present[MAX_NUM_CCs];
- char* discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
+ char *discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
long discRxPool_ResourceConfig_subframeBitmap_choice_bs_size[MAX_NUM_CCs];
long discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
//for discRxPoolPS
@@ -219,7 +219,7 @@ typedef struct RrcConfigurationReq_s {
LTE_SL_OffsetIndicator_r12_PR discRxPoolPS_ResourceConfig_offsetIndicator_present[MAX_NUM_CCs];
long discRxPoolPS_ResourceConfig_offsetIndicator_choice[MAX_NUM_CCs];
LTE_SubframeBitmapSL_r12_PR discRxPoolPS_ResourceConfig_subframeBitmap_present[MAX_NUM_CCs];
- char* discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
+ char *discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
long discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_size[MAX_NUM_CCs];
long discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
} RrcConfigurationReq;
@@ -231,69 +231,69 @@ typedef struct NbIoTRrcConfigurationReq_s {
uint16_t tac;
- uint16_t mcc;
- uint16_t mnc;
- uint8_t mnc_digit_length;
- lte_frame_type_t frame_type;
+ uint16_t mcc;
+ uint16_t mnc;
+ uint8_t mnc_digit_length;
+ lte_frame_type_t frame_type;
uint8_t tdd_config;
uint8_t tdd_config_s;
lte_prefix_type_t prefix_type;
- lte_prefix_type_t prefix_type_UL;
+ lte_prefix_type_t prefix_type_UL;
int16_t eutra_band;
uint32_t downlink_frequency;
int32_t uplink_frequency_offset;
int16_t Nid_cell;// for testing, change later
int16_t N_RB_DL;// for testing, change later
//RACH
- long rach_raResponseWindowSize_NB;
- long rach_macContentionResolutionTimer_NB;
- long rach_powerRampingStep_NB;
- long rach_preambleInitialReceivedTargetPower_NB;
- long rach_preambleTransMax_CE_NB;
+ long rach_raResponseWindowSize_NB;
+ long rach_macContentionResolutionTimer_NB;
+ long rach_powerRampingStep_NB;
+ long rach_preambleInitialReceivedTargetPower_NB;
+ long rach_preambleTransMax_CE_NB;
//BCCH
- long bcch_modificationPeriodCoeff_NB;
+ long bcch_modificationPeriodCoeff_NB;
//PCCH
- long pcch_defaultPagingCycle_NB;
- long pcch_nB_NB;
- long pcch_npdcch_NumRepetitionPaging_NB;
+ long pcch_defaultPagingCycle_NB;
+ long pcch_nB_NB;
+ long pcch_npdcch_NumRepetitionPaging_NB;
//NPRACH
- long nprach_CP_Length;
- long nprach_rsrp_range;
- long nprach_Periodicity[MAX_NUM_NBIOT_CELEVELS];
- long nprach_StartTime[MAX_NUM_NBIOT_CELEVELS];
- long nprach_SubcarrierOffset[MAX_NUM_NBIOT_CELEVELS];
- long nprach_NumSubcarriers[MAX_NUM_NBIOT_CELEVELS];
- long numRepetitionsPerPreambleAttempt_NB[MAX_NUM_NBIOT_CELEVELS];
- long nprach_SubcarrierMSG3_RangeStart;
- long maxNumPreambleAttemptCE_NB;
- long npdcch_NumRepetitions_RA[MAX_NUM_NBIOT_CELEVELS];
- long npdcch_StartSF_CSS_RA[MAX_NUM_NBIOT_CELEVELS];
- long npdcch_Offset_RA[MAX_NUM_NBIOT_CELEVELS];
+ long nprach_CP_Length;
+ long nprach_rsrp_range;
+ long nprach_Periodicity[MAX_NUM_NBIOT_CELEVELS];
+ long nprach_StartTime[MAX_NUM_NBIOT_CELEVELS];
+ long nprach_SubcarrierOffset[MAX_NUM_NBIOT_CELEVELS];
+ long nprach_NumSubcarriers[MAX_NUM_NBIOT_CELEVELS];
+ long numRepetitionsPerPreambleAttempt_NB[MAX_NUM_NBIOT_CELEVELS];
+ long nprach_SubcarrierMSG3_RangeStart;
+ long maxNumPreambleAttemptCE_NB;
+ long npdcch_NumRepetitions_RA[MAX_NUM_NBIOT_CELEVELS];
+ long npdcch_StartSF_CSS_RA[MAX_NUM_NBIOT_CELEVELS];
+ long npdcch_Offset_RA[MAX_NUM_NBIOT_CELEVELS];
//NPDSCH
- long npdsch_nrs_Power;
+ long npdsch_nrs_Power;
//NPUSCH
- long npusch_ack_nack_numRepetitions_NB;
- long npusch_srs_SubframeConfig_NB;
- long npusch_threeTone_CyclicShift_r13;
- long npusch_sixTone_CyclicShift_r13;
- BOOLEAN_t npusch_groupHoppingEnabled;
- long npusch_groupAssignmentNPUSCH_r13;
+ long npusch_ack_nack_numRepetitions_NB;
+ long npusch_srs_SubframeConfig_NB;
+ long npusch_threeTone_CyclicShift_r13;
+ long npusch_sixTone_CyclicShift_r13;
+ BOOLEAN_t npusch_groupHoppingEnabled;
+ long npusch_groupAssignmentNPUSCH_r13;
//DL_GapConfig
- long dl_GapThreshold_NB;
- long dl_GapPeriodicity_NB;
- long dl_GapDurationCoeff_NB;
+ long dl_GapThreshold_NB;
+ long dl_GapPeriodicity_NB;
+ long dl_GapDurationCoeff_NB;
//Uplink power control Common
- long npusch_p0_NominalNPUSCH;
- long npusch_alpha;
- long deltaPreambleMsg3;
+ long npusch_p0_NominalNPUSCH;
+ long npusch_alpha;
+ long deltaPreambleMsg3;
//UE timers and constants
- long ue_TimersAndConstants_t300_NB;
- long ue_TimersAndConstants_t301_NB;
- long ue_TimersAndConstants_t310_NB;
- long ue_TimersAndConstants_t311_NB;
- long ue_TimersAndConstants_n310_NB;
- long ue_TimersAndConstants_n311_NB;
+ long ue_TimersAndConstants_t300_NB;
+ long ue_TimersAndConstants_t301_NB;
+ long ue_TimersAndConstants_t310_NB;
+ long ue_TimersAndConstants_t311_NB;
+ long ue_TimersAndConstants_n310_NB;
+ long ue_TimersAndConstants_n311_NB;
} NbIoTRrcConfigurationReq;
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 45f369365bf..8ad536c5f97 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -582,7 +582,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
PLMNParams[I].chkPptr = &(config_check_PLMNParams[I]);
RRC_CONFIGURATION_REQ (msg_p).rrc_inactivity_timer_thres = RRC_INACTIVITY_THRESH; // set to 0 to deactivate
-
RRC_CONFIGURATION_REQ (msg_p).cell_identity = enb_id;
RRC_CONFIGURATION_REQ (msg_p).tac = *ENBParamList.paramarray[i][ENB_TRACKING_AREA_CODE_IDX].uptr;
AssertFatal(!ENBParamList.paramarray[i][ENB_MOBILE_COUNTRY_CODE_IDX_OLD].strptr
@@ -2312,7 +2311,7 @@ int RCconfig_S1(
default: {
LOG_E(S1AP, "Default I-DRX value in conf file is invalid (%i). Should be 32, 64, 128 or 256. \
- Default DRX set to 32 in MME configuration\n",
+ Default DRX set to 32 in MME configuration\n",
pcch_defaultPagingCycle);
S1AP_REGISTER_ENB_REQ(msg_p).default_drx = 0;
}
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 01d4e511de9..eab4ce4ed33 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -7380,7 +7380,8 @@ rrc_rx_tx(
if ((ue_context_p->ue_context.ue_rrc_inactivity_timer > 0) && (RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres > 0)) {
ue_context_p->ue_context.ue_rrc_inactivity_timer++; // (un)comment this line to (de)activate the RRC inactivity timer
- if (ue_context_p->ue_context.ue_rrc_inactivity_timer >= RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres){
+
+ if (ue_context_p->ue_context.ue_rrc_inactivity_timer >= RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres) {
LOG_I(RRC, "Removing UE %x instance because of rrc_inactivity_timer timeout\n",
ue_context_p->ue_context.rnti);
ue_to_be_removed = ue_context_p;
@@ -7421,8 +7422,8 @@ rrc_rx_tx(
if (ue_to_be_removed) {
if ((ue_to_be_removed->ue_context.ul_failure_timer >= 20000) ||
- ((ue_to_be_removed->ue_context.ue_rrc_inactivity_timer >= RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres) &&
- (RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres > 0))) {
+ ((ue_to_be_removed->ue_context.ue_rrc_inactivity_timer >= RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres) &&
+ (RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres > 0))) {
ue_to_be_removed->ue_context.ue_release_timer_s1 = 1;
ue_to_be_removed->ue_context.ue_release_timer_thres_s1 = 100;
ue_to_be_removed->ue_context.ue_release_timer = 0;
@@ -7436,7 +7437,7 @@ rrc_rx_tx(
}
if ((ue_to_be_removed->ue_context.ue_rrc_inactivity_timer >= RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres) &&
- (RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres > 0)) {
+ (RC.rrc[ctxt_pP->module_id]->configuration.rrc_inactivity_timer_thres > 0)) {
ue_to_be_removed->ue_context.ue_rrc_inactivity_timer = 0; //reset timer after S1 command UE context release request is sent
}
}
--
GitLab