Commit b0734604 authored by Laurent THOMAS's avatar Laurent THOMAS Committed by Robert Schmidt

Remove useless RRC states

parent a54eba8f
......@@ -241,18 +241,24 @@ static int rrc_set_sub_state( module_id_t ue_mod_idP, Rrc_Sub_State_t subState )
if (!IS_SOFTMODEM_NOS1) {
switch (UE_rrc_inst[ue_mod_idP].RrcState) {
case RRC_STATE_INACTIVE:
AssertFatal ((RRC_SUB_STATE_INACTIVE_FIRST <= subState) && (subState <= RRC_SUB_STATE_INACTIVE_LAST),
"Invalid sub state %d for state %d!\n", subState, UE_rrc_inst[ue_mod_idP].RrcState);
AssertFatal(RRC_SUB_STATE_INACTIVE <= subState,
"Invalid sub state %d for state %d!\n",
subState,
UE_rrc_inst[ue_mod_idP].RrcState);
break;
case RRC_STATE_IDLE:
AssertFatal ((RRC_SUB_STATE_IDLE_FIRST <= subState) && (subState <= RRC_SUB_STATE_IDLE_LAST),
"Invalid sub state %d for state %d!\n", subState, UE_rrc_inst[ue_mod_idP].RrcState);
AssertFatal((RRC_SUB_STATE_IDLE_SEARCHING <= subState) && (subState <= RRC_SUB_STATE_IDLE),
"Invalid sub state %d for state %d!\n",
subState,
UE_rrc_inst[ue_mod_idP].RrcState);
break;
case RRC_STATE_CONNECTED:
AssertFatal ((RRC_SUB_STATE_CONNECTED_FIRST <= subState) && (subState <= RRC_SUB_STATE_CONNECTED_LAST),
"Invalid sub state %d for state %d!\n", subState, UE_rrc_inst[ue_mod_idP].RrcState);
AssertFatal(RRC_SUB_STATE_CONNECTED <= subState,
"Invalid sub state %d for state %d!\n",
subState,
UE_rrc_inst[ue_mod_idP].RrcState);
break;
}
}
......
......@@ -41,7 +41,7 @@ typedef enum Rrc_State_e {
} Rrc_State_t;
typedef enum Rrc_Sub_State_e {
RRC_SUB_STATE_INACTIVE=0,
RRC_SUB_STATE_INACTIVE = 0,
RRC_SUB_STATE_IDLE_SEARCHING,
RRC_SUB_STATE_IDLE_RECEIVING_SIB,
......@@ -50,15 +50,6 @@ typedef enum Rrc_Sub_State_e {
RRC_SUB_STATE_IDLE,
RRC_SUB_STATE_CONNECTED,
RRC_SUB_STATE_INACTIVE_FIRST = RRC_SUB_STATE_INACTIVE,
RRC_SUB_STATE_INACTIVE_LAST = RRC_SUB_STATE_INACTIVE,
RRC_SUB_STATE_IDLE_FIRST = RRC_SUB_STATE_IDLE_SEARCHING,
RRC_SUB_STATE_IDLE_LAST = RRC_SUB_STATE_IDLE,
RRC_SUB_STATE_CONNECTED_FIRST = RRC_SUB_STATE_CONNECTED,
RRC_SUB_STATE_CONNECTED_LAST = RRC_SUB_STATE_CONNECTED,
} Rrc_Sub_State_t;
typedef enum Rrc_Msg_Type_e {
......
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