From 98006b6538c5be44350746ec3756f004a5c68af8 Mon Sep 17 00:00:00 2001 From: "fukubayashi.akio" Date: Mon, 3 Jun 2019 17:59:13 +0900 Subject: Add boot sequence and multi ecu transfer Signed-off-by: fukubayashi.akio --- .../StateTransitionor/AppsLayer/ZAPL_AppsLayer.c | 53 ++++++++++------------ .../StateTransitionor/AppsLayer/ZAPL_AppsLayer.h | 2 +- .../StateTransitionor/AppsLayer/ZAPL_Apps_func.c | 10 ++-- .../StateTransitionor/AppsLayer/ZAPL_Apps_func.h | 4 +- 4 files changed, 32 insertions(+), 37 deletions(-) mode change 100644 => 100755 policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c mode change 100644 => 100755 policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.h mode change 100644 => 100755 policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c mode change 100644 => 100755 policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.h (limited to 'policy_manager/stm/zipc/StateTransitionor/AppsLayer') diff --git a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c old mode 100644 new mode 100755 index b6891e8..ac1fb16 --- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c +++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c @@ -1,7 +1,7 @@ /************************************************************/ /* ZAPL_AppsLayer.c */ /* AppsLayer State transition model source file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #include "../ZST_include.h" @@ -23,7 +23,7 @@ static void ZAPL_RestrictionModeOffs0e18( void ); static void ZAPL_RestrictionModeOffs1e0( void ); static void ZAPL_RestrictionModeOffs1e8( void ); static void ZAPL_RestrictionModeOffs2e3( void ); -static void ZAPL_RestrictionModeOffs3e2( void ); +static void ZAPL_RestrictionModeOffs3e16( void ); static void ZAPL_RestrictionModeOffs4e3( void ); static void ZAPL_RestrictionModeOffs5e3( void ); static void ZAPL_RestrictionModeOffs6e6( void ); @@ -87,7 +87,7 @@ static void ZAPL_AppsLayers0StateEntry( void ) /****************************************/ /* State start activity function */ /* STM : AppsLayer */ -/* State : restriction_mode_2_on( No 1 ) */ +/* State : restriction_mode_on( No 1 )*/ /****************************************/ static void ZAPL_AppsLayers1StateEntry( void ) { @@ -121,7 +121,7 @@ static void ZAPL_AppsLayers0e1( void ) /****************************************/ /* Action function */ /* STM : AppsLayer */ -/* State : restriction_mode_2_on( No 1 ) */ +/* State : restriction_mode_on( No 1 )*/ /* Event : stt_restriction_mode_off( No 0 ) */ /****************************************/ static void ZAPL_AppsLayers1e0( void ) @@ -263,9 +263,9 @@ static void ZAPL_RestrictionModeOffs2e3( void ) /* Action function */ /* STM : RestrictionModeOff */ /* State : map_fullscreen( No 3 ) */ -/* Event : ara_fullscreen( No 2 ) */ +/* Event : stt_prv_layer_apps_map_fll( No 16 ) */ /****************************************/ -static void ZAPL_RestrictionModeOffs3e2( void ) +static void ZAPL_RestrictionModeOffs3e16( void ) { stm_apl_start_activity_map_fullscreen(); } @@ -367,10 +367,10 @@ static void ZAPL_RestrictionModeOns1e3( void ) /****************************************/ static void ZAPL_AppsLayers0Event( 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_apl_event_restriction_mode_2_on(); + stm_apl_event_restriction_mode_on(); /*stt_map_is_activated*/ if( g_stm_map_is_activated == STM_TRUE ) { @@ -406,7 +406,7 @@ static void ZAPL_AppsLayers0Event( void ) static void ZAPL_RestrictionModeOffs0Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -548,7 +548,7 @@ static void ZAPL_RestrictionModeOffs0Event( void ) static void ZAPL_RestrictionModeOffs1Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -723,7 +723,7 @@ static void ZAPL_RestrictionModeOffs1Event( void ) static void ZAPL_RestrictionModeOffs2Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -898,7 +898,7 @@ static void ZAPL_RestrictionModeOffs2Event( void ) static void ZAPL_RestrictionModeOffs3Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -911,11 +911,6 @@ static void ZAPL_RestrictionModeOffs3Event( void ) { ZAPL_RestrictionModeOffs0e0(); } - /*ara_fullscreen*/ - else if( g_stm_area == StmAreaNoFullscreen ) - { - ZAPL_RestrictionModeOffs3e2(); - } else { /*Else and default design have not done.*/ @@ -1019,7 +1014,7 @@ static void ZAPL_RestrictionModeOffs3Event( void ) /*stt_prv_layer_apps_map_fll*/ else if( g_stm_prv_state.layer[StmLayerNoApps].state == StmLayoutNoMapFll ) { - ZAPL_RestrictionModeOffs3e2(); + ZAPL_RestrictionModeOffs3e16(); } /*stt_prv_layer_apps_spl_nml*/ else if( g_stm_prv_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml ) @@ -1068,7 +1063,7 @@ static void ZAPL_RestrictionModeOffs3Event( void ) static void ZAPL_RestrictionModeOffs4Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1253,7 +1248,7 @@ static void ZAPL_RestrictionModeOffs4Event( void ) static void ZAPL_RestrictionModeOffs5Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1438,7 +1433,7 @@ static void ZAPL_RestrictionModeOffs5Event( void ) static void ZAPL_RestrictionModeOffs6Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1608,7 +1603,7 @@ static void ZAPL_RestrictionModeOffs6Event( void ) static void ZAPL_RestrictionModeOffs7Event( void ) { /*stt_restriction_mode_off*/ - if( g_stm_crr_state.mode[StmModeNoRestrictionMode].state == StmRestrictionModeSttNoOff ) + if( g_stm_crr_state.car_element[StmCarElementNoRestrictionMode].state == StmRestrictionModeSttNoOff ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1773,12 +1768,12 @@ static void ZAPL_RestrictionModeOffs7Event( void ) /****************************************/ /* Event appraisal function */ /* STM : AppsLayer */ -/* State : restriction_mode_2_on( No 1 ) */ +/* State : restriction_mode_on( No 1 )*/ /****************************************/ static void ZAPL_AppsLayers1Event( 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_apl_event_restriction_mode_off(); ZAPL_AppsLayers1e0(); @@ -1797,8 +1792,8 @@ static void ZAPL_AppsLayers1Event( void ) /****************************************/ static void ZAPL_RestrictionModeOns0Event( 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 ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) @@ -1862,8 +1857,8 @@ static void ZAPL_RestrictionModeOns0Event( void ) /****************************************/ static void ZAPL_RestrictionModeOns1Event( 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 ) { /*evt_activate*/ if( g_stm_event == StmEvtNoActivate ) diff --git a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.h b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.h old mode 100644 new mode 100755 index 4cbbc10..d94cbc0 --- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.h +++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.h @@ -1,7 +1,7 @@ /************************************************************/ /* ZAPL_AppsLayer.h */ /* AppsLayer State transition model header file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #ifndef ZHEADER_ZAPL_APPSLAYER_H #define ZHEADER_ZAPL_APPSLAYER_H diff --git a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c old mode 100644 new mode 100755 index b42df05..245271f --- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c +++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c @@ -1,7 +1,7 @@ /************************************************************/ /* ZAPL_Apps_func.c */ /* Function and variable source file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #include "../ZST_include.h" @@ -92,15 +92,15 @@ void stm_apl_start_activity_system() { * @name stm_apl_event_restriction_mode_off */ void stm_apl_event_restriction_mode_off() { - g_stm_crr_state.layer[StmLayerNoApps].state = g_prv_apps_state_rest_mode_1; + g_stm_crr_state.layer[StmLayerNoApps].state = g_prv_apps_state_car_stop; g_stm_crr_state.layer[StmLayerNoApps].changed = STM_TRUE; } /* - * @name stm_apl_event_restriction_mode_2_on + * @name stm_apl_event_restriction_mode_on */ -void stm_apl_event_restriction_mode_2_on() { - g_prv_apps_state_rest_mode_1 = g_stm_prv_state.layer[StmLayerNoApps].state; +void stm_apl_event_restriction_mode_on() { + g_prv_apps_state_car_stop = g_stm_prv_state.layer[StmLayerNoApps].state; } /* diff --git a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.h b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.h old mode 100644 new mode 100755 index 6f741b5..8d1de90 --- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.h +++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.h @@ -1,7 +1,7 @@ /************************************************************/ /* ZAPL_Apps_func.h */ /* Function and variable header file */ -/* ZIPC Designer Version 1.2.0 */ +/* ZIPC Designer Version 1.2.1 */ /************************************************************/ #ifndef ZHEADER_ZAPL_APPS_FUNC_H #define ZHEADER_ZAPL_APPS_FUNC_H @@ -15,7 +15,7 @@ extern void stm_apl_start_activity_splitable_split(); extern void stm_apl_start_activity_general(); extern void stm_apl_start_activity_system(); extern void stm_apl_event_restriction_mode_off(); -extern void stm_apl_event_restriction_mode_2_on(); +extern void stm_apl_event_restriction_mode_on(); extern void stm_apl_initialize_variable(); extern void stm_apl_start_stm(); -- cgit 1.2.3-korg