add source for ces2019

3 files changed, 43 insertions, 58 deletions

diff --git a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c
index b6891e8..9002810 100644
--- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c
+++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_AppsLayer.c
@@ -20,11 +20,11 @@ static void ZAPL_RestrictionModeOffs0e7( void );
 static void ZAPL_RestrictionModeOffs0e13( void );
 static void ZAPL_RestrictionModeOffs0e15( void );
 static void ZAPL_RestrictionModeOffs0e18( void );
-static void ZAPL_RestrictionModeOffs1e0( void );
 static void ZAPL_RestrictionModeOffs1e8( void );
+static void ZAPL_RestrictionModeOffs1e14( void );
 static void ZAPL_RestrictionModeOffs2e3( void );
-static void ZAPL_RestrictionModeOffs3e2( void );
-static void ZAPL_RestrictionModeOffs4e3( void );
+static void ZAPL_RestrictionModeOffs3e16( void );
+static void ZAPL_RestrictionModeOffs4e17( void );
 static void ZAPL_RestrictionModeOffs5e3( void );
 static void ZAPL_RestrictionModeOffs6e6( void );
 static void ZAPL_RestrictionModeOffs7e7( 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 )
@@ -229,23 +229,23 @@ static void ZAPL_RestrictionModeOffs0e18( void )
 /* Action function                      */
 /*   STM : RestrictionModeOff           */
 /*   State : map( No 1 )                */
-/*   Event : ara_normal( No 0 )         */
+/*   Event : ara_fullscreen( No 8 )     */
 /****************************************/
-static void ZAPL_RestrictionModeOffs1e0( void )
+static void ZAPL_RestrictionModeOffs1e8( void )
 {
-    stm_apl_start_activity_map();
+    ZAPL_AppsLayerState[ZAPL_APPSLAYERS0F] = ( uint8_t )ZAPL_RESTRICTIONMODEOFFS0;
+    stm_apl_start_activity_none();
 }
 
 /****************************************/
 /* Action function                      */
 /*   STM : RestrictionModeOff           */
 /*   State : map( No 1 )                */
-/*   Event : ara_fullscreen( No 8 )     */
+/*   Event : stt_prv_layer_apps_map_nml( No 14 ) */
 /****************************************/
-static void ZAPL_RestrictionModeOffs1e8( void )
+static void ZAPL_RestrictionModeOffs1e14( void )
 {
-    ZAPL_AppsLayerState[ZAPL_APPSLAYERS0F] = ( uint8_t )ZAPL_RESTRICTIONMODEOFFS0;
-    stm_apl_start_activity_none();
+    stm_apl_start_activity_map();
 }
 
 /****************************************/
@@ -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();
 }
@@ -274,9 +274,9 @@ static void ZAPL_RestrictionModeOffs3e2( void )
 /* Action function                      */
 /*   STM : RestrictionModeOff           */
 /*   State : splitable_normal( No 4 )   */
-/*   Event : ara_normal( No 3 )         */
+/*   Event : stt_prv_layer_apps_spl_nml( No 17 ) */
 /****************************************/
-static void ZAPL_RestrictionModeOffs4e3( void )
+static void ZAPL_RestrictionModeOffs4e17( void )
 {
     stm_apl_start_activity_splitable_normal();
 }
@@ -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 )
@@ -556,13 +556,8 @@ static void ZAPL_RestrictionModeOffs1Event( void )
             /*ctg_map*/
             if( g_stm_category == StmCtgNoMap )
             {
-                /*ara_normal*/
-                if( g_stm_area == StmAreaNoNormal )
-                {
-                    ZAPL_RestrictionModeOffs1e0();
-                }
                 /*ara_fullscreen*/
-                else if( g_stm_area == StmAreaNoFullscreen )
+                if( g_stm_area == StmAreaNoFullscreen )
                 {
                     ZAPL_RestrictionModeOffs0e2();
                 }
@@ -664,7 +659,7 @@ static void ZAPL_RestrictionModeOffs1Event( void )
             /*stt_prv_layer_apps_map_nml*/
             else if( g_stm_prv_state.layer[StmLayerNoApps].state == StmLayoutNoMapNml )
             {
-                ZAPL_RestrictionModeOffs1e0();
+                ZAPL_RestrictionModeOffs1e14();
             }
             /*stt_prv_layer_apps_map_spl*/
             else if( g_stm_prv_state.layer[StmLayerNoApps].state == StmLayoutNoMapSpl )
@@ -723,7 +718,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 +893,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 +906,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 +1009,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 +1058,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 )
@@ -1100,13 +1090,8 @@ static void ZAPL_RestrictionModeOffs4Event( void )
             /*ctg_splitable*/
             else if( g_stm_category == StmCtgNoSplitable )
             {
-                /*ara_normal*/
-                if( g_stm_area == StmAreaNoNormal )
-                {
-                    ZAPL_RestrictionModeOffs4e3();
-                }
                 /*ara_split_main*/
-                else if( g_stm_area == StmAreaNoSplitMain )
+                if( g_stm_area == StmAreaNoSplitMain )
                 {
                     ZAPL_RestrictionModeOffs0e18();
                 }
@@ -1209,7 +1194,7 @@ static void ZAPL_RestrictionModeOffs4Event( void )
             /*stt_prv_layer_apps_spl_nml*/
             else if( g_stm_prv_state.layer[StmLayerNoApps].state == StmLayoutNoSplNml )
             {
-                ZAPL_RestrictionModeOffs4e3();
+                ZAPL_RestrictionModeOffs4e17();
             }
             /*stt_prv_layer_apps_spl_spl*/
             else if( g_stm_prv_state.layer[StmLayerNoApps].state == StmLayoutNoSplSpl )
@@ -1253,7 +1238,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 +1423,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 +1593,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 +1758,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 +1782,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 +1847,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_Apps_func.c b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c
index b42df05..d2e7075 100644
--- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c
+++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.c
@@ -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
index 6f741b5..4f74c9f 100644
--- a/policy_manager/stm/zipc/StateTransitionor/AppsLayer/ZAPL_Apps_func.h
+++ b/policy_manager/stm/zipc/StateTransitionor/AppsLayer/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();