Modify enum and struct name

Change-Id: If5b196854fce9533943e697dc542efcad0ed5cc8
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

1 files changed, 144 insertions, 142 deletions

diff --git a/src/policy_manager/zipc/dummy_stm.h b/src/policy_manager/zipc/dummy_stm.h
index a7f3032..97f6a5a 100644
--- a/src/policy_manager/zipc/dummy_stm.h
+++ b/src/policy_manager/zipc/dummy_stm.h
@@ -17,193 +17,195 @@
 #ifndef TMCAGLWM_DUMMY_STM_HPP
 #define TMCAGLWM_DUMMY_STM_HPP
 
-// TODO: This file should be existed in STM
 
-//
 #define STM_TRUE 1
 #define STM_FALSE 0
 
-// Event number
-enum STM_EVT_NO {
-    STM_EVT_NO_NONE = 0,
-    STM_EVT_NO_ACTIVATE,
-    STM_EVT_NO_DEACTIVATE,
-    STM_EVT_NO_TRANS_GEAR_N,
-    STM_EVT_NO_TRANS_GEAR_NOT_N,
-    STM_EVT_NO_PARKING_BRAKE_OFF,
-    STM_EVT_NO_PARKING_BRAKE_ON,
-    STM_EVT_NO_ACCEL_PEDAL_OFF,
-    STM_EVT_NO_ACCEL_PEDAL_ON,
-    STM_EVT_NO_TIMER_EXPIRED,
-    STM_EVT_NO_LAMP_OFF,
-    STM_EVT_NO_LAMP_ON,
-    STM_EVT_NO_LIGHTSTATUS_BRAKE_OFF,
-    STM_EVT_NO_LIGHTSTATUS_BRAKE_ON,
-    STM_EVT_NO_RESTRICTION_MODE_OFF,
-    STM_EVT_NO_RESTRICTION_MODE_ON,
-
-    STM_EVT_NO_NUM,
-
-    STM_EVT_NO_MIN = STM_EVT_NO_NONE,
-    STM_EVT_NO_MAX = STM_EVT_NO_NUM - 1,
-};
-
-// Category number
-enum STM_CTG_NO {
-    STM_CTG_NO_NONE = 0,
-    STM_CTG_NO_HOMESCREEN,
-    STM_CTG_NO_MAP,
-    STM_CTG_NO_GENERAL,
-    STM_CTG_NO_SPLITABLE,
-    STM_CTG_NO_POPUP,
-    STM_CTG_NO_SYSTEM_ALERT,
-    STM_CTG_NO_RESTRICTION,
-    STM_CTG_NO_SYSTEM,
-
-    STM_CTG_NO_NUM,
-
-    STM_CTG_NO_MIN = STM_CTG_NO_NONE,
-    STM_CTG_NO_MAX = STM_CTG_NO_NUM - 1,
-};
-
-// Area number
-enum STM_AREA_NO {
-    STM_AREA_NO_NONE = 0,
-    STM_AREA_NO_FULL,
-    STM_AREA_NO_NORMAL,
-    STM_AREA_NO_SPLIT_MAIN,
-    STM_AREA_NO_SPLIT_SUB,
-    STM_AREA_NO_POP_UP,
-    STM_AREA_NO_RESTRICTION_NORMAL,
-    STM_AREA_NO_RESTRICTION_SPLIT_MAIN,
-    STM_AREA_NO_RESTRICTION_SPLIT_SUB,
-
-    STM_AREA_NO_NUM,
-
-    STM_AREA_NO_MIN = STM_AREA_NO_NONE,
-    STM_AREA_NO_MAX = STM_AREA_NO_NUM - 1,
-};
-
-#define CREATE_EVENT_ID(evt, ctg, area) \
+#define STM_CREATE_EVENT_ID(evt, ctg, area) \
     ((evt) | ((ctg) << 8) | ((area) << 16))
 
-#define GET_EVENT_FROM_ID(id) \
+#define STM_GET_EVENT_FROM_ID(id) \
     ((id) & 0xFF)
 
-#define GET_CATEGORY_FROM_ID(id) \
+#define STM_GET_CATEGORY_FROM_ID(id) \
     (((id) >> 8) & 0xFF)
 
-#define GET_AREA_FROM_ID(id) \
+#define STM_GET_AREA_FROM_ID(id) \
     (((id) >> 16) & 0xFF)
 
