maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build issue without ITTI enabled.

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4826 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2014-01-07 14:01:49 +00:00
parent 6de0b4b35d
commit 31726e8a85
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LITE/rrc_UE.c
+22 -12
View File
@@ -117,15 +117,19 @@ static int rrc_set_state (u8 Mod_id, Rrc_State_t state) {
"Invalid state %d!\n", state); "Invalid state %d!\n", state);
if (UE_rrc_inst[Mod_id].RrcState != state) { if (UE_rrc_inst[Mod_id].RrcState != state) {
MessageDef *msg_p;
UE_rrc_inst[Mod_id].RrcState = state; UE_rrc_inst[Mod_id].RrcState = state;
msg_p = itti_alloc_new_message(TASK_RRC_UE, RRC_STATE_IND); #if defined(ENABLE_ITTI)
RRC_STATE_IND(msg_p).state = UE_rrc_inst[Mod_id].RrcState; {
RRC_STATE_IND(msg_p).sub_state = UE_rrc_inst[Mod_id].RrcSubState; MessageDef *msg_p;
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); msg_p = itti_alloc_new_message(TASK_RRC_UE, RRC_STATE_IND);
RRC_STATE_IND(msg_p).state = UE_rrc_inst[Mod_id].RrcState;
RRC_STATE_IND(msg_p).sub_state = UE_rrc_inst[Mod_id].RrcSubState;
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
}
#endif
return (1); return (1);
} }
@@ -133,6 +137,7 @@ static int rrc_set_state (u8 Mod_id, Rrc_State_t state) {
} }
static int rrc_set_sub_state (u8 Mod_id, Rrc_Sub_State_t subState) { static int rrc_set_sub_state (u8 Mod_id, Rrc_Sub_State_t subState) {
#if defined(ENABLE_ITTI)
switch (UE_rrc_inst[Mod_id].RrcState) { switch (UE_rrc_inst[Mod_id].RrcState) {
case RRC_STATE_INACTIVE: case RRC_STATE_INACTIVE:
AssertFatal ((RRC_SUB_STATE_INACTIVE_FIRST <= subState) && (subState <= RRC_SUB_STATE_INACTIVE_LAST), AssertFatal ((RRC_SUB_STATE_INACTIVE_FIRST <= subState) && (subState <= RRC_SUB_STATE_INACTIVE_LAST),
@@ -149,17 +154,22 @@ static int rrc_set_sub_state (u8 Mod_id, Rrc_Sub_State_t subState) {
"Invalid sub state %d for state %d!\n", subState, UE_rrc_inst[Mod_id].RrcState); "Invalid sub state %d for state %d!\n", subState, UE_rrc_inst[Mod_id].RrcState);
break; break;
} }
#endif
if (UE_rrc_inst[Mod_id].RrcSubState != subState) { if (UE_rrc_inst[Mod_id].RrcSubState != subState) {
MessageDef *msg_p;
UE_rrc_inst[Mod_id].RrcSubState = subState; UE_rrc_inst[Mod_id].RrcSubState = subState;
msg_p = itti_alloc_new_message(TASK_RRC_UE, RRC_STATE_IND); #if defined(ENABLE_ITTI)
RRC_STATE_IND(msg_p).state = UE_rrc_inst[Mod_id].RrcState; {
RRC_STATE_IND(msg_p).sub_state = UE_rrc_inst[Mod_id].RrcSubState; MessageDef *msg_p;
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p); msg_p = itti_alloc_new_message(TASK_RRC_UE, RRC_STATE_IND);
RRC_STATE_IND(msg_p).state = UE_rrc_inst[Mod_id].RrcState;
RRC_STATE_IND(msg_p).sub_state = UE_rrc_inst[Mod_id].RrcSubState;
itti_send_msg_to_task(TASK_UNKNOWN, NB_eNB_INST + Mod_id, msg_p);
}
#endif
return (1); return (1);
} }