1 files changed, 25 insertions, 33 deletions
diff --git a/src/sbefw/sbeevents.H b/src/sbefw/sbeevents.H
index 233bc6ad..37b40cdf 100644
--- a/src/sbefw/sbeevents.H
+++ b/src/sbefw/sbeevents.H
@@ -39,39 +39,33 @@
  */
 enum sbeEvent
 {
-    SBE_CONTINUE_BOOT_PLCK_EVENT           = 0x0, // From FFDC State
-    SBE_CONTINUE_BOOT_RUNTIME_EVENT        = 0x1, // From FFDC State
-    SBE_RUNTIME_EVENT                      = 0x2, // From FFDC/Unknown/ISTEP/IPLING State
-    SBE_ISTEP_EVENT                        = 0x3, // From FFDC/Unknown State
-    SBE_PLCK_EVENT                         = 0x4, // From FFDC/Unknown state
-    SBE_DUMP_FAILURE_EVENT                 = 0x5, // From IPLING/RUNTIME/MPIPL/DMT/Unknown State
-    SBE_ENTER_MPIPL_EVENT                  = 0x6, // From Runtime State
-    SBE_CONTINUE_MPIPL_EVENT               = 0x7, // From MPIPL Wait State
-    SBE_ABORT_EVENT                        = 0x8, // From Any state
-    SBE_DMT_ENTER_EVENT                    = 0x9, // From Runtime State
-    SBE_DMT_COMP_EVENT                     = 0xA, // From DMT State
-    SBE_FAILURE_EVENT                      = 0xB, // From Any State
-    SBE_FFDC_COLLECT_EVENT                 = 0xC, // From Unknown State
-    SBE_QUIESCE_EVENT                      = 0xD, // From Any State
+    SBE_RUNTIME_EVENT          = 0x0, // From Unknown/ISTEP/IPLING State
+    SBE_ISTEP_EVENT            = 0x1, // From Unknown State
+    SBE_PLCK_EVENT             = 0x2, // From Unknown state
+    SBE_DUMP_FAILURE_EVENT     = 0x3, // From IPLING/RUNTIME/MPIPL/DMT/Unknown State
+    SBE_ENTER_MPIPL_EVENT      = 0x4, // From Runtime State
+    SBE_CONTINUE_MPIPL_EVENT   = 0x5, // From MPIPL Wait State
+    SBE_DMT_ENTER_EVENT        = 0x6, // From Runtime State
+    SBE_DMT_COMP_EVENT         = 0x7, // From DMT State
+    SBE_FAILURE_EVENT          = 0x8, // From Any State
+    SBE_QUIESCE_EVENT          = 0x9, // From Any State
 };
 
 // Maximum number of Events per State
 enum maxEventPerState
 {
-    SBE_STATE_UNKNOWN_MAX_EVENT = 5,
-    SBE_STATE_FFDC_COLLECT_MAX_EVENT = 4,
-    SBE_STATE_IPLING_MAX_EVENT = 5,
-    SBE_STATE_ISTEP_MAX_EVENT = 4,
+    SBE_STATE_UNKNOWN_MAX_EVENT = 4,
+    SBE_STATE_IPLING_MAX_EVENT  = 4,
+    SBE_STATE_ISTEP_MAX_EVENT   = 3,
+    SBE_STATE_MPIPL_MAX_EVENT   = 3,
     SBE_STATE_RUNTIME_MAX_EVENT = 5,
-    SBE_STATE_MPIPL_MAX_EVENT = 3,
-    SBE_STATE_DMT_MAX_EVENT = 2,
-    SBE_STATE_DUMP_MAX_EVENT = 0,
+    SBE_STATE_DMT_MAX_EVENT     = 2,
+    SBE_STATE_DUMP_MAX_EVENT    = 0,
     SBE_STATE_FAILURE_MAX_EVENT = 0,
     SBE_STATE_QUIESCE_MAX_EVENT = 0,
-    SBE_STATE_ABORT_MAX_EVENT = 0,
 
     // Total number of State Transition Events, Addition of all the above
-    SBE_MAX_TRANSITIONS = 28,
+    SBE_MAX_TRANSITIONS = 21,
 };
 
 