-// Enum for state
-enum stm_trans_gear_state_ {
-    gStmTransGearStateNoN = 0,
-    gStmTransGearStateNoNotN
+// Event number
+enum StmEvtNo {
+    StmEvtNoNone = 0,
+    StmEvtNoActivate,
+    StmEvtNoDeactivate,
+    StmEvtNoTransGearN,
+    StmEvtNoTransGearNotN,
+    StmEvtNoParkingBrakeOff,
+    StmEvtNoParkingBrakeOn,
+    StmEvtNoAccelPedalOff,
+    StmEvtNoAccelPedalOn,
+    StmEvtNoLampOff,
+    StmEvtNoLampOn,
+    StmEvtNoLightstatusBrakeOff,
+    StmEvtNoLightstatusBrakeOn,
+    StmEvtNoRestrictionModeOff,
+    StmEvtNoRestrictionModeOn,
+
+    StmEvtNoNum,
+
+    StmEvtNoMin = StmEvtNoNone,
+    StmEvtNoMax = StmEvtNoNum - 1,
 };
 
-enum stm_parking_brake_state_ {
-    gStmParkingBrakeStateNoOff = 0,
-    gStmParkingBrakeStateNoOn
+// Category number
+enum StmCtgNo {
+    StmCtgNoNone = 0,
+    StmCtgNoHomescreen,
+    StmCtgNoMap,
+    StmCtgNoGeneral,
+    StmCtgNoSplitable,
+    StmCtgNoPopUp,
+    StmCtgNoSystemAlert,
+    StmCtgNoRestriction,
+    StmCtgNoSYSTEM,
+
+    StmCtgNoNum,
+
+    StmCtgNoMin = StmCtgNoNone,
+    StmCtgNoMax = StmCtgNoNum - 1,
 };
 
-enum stm_accel_pedal_state_ {
-    gStmAccelPedalStateNoOff = 0,
-    gStmAccelPedalStateNoOn
+// Area number
+enum StmAreaNo {
+    StmAreaNoNone = 0,
+    StmAreaNoFullscreen,
+    StmAreaNoNormal,
+    StmAreaNoSplitMain,
+    StmAreaNoSplitSub,
+    StmAreaNoPopUp,
+    StmAreaNoRestrictionNormal,
+    StmAreaNoRestrictionSplitMain,
+    StmAreaNoRestrictionSplitSub,
+
+    StmAreaNoNum,
+
+    StmAreaNoMin = StmAreaNoNone,
+    StmAreaNoMax = StmAreaNoNum - 1,
 };
 
-enum stm_car_state_ {
-    gStmRunningNoStop = 0,
-    gStmRunningNoRun
-};
+// Layer number
+enum StmLayerNo {
+    StmLayerNoHomescreen = 0,
+    StmLayerNoApps,
+    StmLayerNoRestriction,
+    StmLayerNoOnScreen,
+
+    StmLayerNoNum,
 
-enum stm_lamp_state_ {
-    gStmLampStateNoOff = 0,
-    gStmLampStateNoOn
+    StmLayerNoMin = StmLayerNoHomescreen,
+    StmLayerNoMax = StmLayerNoNum - 1,
 };
 
-enum stm_lightstatus_brake_state_ {
-    gStmLightstatusBrakeStateNoOff = 0,
-    gStmLightstatusBrakeStateNoOn
+// Layout number
+enum StmLayoutNo {
+    StmLayoutNoNone = 0,
+    StmLayoutNoPopUp,
+    StmLayoutNoSysAlt,
+    StmLayoutNoMapNml,
+    StmLayoutNoMapSpl,
+    StmLayoutNoMapFll,
+    StmLayoutNoSplNml,
+    StmLayoutNoSplSpl,
+    StmLayoutNoGenNml,
+    StmLayoutNoHms,
+    StmLayoutNoRstNml,
+    StmLayoutNoRstSplMain,
+    StmLayoutNoRstSplSub,
+    StmLayoutNoSysNml,
+
+    StmLayoutNoNum,
+
+    StmLayoutNoMin = StmLayoutNoNone,
+    StmLayoutNoMax = StmLayoutNoNum - 1,
 };
 
-enum stm_restriction_mode_state_ {
-    gStmRestrictionModeStateNoOff = 0,
-    gStmRestrictionModeStateNoOn
+// Car element number
+enum StmCarElementNo {
+    StmCarElementNoTransGear = 0,
+    StmCarElementNoParkingBrake,
+    StmCarElementNoAccelPedal,
+    StmCarElementNoRunning,
+    StmCarElementNoLamp,
+    StmCarElementNoLightstatusBrake,
+    StmCarElementNoRestrictionMode,
+
+    StmCarElementNoNum,
+
+    StmCarElementNoMin = StmCarElementNoTransGear,
+    StmCarElementNoMax = StmCarElementNoNum - 1,
 };
 
-enum stm_layout_ {
-    gStmLayoutNoNone = 0,
-    gStmLayoutNoPopUp,
-    gStmLayoutNoSysAlt,
-    gStmLayoutNoMapNml,
-    gStmLayoutNoMapSpl,
-    gStmLayoutNoMapFll,
-    gStmLayoutNoSplNml,
-    gStmLayoutNoSplSpl,
-    gStmLayoutNoGenNml,
-    gStmLayoutNoHms,
-    gStmLayoutNoRstNml,
-    gStmLayoutNoRstSplMain,
-    gStmLayoutNoRstSplSub,
-    gStmLayoutNoSysNml,
-
-    gStmLayoutNoNum,
-
-    gStmLayoutNoMin = gStmLayoutNoNone,
-    gStmLayoutNoMax = gStmLayoutNoNum - 1,
+// Enum for car element state
+enum StmTransGearStt {
+    StmTransGearSttNoN = 0,
+    StmTransGearSttNoNotN
 };
 
-enum stm_layer_ {
-    gStmLayerNoHomescreen = 0,
-    gStmLayerNoApps,
-    gStmLayerNoRestriction,
-    gStmLayerNoOnScreen,
+enum StmParkingBrakeStt {
+    StmParkingBrakeSttNoOff = 0,
+    StmParkingBrakeSttNoOn
+};
 
-    gStmLayerNoNum,
+enum StmAccelPedalStt {
+    StmAccelPedalSttNoOff = 0,
+    StmAccelPedalSttNoOn
+};
 
-    gStmLayerNoMin = gStmLayerNoHomescreen,
-    gStmLayerNoMax = gStmLayerNoNum - 1,
+enum StmCarStt {
+    StmRunningNoStop = 0,
+    StmRunningNoRun
 };
 
-enum stm_car_element_ {
-    gStmCarElementNoTransGear = 0,
-    gStmCarElementNoParkingBrake,
-    gStmCarElementNoAccelPedal,
-    gStmCarElementNoRunning,
-    gStmCarElementNoLamp,
-    gStmCarElementNoLightstatusBrake,
-    gStmCarElementNoRestrictionMode,
+enum StmLampStt {
+    StmLampSttNoOff = 0,
+    StmLampSttNoOn
+};
 
-    gStmCarElementNoNum,
+enum StmLightstatusBrakeStt {
+    StmLightstatusBrakeSttNoOff = 0,
+    StmLightstatusBrakeSttNoOn
+};
 
-    gStmCarElementNoMin = gStmCarElementNoTransGear,
-    gStmCarElementNoMax = gStmCarElementNoNum - 1,
+enum StmRestrictionModeSttNo {
+    StmRestrictionModeSttNoOff = 0,
+    StmRestrictionModeSttNoOn
 };
 
 // String for state
-extern const char* gStmEventName[];
-extern const char* gStmCategoryName[];
-extern const char* gStmAreaName[];
-extern const char* gStmLayoutName[];
-extern const char* gStmLayerName[];
-extern const char* gStmCarElementName[];
-extern const char** gStmCarStateNameList[];
+extern const char* kStmEventName[];
+extern const char* kStmCategoryName[];
+extern const char* kStmAreaName[];
+extern const char* kStmLayoutName[];
+extern const char* kStmLayerName[];
+extern const char* kStmCarElementName[];
+extern const char** kStmCarStateNameList[];
 
 // Struct for state
-typedef struct stm_base_state_ {
+typedef struct StmBaseState {
     int changed;
     int state;
-} stm_base_state;
+} StmBaseState;
 
 typedef struct {
-    stm_base_state car_element[gStmCarElementNoNum];
-    stm_base_state layer[gStmLayerNoNum];
-} stm_state_t;
+    StmBaseState car_element[StmCarElementNoNum];
+    StmBaseState layer[StmLayerNoNum];
+} StmState;
 
 
+// API
 void stmInitialize();
-int stmTransitionState(int event_no, stm_state_t* state);
+int stmTransitionState(int event_no, StmState* state);
 void stmUndoState();
 
+
 #endif  // TMCAGLWM_DUMMY_STM_HPP