X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fpolicy_manager%2Fzipc%2Fdummy_stm.h;h=5dd0bcccad05662802088693eccf76b37a6ac552;hb=dd47ecbc82af642be551a660ba586ea5cbf244b5;hp=3748ecd122e334adc87341ede9c4d2f3415d7a49;hpb=cffad8be821cf9226bce993f18a2451fc9fd8646;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/policy_manager/zipc/dummy_stm.h b/src/policy_manager/zipc/dummy_stm.h
index 3748ecd..5dd0bcc 100644
--- a/src/policy_manager/zipc/dummy_stm.h
+++ b/src/policy_manager/zipc/dummy_stm.h
@@ -24,33 +24,31 @@
 #define STM_FALSE 0
 
 // Event number
-#define STM_EVT_NO_NONE                  0x01
-#define STM_EVT_NO_ACTIVATE              0x02
-#define STM_EVT_NO_DEACTIVATE            0x03
-#define STM_EVT_NO_TRANS_GEAR_N          0x04
-#define STM_EVT_NO_TRANS_GEAR_NOT_N      0x05
-#define STM_EVT_NO_PARKING_BRAKE_OFF     0x06
-#define STM_EVT_NO_PARKING_BRAKE_ON      0x07
-#define STM_EVT_NO_ACCEL_PEDAL_OFF       0x08
-#define STM_EVT_NO_ACCEL_PEDAL_ON        0x09
-#define STM_EVT_NO_TIMER_EXPIRED         0x0A
-#define STM_EVT_NO_LAMP_OFF              0x0B
-#define STM_EVT_NO_LAMP_ON               0x0C
-#define STM_EVT_NO_LIGHTSTATUS_BRAKE_OFF 0x0D
-#define STM_EVT_NO_LIGHTSTATUS_BRAKE_ON  0x0E
-#define STM_EVT_NO_RESTRICTION_MODE_OFF  0x0F
-#define STM_EVT_NO_RESTRICTION_MODE_ON   0x10
+#define STM_EVT_NO_ACTIVATE              0x01
+#define STM_EVT_NO_DEACTIVATE            0x02
+#define STM_EVT_NO_TRANS_GEAR_N          0x03
+#define STM_EVT_NO_TRANS_GEAR_NOT_N      0x04
+#define STM_EVT_NO_PARKING_BRAKE_OFF     0x05
+#define STM_EVT_NO_PARKING_BRAKE_ON      0x06
+#define STM_EVT_NO_ACCEL_PEDAL_OFF       0x07
+#define STM_EVT_NO_ACCEL_PEDAL_ON        0x08
+#define STM_EVT_NO_TIMER_EXPIRED         0x09
+#define STM_EVT_NO_LAMP_OFF              0x0A
+#define STM_EVT_NO_LAMP_ON               0x0B
+#define STM_EVT_NO_LIGHTSTATUS_BRAKE_OFF 0x0C
+#define STM_EVT_NO_LIGHTSTATUS_BRAKE_ON  0x0D
+#define STM_EVT_NO_RESTRICTION_MODE_OFF  0x0E
+#define STM_EVT_NO_RESTRICTION_MODE_ON   0x0F
 
 // Category number
-#define STM_CTG_NO_NONE         0x0100
-#define STM_CTG_NO_HOMESCREEN   0x0200
-#define STM_CTG_NO_MAP          0x0300
-#define STM_CTG_NO_GENERAL      0x0400
-#define STM_CTG_NO_SPLITABLE    0x0500
-#define STM_CTG_NO_POPUP        0x0600
-#define STM_CTG_NO_SYSTEM_ALERT 0x0700
-#define STM_CTG_NO_RESTRICTION  0x0800
-#define STM_CTG_NO_SYSTEM       0x0900
+#define STM_CTG_NO_HOMESCREEN   0x0100
+#define STM_CTG_NO_MAP          0x0200
+#define STM_CTG_NO_GENERAL      0x0300
+#define STM_CTG_NO_SPLITABLE    0x0400
+#define STM_CTG_NO_POPUP        0x0500
+#define STM_CTG_NO_SYSTEM_ALERT 0x0600
+#define STM_CTG_NO_RESTRICTION  0x0700
+#define STM_CTG_NO_SYSTEM       0x0800
 
 // Area number
 #define STM_ARA_NO_NONE                   0x010000
@@ -58,7 +56,7 @@
 #define STM_ARA_NO_NORMAL                 0x030000
 #define STM_ARA_NO_SPLIT_MAIN             0x040000
 #define STM_ARA_NO_SPLIT_SUB              0x050000
