diff options
Diffstat (limited to 'policy_manager/stm/zipc/StateTransitionor/RestrictionLayer')
3 files changed, 328 insertions, 301 deletions
diff --git a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c index 6d07643..4c390ff 100644 --- a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c +++ b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_RelMain.c @@ -58,7 +58,7 @@ static void ZREL_RelMains0StateEntry( void ) /****************************************/ /* State start activity function */ /* STM : RelMain */ -/* State : restriction_mode_2_on( No 1 ) */ +/* State : restriction_mode_on( No 1 )*/ /****************************************/ static void ZREL_RelMains1StateEntry( void ) { @@ -77,7 +77,7 @@ static void ZREL_RelMains1StateEntry( void ) /* Action function */ /* STM : RelMain */ /* State : restriction_mode_off( No 0 ) */ -/* Event : stt_restriction_mode_2_on( No 1 ) */ +/* Event : stt_restriction_mode_on( No 1 ) */ /****************************************/ static void ZREL_RelMains0e1( void ) { @@ -89,7 +89,7 @@ static void ZREL_RelMains0e1( void ) /****************************************/ /* Action function */ /* STM : RelMain */ -/* State : restriction_mode_2_on( No 1 ) */ +/* State : restriction_mode_on( No 1 )*/ /* Event : stt_restriction_mode_off( No 0 ) */ /****************************************/ static void ZREL_RelMains1e0( void ) @@ -197,10 +197,10 @@ static void ZREL_RelRestOffs3e0( void ) /****************************************/ static void ZREL_RelMains0Event( void ) { - /*stt_restriction_mode_2_on*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNo2On ) + /*stt_restriction_mode_on*/ + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOn ) { - stm_rel_event_restriction_mode_2_on(); + stm_rel_event_restriction_mode_on(); ZREL_RelMains0e1(); } else @@ -217,54 +217,73 @@ static void ZREL_RelMains0Event( void ) /****************************************/ static void ZREL_RelRestOffs0Event( void ) { - /*stt_restriction_mode_1_on*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNo1On ) + /*stt_restriction_mode_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_crr_layer_apps_changed*/ - if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) + /*stt_lightstatus_brake_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) { - /*stt_crr_layer_apps_map_spl*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + /*stt_crr_layer_apps_changed*/ + if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) { - ZREL_RelRestOffs0e0(); - } - /*stt_crr_layer_apps_spl_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) - { - ZREL_RelRestOffs0e1(); - } - /*stt_crr_layer_apps_spl_spl*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) - { - ZREL_RelRestOffs0e1(); - } - /*stt_crr_layer_apps_gen_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) - { - ZREL_RelRestOffs0e1(); + /*stt_crr_layer_apps_map_spl*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs0e0(); + } + /*stt_crr_layer_apps_spl_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_spl_spl*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_gen_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) + { + ZREL_RelRestOffs0e1(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } - else + /*evt_activate*/ + else if( g_stm_event == StmEvtNoActivate ) { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } - } - /*evt_activate*/ - else if( g_stm_event == StmEvtNoActivate ) - { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) - { - /*ara_restriction_normal*/ - if( g_stm_area == StmAreaNoRestrictionNormal ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { - /*stt_crr_layer_apps_spl_nml*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + /*ara_restriction_normal*/ + if( g_stm_area == StmAreaNoRestrictionNormal ) { - ZREL_RelRestOffs0e1(); + /*stt_crr_layer_apps_spl_nml*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_map_spl*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs0e0(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } + } + /*ara_restriction_split_main*/ + else if( g_stm_area == StmAreaNoRestrictionSplitMain ) + { + ZREL_RelRestOffs0e8(); } - /*stt_crr_layer_apps_map_spl*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + /*ara_restriction_split_sub*/ + else if( g_stm_area == StmAreaNoRestrictionSplitSub ) { ZREL_RelRestOffs0e0(); } @@ -274,16 +293,6 @@ static void ZREL_RelRestOffs0Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ara_restriction_split_main*/ - else if( g_stm_area == StmAreaNoRestrictionSplitMain ) - { - ZREL_RelRestOffs0e8(); - } - /*ara_restriction_split_sub*/ - else if( g_stm_area == StmAreaNoRestrictionSplitSub ) - { - ZREL_RelRestOffs0e0(); - } else { /*Else and default design have not done.*/ @@ -296,17 +305,8 @@ static void ZREL_RelRestOffs0Event( void ) /*Please confirm the STM and design else and default.*/ } } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } - } - /*stt_restriction_mode_off*/ - else if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) - { /*evt_undo*/ - if( g_stm_event == StmEvtNoUndo ) + else if( g_stm_event == StmEvtNoUndo ) { /*stt_prv_layer_rst_none*/ if( g_stm_prv_state.layer[StmLayerNoRestriction].state == StmLayoutNoNone ) @@ -354,62 +354,81 @@ static void ZREL_RelRestOffs0Event( void ) /****************************************/ static void ZREL_RelRestOffs1Event( void ) { - /*stt_restriction_mode_1_on*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNo1On ) + /*stt_restriction_mode_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_crr_layer_apps_changed*/ - if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) - { - /*stt_crr_layer_apps_map_spl*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) - { - ZREL_RelRestOffs0e0(); - } - /*stt_crr_layer_apps_spl_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) - { - ZREL_RelRestOffs1e1(); - } - /*stt_crr_layer_apps_spl_spl*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) - { - ZREL_RelRestOffs1e1(); - } - /*stt_crr_layer_apps_gen_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) - { - ZREL_RelRestOffs1e1(); - } - else - { - ZREL_RelRestOffs1e4(); - } - } - /*stt_crr_layer_hs_changed*/ - else if( g_stm_crr_state.layer[StmLayerNoHomescreen].changed == STM_TRUE ) + /*stt_lightstatus_brake_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) { - /*stt_crr_layer_hs_hms*/ - if( g_stm_crr_state.layer[StmLayerNoHomescreen].state == StmLayoutNoHms ) + /*stt_crr_layer_apps_changed*/ + if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) { - ZREL_RelRestOffs1e4(); + /*stt_crr_layer_apps_map_spl*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs0e0(); + } + /*stt_crr_layer_apps_spl_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs1e1(); + } + /*stt_crr_layer_apps_spl_spl*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) + { + ZREL_RelRestOffs1e1(); + } + /*stt_crr_layer_apps_gen_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) + { + ZREL_RelRestOffs1e1(); + } + else + { + ZREL_RelRestOffs1e4(); + } } - else + /*stt_crr_layer_hs_changed*/ + else if( g_stm_crr_state.layer[StmLayerNoHomescreen].changed == STM_TRUE ) { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ + /*stt_crr_layer_hs_hms*/ + if( g_stm_crr_state.layer[StmLayerNoHomescreen].state == StmLayoutNoHms ) + { + ZREL_RelRestOffs1e4(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } - } - /*evt_activate*/ - else if( g_stm_event == StmEvtNoActivate ) - { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) + /*evt_activate*/ + else if( g_stm_event == StmEvtNoActivate ) { - /*ara_restriction_normal*/ - if( g_stm_area == StmAreaNoRestrictionNormal ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { - /*stt_crr_layer_apps_map_spl*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + /*ara_restriction_normal*/ + if( g_stm_area == StmAreaNoRestrictionNormal ) + { + /*stt_crr_layer_apps_map_spl*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs0e0(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } + } + /*ara_restriction_split_main*/ + else if( g_stm_area == StmAreaNoRestrictionSplitMain ) + { + ZREL_RelRestOffs0e8(); + } + /*ara_restriction_split_sub*/ + else if( g_stm_area == StmAreaNoRestrictionSplitSub ) { ZREL_RelRestOffs0e0(); } @@ -419,15 +438,19 @@ static void ZREL_RelRestOffs1Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ara_restriction_split_main*/ - else if( g_stm_area == StmAreaNoRestrictionSplitMain ) + /*ctg_homescreen*/ + else if( g_stm_category == StmCtgNoHomescreen ) { - ZREL_RelRestOffs0e8(); - } - /*ara_restriction_split_sub*/ - else if( g_stm_area == StmAreaNoRestrictionSplitSub ) - { - ZREL_RelRestOffs0e0(); + /*ara_fullscreen*/ + if( g_stm_area == StmAreaNoFullscreen ) + { + ZREL_RelRestOffs1e4(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } else { @@ -435,11 +458,11 @@ static void ZREL_RelRestOffs1Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ctg_homescreen*/ - else if( g_stm_category == StmCtgNoHomescreen ) + /*evt_deactivate*/ + else if( g_stm_event == StmEvtNoDeactivate ) { - /*ara_fullscreen*/ - if( g_stm_area == StmAreaNoFullscreen ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { ZREL_RelRestOffs1e4(); } @@ -455,11 +478,11 @@ static void ZREL_RelRestOffs1Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*evt_deactivate*/ - else if( g_stm_event == StmEvtNoDeactivate ) + /*stt_lightstatus_brake_on*/ + else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) + /*stt_prv_layer_rst_not_none*/ + if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) { ZREL_RelRestOffs1e4(); } @@ -469,20 +492,6 @@ static void ZREL_RelRestOffs1Event( void ) /*Please confirm the STM and design else and default.*/ } } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } - } - /*stt_restriction_mode_off*/ - else if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) - { - /*stt_prv_layer_rst_not_none*/ - if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) - { - ZREL_RelRestOffs1e4(); - } /*evt_undo*/ else if( g_stm_event == StmEvtNoUndo ) { @@ -532,69 +541,83 @@ static void ZREL_RelRestOffs1Event( void ) /****************************************/ static void ZREL_RelRestOffs2Event( void ) { - /*stt_restriction_mode_1_on*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNo1On ) + /*stt_restriction_mode_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_crr_layer_apps_changed*/ - if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) - { - /*stt_crr_layer_apps_map_spl*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) - { - ZREL_RelRestOffs0e0(); - } - /*stt_crr_layer_apps_spl_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) - { - ZREL_RelRestOffs0e1(); - } - /*stt_crr_layer_apps_spl_spl*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) - { - ZREL_RelRestOffs0e1(); - } - /*stt_crr_layer_apps_gen_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) - { - ZREL_RelRestOffs0e1(); - } - else - { - ZREL_RelRestOffs1e4(); - } - } - /*stt_crr_layer_hs_changed*/ - else if( g_stm_crr_state.layer[StmLayerNoHomescreen].changed == STM_TRUE ) + /*stt_lightstatus_brake_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) { - /*stt_crr_layer_hs_hms*/ - if( g_stm_crr_state.layer[StmLayerNoHomescreen].state == StmLayoutNoHms ) + /*stt_crr_layer_apps_changed*/ + if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) { - ZREL_RelRestOffs1e4(); + /*stt_crr_layer_apps_map_spl*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs0e0(); + } + /*stt_crr_layer_apps_spl_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_spl_spl*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_gen_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) + { + ZREL_RelRestOffs0e1(); + } + else + { + ZREL_RelRestOffs1e4(); + } } - else + /*stt_crr_layer_hs_changed*/ + else if( g_stm_crr_state.layer[StmLayerNoHomescreen].changed == STM_TRUE ) { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ + /*stt_crr_layer_hs_hms*/ + if( g_stm_crr_state.layer[StmLayerNoHomescreen].state == StmLayoutNoHms ) + { + ZREL_RelRestOffs1e4(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } - } - /*evt_activate*/ - else if( g_stm_event == StmEvtNoActivate ) - { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) + /*evt_activate*/ + else if( g_stm_event == StmEvtNoActivate ) { - /*ara_restriction_normal*/ - if( g_stm_area == StmAreaNoRestrictionNormal ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { - /*stt_crr_layer_apps_spl_nml*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + /*ara_restriction_normal*/ + if( g_stm_area == StmAreaNoRestrictionNormal ) { - ZREL_RelRestOffs0e1(); + /*stt_crr_layer_apps_spl_nml*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_map_spl*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs0e0(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } - /*stt_crr_layer_apps_map_spl*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + /*ara_restriction_split_sub*/ + else if( g_stm_area == StmAreaNoRestrictionSplitSub ) { - ZREL_RelRestOffs0e0(); + ZREL_RelRestOffs0e1(); } else { @@ -602,10 +625,19 @@ static void ZREL_RelRestOffs2Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ara_restriction_split_sub*/ - else if( g_stm_area == StmAreaNoRestrictionSplitSub ) + /*ctg_homescreen*/ + else if( g_stm_category == StmCtgNoHomescreen ) { - ZREL_RelRestOffs0e1(); + /*ara_fullscreen*/ + if( g_stm_area == StmAreaNoFullscreen ) + { + ZREL_RelRestOffs1e4(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } else { @@ -613,11 +645,11 @@ static void ZREL_RelRestOffs2Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ctg_homescreen*/ - else if( g_stm_category == StmCtgNoHomescreen ) + /*evt_deactivate*/ + else if( g_stm_event == StmEvtNoDeactivate ) { - /*ara_fullscreen*/ - if( g_stm_area == StmAreaNoFullscreen ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { ZREL_RelRestOffs1e4(); } @@ -633,11 +665,11 @@ static void ZREL_RelRestOffs2Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*evt_deactivate*/ - else if( g_stm_event == StmEvtNoDeactivate ) + /*stt_lightstatus_brake_on*/ + else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) + /*stt_prv_layer_rst_not_none*/ + if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) { ZREL_RelRestOffs1e4(); } @@ -647,20 +679,6 @@ static void ZREL_RelRestOffs2Event( void ) /*Please confirm the STM and design else and default.*/ } } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } - } - /*stt_restriction_mode_off*/ - else if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) - { - /*stt_prv_layer_rst_not_none*/ - if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) - { - ZREL_RelRestOffs1e4(); - } /*evt_undo*/ else if( g_stm_event == StmEvtNoUndo ) { @@ -710,62 +728,76 @@ static void ZREL_RelRestOffs2Event( void ) /****************************************/ static void ZREL_RelRestOffs3Event( void ) { - /*stt_restriction_mode_1_on*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNo1On ) + /*stt_restriction_mode_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { - /*stt_crr_layer_apps_changed*/ - if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) - { - /*stt_crr_layer_apps_map_spl*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) - { - ZREL_RelRestOffs3e0(); - } - /*stt_crr_layer_apps_spl_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) - { - ZREL_RelRestOffs0e1(); - } - /*stt_crr_layer_apps_spl_spl*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) - { - ZREL_RelRestOffs0e1(); - } - /*stt_crr_layer_apps_gen_nml*/ - else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) - { - ZREL_RelRestOffs0e1(); - } - else - { - ZREL_RelRestOffs1e4(); - } - } - /*stt_crr_layer_hs_changed*/ - else if( g_stm_crr_state.layer[StmLayerNoHomescreen].changed == STM_TRUE ) + /*stt_lightstatus_brake_off*/ + if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOff ) { - /*stt_crr_layer_hs_hms*/ - if( g_stm_crr_state.layer[StmLayerNoHomescreen].state == StmLayoutNoHms ) + /*stt_crr_layer_apps_changed*/ + if( g_stm_crr_state.layer[StmLayerNoApps].changed == STM_TRUE ) { - ZREL_RelRestOffs1e4(); + /*stt_crr_layer_apps_map_spl*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl ) + { + ZREL_RelRestOffs3e0(); + } + /*stt_crr_layer_apps_spl_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_spl_spl*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl ) + { + ZREL_RelRestOffs0e1(); + } + /*stt_crr_layer_apps_gen_nml*/ + else if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoGenNml ) + { + ZREL_RelRestOffs0e1(); + } + else + { + ZREL_RelRestOffs1e4(); + } } - else + /*stt_crr_layer_hs_changed*/ + else if( g_stm_crr_state.layer[StmLayerNoHomescreen].changed == STM_TRUE ) { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ + /*stt_crr_layer_hs_hms*/ + if( g_stm_crr_state.layer[StmLayerNoHomescreen].state == StmLayoutNoHms ) + { + ZREL_RelRestOffs1e4(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } - } - /*evt_activate*/ - else if( g_stm_event == StmEvtNoActivate ) - { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) + /*evt_activate*/ + else if( g_stm_event == StmEvtNoActivate ) { - /*ara_restriction_normal*/ - if( g_stm_area == StmAreaNoRestrictionNormal ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { - /*stt_crr_layer_apps_spl_nml*/ - if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + /*ara_restriction_normal*/ + if( g_stm_area == StmAreaNoRestrictionNormal ) + { + /*stt_crr_layer_apps_spl_nml*/ + if( g_stm_crr_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) + { + ZREL_RelRestOffs0e1(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } + } + /*ara_restriction_split_main*/ + else if( g_stm_area == StmAreaNoRestrictionSplitMain ) { ZREL_RelRestOffs0e1(); } @@ -775,10 +807,19 @@ static void ZREL_RelRestOffs3Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ara_restriction_split_main*/ - else if( g_stm_area == StmAreaNoRestrictionSplitMain ) + /*ctg_homescreen*/ + else if( g_stm_category == StmCtgNoHomescreen ) { - ZREL_RelRestOffs0e1(); + /*ara_fullscreen*/ + if( g_stm_area == StmAreaNoFullscreen ) + { + ZREL_RelRestOffs1e4(); + } + else + { + /*Else and default design have not done.*/ + /*Please confirm the STM and design else and default.*/ + } } else { @@ -786,11 +827,11 @@ static void ZREL_RelRestOffs3Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*ctg_homescreen*/ - else if( g_stm_category == StmCtgNoHomescreen ) + /*evt_deactivate*/ + else if( g_stm_event == StmEvtNoDeactivate ) { - /*ara_fullscreen*/ - if( g_stm_area == StmAreaNoFullscreen ) + /*ctg_restriction*/ + if( g_stm_category == StmCtgNoRestriction ) { ZREL_RelRestOffs1e4(); } @@ -806,11 +847,11 @@ static void ZREL_RelRestOffs3Event( void ) /*Please confirm the STM and design else and default.*/ } } - /*evt_deactivate*/ - else if( g_stm_event == StmEvtNoDeactivate ) + /*stt_lightstatus_brake_on*/ + else if( g_stm_crr_state.car_element[StmCarElementNoLightstatusBrake].state == StmLightstatusBrakeSttNoOn ) { - /*ctg_restriction*/ - if( g_stm_category == StmCtgNoRestriction ) + /*stt_prv_layer_rst_not_none*/ + if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) { ZREL_RelRestOffs1e4(); } @@ -820,20 +861,6 @@ static void ZREL_RelRestOffs3Event( void ) /*Please confirm the STM and design else and default.*/ } } - else - { - /*Else and default design have not done.*/ - /*Please confirm the STM and design else and default.*/ - } - } - /*stt_restriction_mode_off*/ - else if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) - { - /*stt_prv_layer_rst_not_none*/ - if( g_stm_prv_state.layer[StmLayerNoRestriction].state != StmLayoutNoNone ) - { - ZREL_RelRestOffs1e4(); - } /*evt_undo*/ else if( g_stm_event == StmEvtNoUndo ) { @@ -879,12 +906,12 @@ static void ZREL_RelRestOffs3Event( void ) /****************************************/ /* Event appraisal function */ /* STM : RelMain */ -/* State : restriction_mode_2_on( No 1 ) */ +/* State : restriction_mode_on( No 1 )*/ /****************************************/ static void ZREL_RelMains1Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { stm_rel_event_restriction_mode_off(); ZREL_RelMains1e0(); diff --git a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.c b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.c index 5195f98..a1aa213 100644 --- a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.c +++ b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.c @@ -45,15 +45,15 @@ void stm_rel_start_activity_restriction_split_sub() { * @name stm_rel_event_restriction_mode_off */ void stm_rel_event_restriction_mode_off() { - g_stm_crr_state.layer[StmLayerNoRestriction].state = g_prv_restriction_state_rest_mode_1; + g_stm_crr_state.layer[StmLayerNoRestriction].state = g_prv_restriction_state_car_stop; g_stm_crr_state.layer[StmLayerNoRestriction].changed = STM_TRUE; } /* - * @name stm_rel_event_restriction_mode_2_on + * @name stm_rel_event_restriction_mode_on */ -void stm_rel_event_restriction_mode_2_on() { - g_prv_restriction_state_rest_mode_1 = g_stm_prv_state.layer[StmLayerNoRestriction].state; +void stm_rel_event_restriction_mode_on() { + g_prv_restriction_state_car_stop = g_stm_prv_state.layer[StmLayerNoRestriction].state; } /* diff --git a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.h b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.h index 5cd9b7d..3763820 100644 --- a/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.h +++ b/policy_manager/stm/zipc/StateTransitionor/RestrictionLayer/ZREL_Restriction_func.h @@ -11,7 +11,7 @@ extern void stm_rel_start_activity_restriction_normal(); extern void stm_rel_start_activity_restriction_split_main(); extern void stm_rel_start_activity_restriction_split_sub(); extern void stm_rel_event_restriction_mode_off(); -extern void stm_rel_event_restriction_mode_2_on(); +extern void stm_rel_event_restriction_mode_on(); extern void stm_rel_initialize_variable(); extern void stm_rel_start_stm(); |