Change PNOR Guard record format, and remove unused enums.

Change-Id: I58e5c81788b91f6f4ce119562a37ed1e4adde605
RTC: 62755
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5025
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 10 insertions, 38 deletions

diff --git a/src/include/usr/hwas/common/deconfigGard.H b/src/include/usr/hwas/common/deconfigGard.H
index 7e2716308..801c8b520 100644
--- a/src/include/usr/hwas/common/deconfigGard.H
+++ b/src/include/usr/hwas/common/deconfigGard.H
@@ -101,15 +101,10 @@ public:
     {
         uint32_t              iv_recordId;
         TARGETING::EntityPath iv_targetId;
-        union
-        {
-            char iv_cardMruSn[12]; // TODO is there a SN type?
-            uint32_t iv_chipMruEcid; // TODO is there an ECID type?
-        };
         uint32_t              iv_errlogPlid;
-        uint8_t               iv_errorType; // Value from GARD_ErrorType
-        uint8_t               iv_padding[3];
-        uint32_t              iv_gardTime;
+        uint8_t               iv_errorType; //from hwasCallout.H GARD_ErrorType
+        uint8_t               iv_ResourceRecovery;
+        uint8_t               iv_padding[6];
     };
 
     typedef std::vector<GardRecord> GardRecords_t;
diff --git a/src/include/usr/hwas/common/hwasCallout.H b/src/include/usr/hwas/common/hwasCallout.H
index f382388dd..028d10eb8 100644
--- a/src/include/usr/hwas/common/hwasCallout.H
+++ b/src/include/usr/hwas/common/hwasCallout.H
@@ -47,38 +47,15 @@ enum DeconfigEnum
     DELAYED_DECONFIG,
 };
 
-// from gard/fsp/GardExtIntData.H
 typedef enum {
     GARD_NULL                   = 0x00,
-    GARD_Pending                = 0xE1,
-    GARD_PendingCmplt           = 0xEE,
-    GARD_Unrecoverable          = 0xE2,
-    GARD_Fatal                  = 0xE3,
-    GARD_Fabric                 = 0xE4,
-    GARD_Computation            = 0xE5,
-    GARD_ComputationCmplt       = 0xEC,
-    GARD_Predictive             = 0xE6,
-    GARD_PredictiveCmplt        = 0xE9,
-    GARD_ByAssociation          = 0xE8,
-    GARD_ResourceRecovery       = 0xEA,
-    GARD_Cmplt                  = 0xEF,
-    GARD_Func                   = 0xE7,
-    GARD_FuncCmplt              = 0xEB,
-    GARD_DmaRecoverable         = 0xE0,
-    GARD_DmaUnrecoverable       = 0xED,
-    GARD_Tod                    = 0xD0,
-    GARD_TodCmplt               = 0xD1,
-    GARD_Slb                    = 0xD2,
-    GARD_SlbCmplt               = 0xD3,
-    GARD_ProcRecoverable        = 0xD4,
-    GARD_ProcRecoverableCmplt   = 0xD5,
-    GARD_TimeFac                = 0xD6,
-    GARD_TimeFacCmplt           = 0xD7,
-    GARD_GxBusError             = 0xD8,
-    GARD_PowerBusError          = 0xDA,
-    GARD_Withheld               = 0xD9,
-    GARD_PoreError              = 0xDC,
-    GARD_NxError                = 0xDB,
+    GARD_User_Manual            = 0xD2, //Manual Guard.
+    GARD_Unrecoverable          = 0xE2, //TODO:RTC-76814
+    GARD_Fatal                  = 0xE3, //IPL Failures, and others.
+    GARD_Predictive             = 0xE6, //Policy flag to disable.
+    GARD_Func                   = 0xE7, //Policy flag to disable.
+    GARD_Power                  = 0xE9, //Needed since PLID is NOT passed in.
+    GARD_PHYP                   = 0xEA, //Needed since PLID is NOT passed in.
     GARD_Void                   = 0xFF
 } GARD_ErrorType;