-#define STM_ARA_NO_ON_SCREEN              0x060000
+#define STM_ARA_NO_POP_UP                 0x060000
 #define STM_ARA_NO_RESTRICTION_NORMAL     0x070000
 #define STM_ARA_NO_RESTRICTION_SPLIT_MAIN 0x080000
 #define STM_ARA_NO_RESTRICTION_SPLIT_SUB  0x090000
@@ -106,24 +104,28 @@ enum stm_restriction_mode_state_ {
 
 enum stm_layout_ {
     gStmLayoutNoNone = 0,
-    gStmLayoutNoPu,
-    gStmLayoutNoSa,
-    gStmLayoutNoM1,
-    gStmLayoutNoM2,
-    gStmLayoutNoMf,
-    gStmLayoutNoS1,
-    gStmLayoutNoS2,
-    gStmLayoutNoG,
-    gStmLayoutNoHs,
-    gStmLayoutNoRestriction,
-    gStmLayoutNoRestrictionSplitMain,
-    gStmLayoutNoRestrictionSplitSub,
-    gStmLayoutNoSystem,
+    gStmLayoutNoPopUp,
+    gStmLayoutNoSysAlt,
+    gStmLayoutNoMapNml,
+    gStmLayoutNoMapSpl,
+    gStmLayoutNoMapFll,
+    gStmLayoutNoSplNml,
+    gStmLayoutNoSplSpl,
+    gStmLayoutNoGenNml,
+    gStmLayoutNoHms,
+    gStmLayoutNoRstNml,
+    gStmLayoutNoRstSplMain,
+    gStmLayoutNoRstSplSub,
+    gStmLayoutNoSysNml,
+
+    gStmLayoutNoNum,
+
+    gStmLayoutNoMin = gStmLayoutNoNone,
+    gStmLayoutNoMax = gStmLayoutNoNum - 1,
 };
 
 enum stm_event_ {
-    gStmEventNoNone = 0,
-    gStmEventNoActive,
+    gStmEventNoActive = 0,
     gStmEventNoDeactive,
     gStmEventNoTransGearN,
     gStmEventNoTransGearNotN,
@@ -141,13 +143,12 @@ enum stm_event_ {
 
     gStmEventNoNum,
 
-    gStmEventNoMin = gStmEventNoNone,
+    gStmEventNoMin = gStmEventNoActive,
     gStmEventNoMax = gStmEventNoNum - 1,
 };
 
 enum stm_category_ {
-    gStmCategoryNoNone = 0,
-    gStmCategoryNoHomescreen,
+    gStmCategoryNoHomescreen = 0,
     gStmCategoryNoMap,
     gStmCategoryNoGeneral,
     gStmCategoryNoSplitable,
@@ -157,7 +158,7 @@ enum stm_category_ {
 
     gStmCategoryNoNum,
 
-    gStmCategoryNoMin = gStmCategoryNoNone,
+    gStmCategoryNoMin = gStmCategoryNoHomescreen,
     gStmCategoryNoMax = gStmCategoryNoNum - 1,
 };
 
@@ -179,15 +180,14 @@ enum stm_area_ {
 };
 
 enum stm_layer_ {
-    gStmLayerNoNone = 0,
-    gStmLayerNoHomescreen,
+    gStmLayerNoHomescreen = 0,
     gStmLayerNoApps,
     gStmLayerNoRestriction,
     gStmLayerNoOnScreen,
 
     gStmLayerNoNum,
 
-    gStmLayerNoMin = gStmLayerNoNone,
+    gStmLayerNoMin = gStmLayerNoHomescreen,
     gStmLayerNoMax = gStmLayerNoNum - 1,
 };
 
@@ -206,22 +206,21 @@ enum stm_car_element_ {
     gStmCarElementNoMax = gStmCarElementNoNum - 1,
 };
 
+// String for state
 extern const char* gStmEventName[];
 extern const int gStmEventNo[];
 extern const char* gStmCategoryName[];
 extern const int gStmCategoryNo[];
 extern const char* gStmAreaName[];
 extern const int gStmAreaNo[];
+extern const char* gStmLayoutName[];
 extern const char* gStmLayerName[];
 extern const char* gStmCarElementName[];
-
-// String for state
-extern const char* gStmLayoutNo2Name[];
 extern const char** gStmCarStateNameList[];
 
 // Struct for state
 typedef struct stm_base_state_ {
-    int is_changed;
+    int changed;
     int state;
 } stm_base_state;