@@ -82,16 +76,14 @@ enum maxEventPerState
 enum entryToStateMap
 {
     SBE_STATE_UNKNOWN_ENTRY_TO_MAP = 0,
-    SBE_STATE_FFDC_COLLECT_ENTRY_TO_MAP = SBE_STATE_UNKNOWN_ENTRY_TO_MAP + SBE_STATE_UNKNOWN_MAX_EVENT, // 5
-    SBE_STATE_IPLING_ENTRY_TO_MAP = SBE_STATE_FFDC_COLLECT_ENTRY_TO_MAP + SBE_STATE_FFDC_COLLECT_MAX_EVENT, //9
-    SBE_STATE_ISTEP_ENTRY_TO_MAP = SBE_STATE_IPLING_ENTRY_TO_MAP + SBE_STATE_IPLING_MAX_EVENT, //14
-    SBE_STATE_RUNTIME_ENTRY_TO_MAP = SBE_STATE_ISTEP_ENTRY_TO_MAP + SBE_STATE_ISTEP_MAX_EVENT, //18
-    SBE_STATE_MPIPL_ENTRY_TO_MAP = SBE_STATE_RUNTIME_ENTRY_TO_MAP + SBE_STATE_RUNTIME_MAX_EVENT, //23
-    SBE_STATE_DMT_ENTRY_TO_MAP = SBE_STATE_MPIPL_ENTRY_TO_MAP + SBE_STATE_MPIPL_MAX_EVENT, //26
-    SBE_STATE_DUMP_ENTRY_TO_MAP = SBE_STATE_DMT_ENTRY_TO_MAP + SBE_STATE_DMT_MAX_EVENT, //28
-    SBE_STATE_FAILURE_ENTRY_TO_MAP = SBE_STATE_DUMP_ENTRY_TO_MAP + SBE_STATE_DUMP_MAX_EVENT, //28
-    SBE_STATE_QUIESCE_ENTRY_TO_MAP = SBE_STATE_FAILURE_ENTRY_TO_MAP + SBE_STATE_FAILURE_MAX_EVENT, //28
-    SBE_STATE_ABORT_ENTRY_TO_MAP = SBE_STATE_QUIESCE_ENTRY_TO_MAP + SBE_STATE_QUIESCE_MAX_EVENT, //28
+    SBE_STATE_IPLING_ENTRY_TO_MAP  = SBE_STATE_UNKNOWN_ENTRY_TO_MAP + SBE_STATE_UNKNOWN_MAX_EVENT, // 4
+    SBE_STATE_ISTEP_ENTRY_TO_MAP   = SBE_STATE_IPLING_ENTRY_TO_MAP + SBE_STATE_IPLING_MAX_EVENT, //8
+    SBE_STATE_MPIPL_ENTRY_TO_MAP   = SBE_STATE_ISTEP_ENTRY_TO_MAP + SBE_STATE_ISTEP_MAX_EVENT, //11
+    SBE_STATE_RUNTIME_ENTRY_TO_MAP = SBE_STATE_MPIPL_ENTRY_TO_MAP + SBE_STATE_MPIPL_MAX_EVENT, //14
+    SBE_STATE_DMT_ENTRY_TO_MAP     = SBE_STATE_RUNTIME_ENTRY_TO_MAP + SBE_STATE_RUNTIME_MAX_EVENT, //19
+    SBE_STATE_DUMP_ENTRY_TO_MAP    = SBE_STATE_DMT_ENTRY_TO_MAP + SBE_STATE_DMT_MAX_EVENT, //21
+    SBE_STATE_FAILURE_ENTRY_TO_MAP = SBE_STATE_DUMP_ENTRY_TO_MAP + SBE_STATE_DUMP_MAX_EVENT, //21
+    SBE_STATE_QUIESCE_ENTRY_TO_MAP = SBE_STATE_FAILURE_ENTRY_TO_MAP + SBE_STATE_FAILURE_MAX_EVENT, //21
 };
 
 #endif //__SBEFW_SBEEVENTS_H