MDIA: Updated supported command events in MDIA.

Change-Id: I27e3c31602f869d705c1efef8ad74cc442b932ae
RTC: 155877
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25679
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 36 insertions, 81 deletions

diff --git a/src/include/usr/diag/mdia/mdia.H b/src/include/usr/diag/mdia/mdia.H
index 67f85e9a6..826ddb637 100644
--- a/src/include/usr/diag/mdia/mdia.H
+++ b/src/include/usr/diag/mdia/mdia.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -33,34 +35,6 @@
 
 namespace MDIA
 {
-struct MaintCommandEvent;
-
-/**
- * @brief MaintCommandEventType - maint command event types
- */
-enum MaintCommandEventType
-{
-    /**
-     * @brief COMMAND_COMPLETE - command finished at end of last rank
-     */
-    COMMAND_COMPLETE,
-
-    /**
-     * @brief COMMAND_STOPPED - command finished at end of other rank
-     */
-    COMMAND_STOPPED,
-
-    /**
-     * @brief SKIP_MBA - stop testing mba
-     */
-    SKIP_MBA,
-
-    /**
-     * @brief RESET_TIMER - command done but expect long analysis
-     */
-    RESET_TIMER,
-};
-
 /**
  * @brief runStep istep dispatcher entry point.
  *
@@ -90,6 +64,37 @@ errlHndl_t runStep(const TARGETING::TargetHandleList & i_targetList);
 void waitingForMaintCmdEvents(bool & o_waiting);
 
 /**
+ * @brief MaintCommandEventType - maint command event types
+ */
+enum MaintCommandEventType
+{
+    /** The command reached the end of the address range. */
+    COMMAND_COMPLETE,
+
+    /** A fault is found during analysis and no further testing is needed. */
+    STOP_TESTING,
+
+    /** PRD detected an error and needs time to complete analysis. */
+    RESET_TIMER,
+};
+
+/**
+ * @brief MaintCommandEvent maint command event
+ */
+struct MaintCommandEvent
+{
+    /**
+     * @brief type the type associated with the event
+     */
+    MaintCommandEventType type;
+
+    /**
+     * @brief target the target associated with the event
+     */
+    TARGETING::TargetHandle_t target;
+};
+
+/**
  * @brief processEvent prd callback
  *
  * called by prd to inform memory diagnostics of attention
@@ -105,5 +110,7 @@ void waitingForMaintCmdEvents(bool & o_waiting);
  * @post message processed
  */
 errlHndl_t processEvent(MaintCommandEvent & i_event);
+
 }
+
 #endif
diff --git a/src/include/usr/diag/mdia/mdiamevent.H b/src/include/usr/diag/mdia/mdiamevent.H
deleted file mode 100644
index f27fe249b..000000000
--- a/src/include/usr/diag/mdia/mdiamevent.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/include/usr/diag/mdia/mdiamevent.H $                      */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-#ifndef __MDIA_MDIAMEVENT_H
-#define __MDIA_MDIAMEVENT_H
-
-#include <diag/mdia/mdia.H>
-
-/**
- * @file mdiamevent.H
- * @brief mdia maint command event
- */
-
-namespace MDIA
-{
-
-/**
- * @brief MaintCommandEvent maint command event
- */
-struct MaintCommandEvent
-{
-    /**
-     * @brief type the type associated with the event
-     */
-    MaintCommandEventType type;
-
-    /**
-     * @brief target the target associated with the event
-     */
-    TARGETING::TargetHandle_t target;
-};
-}
-#endif