Commit ca76a666 authored by masayuki.harada's avatar masayuki.harada

Revert white space changes.

parent 18b9a795
...@@ -184,7 +184,7 @@ void RCconfig_L1(void) { ...@@ -184,7 +184,7 @@ void RCconfig_L1(void) {
if (RC.eNB[j] == NULL) { if (RC.eNB[j] == NULL) {
RC.eNB[j] = (PHY_VARS_eNB **)malloc((1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB **)); RC.eNB[j] = (PHY_VARS_eNB **)malloc((1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB **));
LOG_I(PHY,"RC.eNB[%d] = %p\n",j,RC.eNB[j]); LOG_I(PHY,"RC.eNB[%d] = %p\n",j,RC.eNB[j]);
memset(RC.eNB[j],0,(1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB ** *)); memset(RC.eNB[j],0,(1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB***));
} }
for (i=0; i<RC.nb_L1_CC[j]; i++) { for (i=0; i<RC.nb_L1_CC[j]; i++) {
...@@ -2698,7 +2698,7 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i) { ...@@ -2698,7 +2698,7 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i) {
X2AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB; X2AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB;
} else if (strcmp(*(ENBParamList.paramarray[k][ENB_CELL_TYPE_IDX].strptr), "CELL_HOME_ENB") == 0) { } else if (strcmp(*(ENBParamList.paramarray[k][ENB_CELL_TYPE_IDX].strptr), "CELL_HOME_ENB") == 0) {
X2AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB; X2AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB;
} else { }else {
AssertFatal (0, AssertFatal (0,
"Failed to parse eNB configuration file %s, enb %u unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n", "Failed to parse eNB configuration file %s, enb %u unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
RC.config_file_name, i, *(ENBParamList.paramarray[k][ENB_CELL_TYPE_IDX].strptr)); RC.config_file_name, i, *(ENBParamList.paramarray[k][ENB_CELL_TYPE_IDX].strptr));
......
This diff is collapsed.
...@@ -28,20 +28,20 @@ ...@@ -28,20 +28,20 @@
* \email: navid.nikaein@eurecom.fr * \email: navid.nikaein@eurecom.fr
*/ */
# include "rrc_defs.h" #include "rrc_defs.h"
# include "rrc_extern.h" #include "rrc_extern.h"
# include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
# include "RRC/LTE/MESSAGES/asn1_msg.h" #include "RRC/LTE/MESSAGES/asn1_msg.h"
# include "rrc_eNB_UE_context.h" #include "rrc_eNB_UE_context.h"
# include "rrc_eNB_S1AP.h" #include "rrc_eNB_S1AP.h"
# include "enb_config.h" #include "enb_config.h"
# include "common/ran_context.h" #include "common/ran_context.h"
# include "gtpv1u.h" #include "gtpv1u.h"
#include "s1ap_eNB.h" #include "s1ap_eNB.h"
# include "s1ap_eNB_defs.h" #include "s1ap_eNB_defs.h"
# include "s1ap_eNB_management_procedures.h" #include "s1ap_eNB_management_procedures.h"
# include "s1ap_eNB_ue_context.h" #include "s1ap_eNB_ue_context.h"
#include "asn1_conversions.h" #include "asn1_conversions.h"
#include "intertask_interface.h" #include "intertask_interface.h"
#include "pdcp.h" #include "pdcp.h"
...@@ -77,7 +77,7 @@ static const uint16_t S1AP_ENCRYPTION_EEA2_MASK = 0x4000; ...@@ -77,7 +77,7 @@ static const uint16_t S1AP_ENCRYPTION_EEA2_MASK = 0x4000;
static const uint16_t S1AP_INTEGRITY_EIA1_MASK = 0x8000; static const uint16_t S1AP_INTEGRITY_EIA1_MASK = 0x8000;
static const uint16_t S1AP_INTEGRITY_EIA2_MASK = 0x4000; static const uint16_t S1AP_INTEGRITY_EIA2_MASK = 0x4000;
#define INTEGRITY_ALGORITHM_NONE LTE_SecurityAlgorithmConfig__integrityProtAlgorithm_eia0_v920 #define INTEGRITY_ALGORITHM_NONE LTE_SecurityAlgorithmConfig__integrityProtAlgorithm_eia0_v920
void extract_imsi(uint8_t *pdu_buf, uint32_t pdu_len, rrc_eNB_ue_context_t *ue_context_pP) { void extract_imsi(uint8_t *pdu_buf, uint32_t pdu_len, rrc_eNB_ue_context_t *ue_context_pP) {
...@@ -1068,7 +1068,7 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char ...@@ -1068,7 +1068,7 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char
rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(&ctxt,ue_context_p); rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(&ctxt,ue_context_p);
} }
/* /*
if ((RC.rrc[ctxt.module_id]->node_type == ngran_eNB_CU) || if ((RC.rrc[ctxt.module_id]->node_type == ngran_eNB_CU) ||
(RC.rrc[ctxt.module_id]->node_type == ngran_ng_eNB_CU) || (RC.rrc[ctxt.module_id]->node_type == ngran_ng_eNB_CU) ||
(RC.rrc[ctxt.module_id]->node_type == ngran_gNB_CU) ){ (RC.rrc[ctxt.module_id]->node_type == ngran_gNB_CU) ){
...@@ -1088,7 +1088,7 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char ...@@ -1088,7 +1088,7 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char
LOG_D(RRC, "Send F1AP_UE_CONTEXT_SETUP_REQ with ITTI\n"); LOG_D(RRC, "Send F1AP_UE_CONTEXT_SETUP_REQ with ITTI\n");
} }
*/ */
return (0); return (0);
} }
} }
...@@ -2089,7 +2089,7 @@ int rrc_eNB_send_PATH_SWITCH_REQ(const protocol_ctxt_t *const ctxt_pP, ...@@ -2089,7 +2089,7 @@ int rrc_eNB_send_PATH_SWITCH_REQ(const protocol_ctxt_t *const ctxt_pP,
return 0; return 0;
} }
int rrc_eNB_process_X2AP_TUNNEL_SETUP_REQ(instance_t instance, rrc_eNB_ue_context_t* const ue_context_target_p) { int rrc_eNB_process_X2AP_TUNNEL_SETUP_REQ(instance_t instance, rrc_eNB_ue_context_t *const ue_context_target_p) {
gtpv1u_enb_create_x2u_tunnel_req_t create_tunnel_req; gtpv1u_enb_create_x2u_tunnel_req_t create_tunnel_req;
gtpv1u_enb_create_x2u_tunnel_resp_t create_tunnel_resp; gtpv1u_enb_create_x2u_tunnel_resp_t create_tunnel_resp;
uint8_t e_rab_done; uint8_t e_rab_done;
...@@ -2107,7 +2107,7 @@ int rrc_eNB_process_X2AP_TUNNEL_SETUP_REQ(instance_t instance, rrc_eNB_ue_contex ...@@ -2107,7 +2107,7 @@ int rrc_eNB_process_X2AP_TUNNEL_SETUP_REQ(instance_t instance, rrc_eNB_ue_contex
uint8_t nb_e_rabs_tosetup = ue_context_target_p->ue_context.nb_of_e_rabs; uint8_t nb_e_rabs_tosetup = ue_context_target_p->ue_context.nb_of_e_rabs;
e_rab_done = 0; e_rab_done = 0;
for (i = 0;i < nb_e_rabs_tosetup; i++) { for (i = 0; i < nb_e_rabs_tosetup; i++) {
if(ue_context_target_p->ue_context.e_rab[i].status >= E_RAB_STATUS_DONE) if(ue_context_target_p->ue_context.e_rab[i].status >= E_RAB_STATUS_DONE)
continue; continue;
...@@ -2215,7 +2215,7 @@ int rrc_eNB_process_S1AP_PATH_SWITCH_REQ_ACK (MessageDef *msg_p, ...@@ -2215,7 +2215,7 @@ int rrc_eNB_process_S1AP_PATH_SWITCH_REQ_ACK (MessageDef *msg_p,
ue_context_p->ue_context.ue_ambr=S1AP_PATH_SWITCH_REQ_ACK (msg_p).ue_ambr; ue_context_p->ue_context.ue_ambr=S1AP_PATH_SWITCH_REQ_ACK (msg_p).ue_ambr;
ue_context_p->ue_context.setup_e_rabs = ue_context_p->ue_context.setup_e_rabs - ue_context_p->ue_context.nb_release_of_e_rabs; ue_context_p->ue_context.setup_e_rabs = ue_context_p->ue_context.setup_e_rabs - ue_context_p->ue_context.nb_release_of_e_rabs;
ue_context_p->ue_context.nb_of_e_rabs = ue_context_p->ue_context.nb_of_e_rabs - ue_context_p->ue_context.nb_release_of_e_rabs; ue_context_p->ue_context.nb_of_e_rabs = ue_context_p->ue_context.nb_of_e_rabs - ue_context_p->ue_context.nb_release_of_e_rabs;
memset(&delete_tunnel_req, 0 , sizeof(delete_tunnel_req)); memset(&delete_tunnel_req, 0, sizeof(delete_tunnel_req));
if (ue_context_p->ue_context.nb_release_of_e_rabs>0) { if (ue_context_p->ue_context.nb_release_of_e_rabs>0) {
int e_rab_release_index=0; int e_rab_release_index=0;
...@@ -2235,7 +2235,7 @@ int rrc_eNB_process_S1AP_PATH_SWITCH_REQ_ACK (MessageDef *msg_p, ...@@ -2235,7 +2235,7 @@ int rrc_eNB_process_S1AP_PATH_SWITCH_REQ_ACK (MessageDef *msg_p,
} }
} }
if (ue_context_p->ue_context.nb_release_of_e_rabs>0){ if (ue_context_p->ue_context.nb_release_of_e_rabs>0) {
delete_tunnel_req.rnti= ue_context_p->ue_context.rnti; delete_tunnel_req.rnti= ue_context_p->ue_context.rnti;
delete_tunnel_req.num_erab= ue_context_p->ue_context.nb_release_of_e_rabs; delete_tunnel_req.num_erab= ue_context_p->ue_context.nb_release_of_e_rabs;
/* this could also be done through ITTI message */ /* this could also be done through ITTI message */
...@@ -2265,7 +2265,7 @@ int rrc_eNB_send_X2AP_UE_CONTEXT_RELEASE(const protocol_ctxt_t *const ctxt_pP, ...@@ -2265,7 +2265,7 @@ int rrc_eNB_send_X2AP_UE_CONTEXT_RELEASE(const protocol_ctxt_t *const ctxt_pP,
return (0); return (0);
} }
int s1ap_ue_context_release(instance_t instance, const uint32_t eNB_ue_s1ap_id){ int s1ap_ue_context_release(instance_t instance, const uint32_t eNB_ue_s1ap_id) {
s1ap_eNB_instance_t *s1ap_eNB_instance_p = NULL; s1ap_eNB_instance_t *s1ap_eNB_instance_p = NULL;
struct s1ap_eNB_ue_context_s *ue_context_p = NULL; struct s1ap_eNB_ue_context_s *ue_context_p = NULL;
s1ap_eNB_instance_p = s1ap_eNB_get_instance(instance); s1ap_eNB_instance_p = s1ap_eNB_get_instance(instance);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment