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

Remove useless RRC states

Browse Source
This commit is contained in:
Laurent THOMAS
2025-01-23 14:10:16 +01:00
committed by Robert Schmidt
parent a54eba8fe0
commit b0734604e9
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LTE/rrc_UE.c
+12 -6
View File
@@ -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;
}
}
openair2/RRC/LTE/rrc_types.h
+1 -10
View File
@@ -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 {