summaryrefslogtreecommitdiffstats
path: root/src/include/usr
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/usr')
-rw-r--r--src/include/usr/errl/errlentry.H9
-rw-r--r--src/include/usr/errl/errlprvt.H9
-rw-r--r--src/include/usr/errl/errlreasoncodes.H1
-rw-r--r--src/include/usr/errl/errlsctnhdr.H52
-rw-r--r--src/include/usr/errl/errlsrc.H16
-rw-r--r--src/include/usr/errl/errlud.H51
-rw-r--r--src/include/usr/errl/errluh.H7
7 files changed, 98 insertions, 47 deletions
diff --git a/src/include/usr/errl/errlentry.H b/src/include/usr/errl/errlentry.H
index 7bc971ed0..48af65a22 100644
--- a/src/include/usr/errl/errlentry.H
+++ b/src/include/usr/errl/errlentry.H
@@ -500,6 +500,15 @@ public:
void addProcedureCallout(const HWAS::epubProcedureID i_procedure,
const HWAS::callOutPriority i_priority);
+ /**
+ * @brief Import flatened error log
+ *
+ * @param[in] i_buffer, pointer to flat data
+ * @param[in] i_len length of flat data
+ * @return Status 0==SUCCESS
+ */
+ uint64_t unflatten( const void * i_buffer, uint64_t i_len);
+
private:
/**
diff --git a/src/include/usr/errl/errlprvt.H b/src/include/usr/errl/errlprvt.H
index 86bfb820a..fbdf82588 100644
--- a/src/include/usr/errl/errlprvt.H
+++ b/src/include/usr/errl/errlprvt.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* COPYRIGHT International Business Machines Corp. 2011,2013 */
/* */
/* p1 */
/* */
@@ -100,6 +100,13 @@ private:
*/
uint64_t flatten( void * o_pBuffer, const uint64_t i_cbBuffer );
+ /**
+ * @brief Import flattened data
+ * @parm[in] i_buf, pointer to the flattened data
+ * @return The number of bytes consumed
+ */
+ uint64_t unflatten( const void * i_buf );
+
// Instance data
diff --git a/src/include/usr/errl/errlreasoncodes.H b/src/include/usr/errl/errlreasoncodes.H
index 4e3de79db..6369f6926 100644
--- a/src/include/usr/errl/errlreasoncodes.H
+++ b/src/include/usr/errl/errlreasoncodes.H
@@ -40,6 +40,7 @@ namespace ERRORLOG
ERRL_FIRST_MODULE_ID = 0x00,
ERRL_USERDATA_TEST_MOD_ID = 0x01,
ERRL_TEST_MOD_ID = 0x02,
+ ERRL_RT_TEST_MOD_ID = 0x03,
//........
ERRL_LAST_MODULE_ID = 0xFF
};
diff --git a/src/include/usr/errl/errlsctnhdr.H b/src/include/usr/errl/errlsctnhdr.H
index 870c101ed..295ae6cd7 100644
--- a/src/include/usr/errl/errlsctnhdr.H
+++ b/src/include/usr/errl/errlsctnhdr.H
@@ -1,25 +1,25 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/include/usr/errl/errlsctnhdr.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/errlsctnhdr.H $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* */
+/* 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 otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
#ifndef ERRLSCTNHDR_H
#define ERRLSCTNHDR_H
/**
@@ -130,8 +130,12 @@ private:
*/
uint64_t flatten( void * o_pbuffer, const uint64_t i_cbBuffer );
-
-
+ /**
+ * @brief Import flattened data
+ * @param[in] i_buf, pointer to flattened data
+ * @return number of bytes consumed in the flattened data
+ */
+ uint64_t unflatten( const void * i_buf );
// Instance data.
diff --git a/src/include/usr/errl/errlsrc.H b/src/include/usr/errl/errlsrc.H
index 42c75158b..89fa9cbef 100644
--- a/src/include/usr/errl/errlsrc.H
+++ b/src/include/usr/errl/errlsrc.H
@@ -116,6 +116,13 @@ private:
uint64_t flatSize() const;
/**
+ * @brief Import data
+ * @param[in] i_buf, pointer to the flattened data
+ * @return number of bytes consumed
+ */
+ uint64_t unflatten( const void * i_buf );
+
+ /**
* @brief return the failing subsystem id value
*
* @return Failing subsystem ID
@@ -131,6 +138,15 @@ private:
void setSubSys( epubSubSystem_t i_ssid ){ iv_ssid = i_ssid; };
+ /**
+ * Convert ascii hex digit to binary
+ * @param[in] c, the ascii hex digit
+ * @return the binary value 0-15
+ * @note return value is only valid if input is valid hex digit
+ * '0'-'9', 'A'-'F', 'a'='f'
+ */
+ uint64_t aschex2bin(char c);
+
// Instance data
srcType_t iv_srcType : 8; // SRC type, the ?? in SRC ??xxxxxx
uint8_t iv_modId; // module ID
diff --git a/src/include/usr/errl/errlud.H b/src/include/usr/errl/errlud.H
index 30817e112..04da45210 100644
--- a/src/include/usr/errl/errlud.H
+++ b/src/include/usr/errl/errlud.H
@@ -1,25 +1,25 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/include/usr/errl/errlud.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/errlud.H $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* */
+/* 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 otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
#ifndef ERRLUD_H
#define ERRLUD_H
/**
@@ -112,6 +112,13 @@ private:
+ /**
+ * @brief Import data
+ * Imports data created with flatten.
+ * @param[in] i_buf, pointer to the flattened data
+ * @return number of bytes consumed
+ */
+ uint64_t unflatten( const void * i_buf );
/**
diff --git a/src/include/usr/errl/errluh.H b/src/include/usr/errl/errluh.H
index 0e2f35e09..6c1caf4a3 100644
--- a/src/include/usr/errl/errluh.H
+++ b/src/include/usr/errl/errluh.H
@@ -93,6 +93,13 @@ private:
uint64_t flatten( void * io_pBuffer, const uint64_t i_cbBuffer );
/**
+ * @brief Import data
+ * @param[in] i_buf, the pointer to the flattened data
+ * @return number of bytes consumed
+ */
+ uint64_t unflatten( const void * i_buf );
+
+ /**
* @brief return the failing subsystem id value
*
* @return Failing subsystem ID
OpenPOWER on IntegriCloud