summaryrefslogtreecommitdiffstats
path: root/src/include/usr/errl/errlentry.H
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/usr/errl/errlentry.H')
-rw-r--r--src/include/usr/errl/errlentry.H171
1 files changed, 85 insertions, 86 deletions
diff --git a/src/include/usr/errl/errlentry.H b/src/include/usr/errl/errlentry.H
index 32f9c2fe7..b3255a55b 100644
--- a/src/include/usr/errl/errlentry.H
+++ b/src/include/usr/errl/errlentry.H
@@ -1,25 +1,26 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/include/usr/errl/errlentry.H $
-//
-// IBM CONFIDENTIAL
-//
-// COPYRIGHT International Business Machines Corp. 2011
-//
-// p1
-//
-// Object Code Only (OCO) source materials
-// Licensed Internal Code Source Materials
-// IBM HostBoot Licensed Internal Code
-//
-// The source code for this program is not published or other-
-// wise divested of its trade secrets, irrespective of what has
-// been deposited with the U.S. Copyright Office.
-//
-// Origin: 30
-//
-// IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG
+ * This is an automatically generated prolog.
+ *
+ * $Source: src/include/usr/errl/errlentry.H $
+ *
+ * IBM CONFIDENTIAL
+ *
+ * COPYRIGHT International Business Machines Corp. 2011-2012
+ *
+ * p1
+ *
+ * Object Code Only (OCO) source materials
+ * Licensed Internal Code Source Materials
+ * IBM HostBoot Licensed Internal Code
+ *
+ * The source code for this program is not published or other-
+ * wise divested of its trade secrets, irrespective of what has
+ * been deposited with the U.S. Copyright Office.
+ *
+ * Origin: 30
+ *
+ * IBM_PROLOG_END_TAG
+ */
#ifndef ERRLENTRY_H
#define ERRLENTRY_H
/**
@@ -54,7 +55,8 @@
#include <errl/errlsrc.H>
#include <errl/errlud.H>
#include <hbotcompid.H>
-
+#include <targeting/common/target.H>
+#include <hwas/common/hwasCallout.H>
namespace ERRORLOG
{
@@ -359,85 +361,40 @@ public:
*/
void removeBackTrace();
-private:
- /**
- * @brief The ErrlManager will call here to ask the
- * ErrlEntry to assign the time of commit, and to assign
- * the commiter's comp ID.
- * The ErrlManager is the primary user of this call.
- *
- */
- void commit( compId_t i_commiterComp );
-
-
-
- /**
- * @brief Compute the flattened size of an error log. It is typical
- * to call this function for the size of buffer required, then
- * allocate a buffer, then call flatten().
- * The ErrlManager is the primary user of this call.
- *
- * @return Size in bytes of the flattened data.
- */
- uint64_t flattenedSize();
-
-
- /**
- * @brief Flatten the data to caller's buffer. The resulting flat
- * data will be in PEL (platform event log) format.
- * The ErrlManager is the primary user of this call.
- *
- * @param[in,out] o_buffer Points to data block to be filled
- * @param[in] i_cbBuffer Count of bytes in buffer supplied
- *
- * @return Count of bytes copied to caller's
- * buffer or else zero if it does not fit.
- */
- uint64_t flatten( void * o_buffer, const uint64_t i_cbBuffer );
-
-
- /**
- * @brief Disabled copy constructor and assignment operator
- */
- ErrlEntry(const ErrlEntry& i_right);
- ErrlEntry& operator=(const ErrlEntry& i_right);
-
-
-
-#if 0
-
- //@todo - The interfaces in this block still need support in order
- // to have code written.
-
-
- //@todo: Need to set EPUB_Sub system based on highest
- // priority call out FRU
/**
- * @brief Add a hardware ( FRU ) callout
+ * @brief Add a hardware callout
*
- * @param[in] i_resourceId The resource identifier for the part
* @param[in] i_target The hardware target
+ * @param[in] i_priority Priority of the callout
+ * @param [in] i_deconfigState Enum indicating whether the failing part
+ * should be deconfigured.
+ * @param [in] i_gardErrorType to indicate what type of failure occured
*
* @return void
*/
- void addFruCallout(const target_t i_target,
- const callOutPriority_t i_priority);
-
+ void addHwCallout(const TARGETING::Target *i_target,
+ const HWAS::callOutPriority i_priority,
+ const HWAS::DeconfigEnum i_deconfigState,
+ const HWAS::GARD_ErrorType i_gardErrorType);
- //@todo: Need to set EPUB_Sub system based on highest
- // priority procedure call out
/**
* @brief Add a procedure ( software ) callout
* Adds the given service procedure to the list
* of callouts for the log
*
- * @param[in] i_priority Priority of the callout
* @param[in] i_procedure Procedure identifier.
+ * @param[in] i_priority Priority of the callout
*
* @return void
*/
- void addProcedureCallout(const epubProcedureId_t i_procedure,
- const callOutPriority_t i_priority);
+ void addProcedureCallout(const HWAS::epubProcedureID i_procedure,
+ const HWAS::callOutPriority i_priority);
+
+private:
+
+#if 0
+ //@todo: Need to set EPUB_Sub system based on highest
+ // priority call out FRU
/**
* @brief Adds a software section to the log which is
@@ -465,6 +422,48 @@ private:
#endif
+
+ /**
+ * @brief The ErrlManager will call here to ask the
+ * ErrlEntry to assign the time of commit, and to assign
+ * the commiter's comp ID.
+ * The ErrlManager is the primary user of this call.
+ *
+ */
+ void commit( compId_t i_commiterComp );
+
+
+ /**
+ * @brief Compute the flattened size of an error log. It is typical
+ * to call this function for the size of buffer required, then
+ * allocate a buffer, then call flatten().
+ * The ErrlManager is the primary user of this call.
+ *
+ * @return Size in bytes of the flattened data.
+ */
+ uint64_t flattenedSize();
+
+
+ /**
+ * @brief Flatten the data to caller's buffer. The resulting flat
+ * data will be in PEL (platform event log) format.
+ * The ErrlManager is the primary user of this call.
+ *
+ * @param[in,out] o_buffer Points to data block to be filled
+ * @param[in] i_cbBuffer Count of bytes in buffer supplied
+ *
+ * @return Count of bytes copied to caller's
+ * buffer or else zero if it does not fit.
+ */
+ uint64_t flatten( void * o_buffer, const uint64_t i_cbBuffer );
+
+
+ /**
+ * @brief Disabled copy constructor and assignment operator
+ */
+ ErrlEntry(const ErrlEntry& i_right);
+ ErrlEntry& operator=(const ErrlEntry& i_right);
+
private:
// Data Members
ErrlPrvt iv_Private; // private header object
OpenPOWER on IntegriCloud