summaryrefslogtreecommitdiffstats
path: root/src/include/usr
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/usr')
-rw-r--r--src/include/usr/devicefw/driverif.H8
-rw-r--r--src/include/usr/devicefw/userif.H4
-rw-r--r--src/include/usr/errl/errludtarget.H75
-rw-r--r--src/include/usr/hwas/common/hwasCallout.H129
4 files changed, 46 insertions, 170 deletions
diff --git a/src/include/usr/devicefw/driverif.H b/src/include/usr/devicefw/driverif.H
index f90223a54..fa33e26b1 100644
--- a/src/include/usr/devicefw/driverif.H
+++ b/src/include/usr/devicefw/driverif.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* COPYRIGHT International Business Machines Corp. 2011,2013 */
/* */
/* p1 */
/* */
@@ -30,11 +30,15 @@
#ifndef __DEVICEFW_DRIVERIF
#define __DEVICEFW_DRIVERIF
+#ifndef PARSER
+
#include <devicefw/userif.H>
#include <stdarg.h>
#include <builtins.h>
#include <targeting/common/targetservice.H>
+#endif // not PARSER
+
namespace DeviceFW
{
/** @enum AccessType_DriverOnly
@@ -74,6 +78,7 @@ namespace DeviceFW
WILDCARD = -1,
};
+#ifndef PARSER
/** Construct the device addressing parameters for FSISCOM device ops.
* @param[in] i_address - FSISCOM address to operate on.
*/
@@ -344,6 +349,7 @@ namespace DeviceFW
TARGETING::Target* i_target,
void* io_buffer, size_t& io_buflen,
AccessType_DriverOnly i_accessType, va_list i_args);
+#endif // not PARSER
};
#endif
diff --git a/src/include/usr/devicefw/userif.H b/src/include/usr/devicefw/userif.H
index 7fbad5d74..f7708568b 100644
--- a/src/include/usr/devicefw/userif.H
+++ b/src/include/usr/devicefw/userif.H
@@ -31,9 +31,11 @@
#ifndef __DEVICEFW_USERIF
#define __DEVICEFW_USERIF
+#ifndef PARSER
#include <stdint.h>
#include <errl/errlentry.H>
#include <targeting/common/targetservice.H>
+#endif // not PARSER
namespace DeviceFW
{
@@ -55,6 +57,7 @@ namespace DeviceFW
LAST_ACCESS_TYPE,
};
+#ifndef PARSER
/** Construct the device addressing parameters for SCOM device ops.
* @param[in] i_address - Scom address to operate on.
*/
@@ -193,6 +196,7 @@ namespace DeviceFW
errlHndl_t deviceWrite(TARGETING::Target* i_target,
void* i_buffer, size_t& io_buflen,
AccessType i_accessType, ...);
+#endif // not PARSER
};
diff --git a/src/include/usr/errl/errludtarget.H b/src/include/usr/errl/errludtarget.H
deleted file mode 100644
index 67ba891c3..000000000
--- a/src/include/usr/errl/errludtarget.H
+++ /dev/null
@@ -1,75 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/include/usr/errl/errludtarget.H $ */
-/* */
-/* IBM CONFIDENTIAL */
-/* */
-/* COPYRIGHT International Business Machines Corp. 2012,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 ERRL_UDTARGET_H
-#define ERRL_UDTARGET_H
-
-/**
- * @file errludTarget.H
- *
- * Defines the ErrlUserDetailsTarget class that adds target FFDC to an
- * error log as user detail data
- */
-
-#include <errl/errluserdetails.H>
-
-// Forward reference
-namespace TARGETING
-{
- class Target;
-}
-
-namespace ERRORLOG
-{
-
-/**
- * @class ErrlUserDetailsTarget
- *
- * Adds Target FFDC to an error log as user detail data
-*/
-class ErrlUserDetailsTarget : public ErrlUserDetails
-{
-public:
- /**
- * @brief Constructor
- *
- * Captures the supplied Target's FFDC data internally
- *
- * @param i_pTarget Pointer to Target to capture as user detail data
- */
- ErrlUserDetailsTarget(const TARGETING::Target * i_pTarget);
-
- /**
- * @brief Destructor
- */
- virtual ~ErrlUserDetailsTarget();
-
-private:
- // Disabled
- ErrlUserDetailsTarget(const ErrlUserDetailsTarget &);
- ErrlUserDetailsTarget & operator=(const ErrlUserDetailsTarget &);
-};
-
-}
-
-#endif
-
diff --git a/src/include/usr/hwas/common/hwasCallout.H b/src/include/usr/hwas/common/hwasCallout.H
index 2b7302146..439b79fdd 100644
--- a/src/include/usr/hwas/common/hwasCallout.H
+++ b/src/include/usr/hwas/common/hwasCallout.H
@@ -1,26 +1,25 @@
-/* IBM_PROLOG_BEGIN_TAG
- * This is an automatically generated prolog.
- *
- * $Source: src/include/usr/hwas/common/hwasCallout.H $
- *
- * IBM CONFIDENTIAL
- *
- * COPYRIGHT International Business Machines Corp. 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
- */
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/include/usr/hwas/common/hwasCallout.H $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2012,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 __HWAS_HWASCALLOUT_H
#define __HWAS_HWASCALLOUT_H
/**
@@ -33,7 +32,9 @@
/******************************************************************************/
// Includes
/******************************************************************************/
+#ifndef PARSER
#include <targeting/common/target.H>
+#endif // not PARSER
namespace HWAS
{
@@ -91,86 +92,23 @@ enum epubProcedureID
{
EPUB_PRC_NONE = 0x00,
EPUB_PRC_FIND_DECONFIGURED_PART = 0x01,
- EPUB_PRC_EARLY_TERM = 0x02,
- EPUB_PRC_USER_ERR = 0x03,
EPUB_PRC_SP_CODE = 0x04,
EPUB_PRC_PHYP_CODE = 0x05,
- EPUB_PRC_INT_PROB = 0x06,
- EPUB_PRC_TOD_PROB = 0x07,
EPUB_PRC_ALL_PROCS = 0x08,
EPUB_PRC_ALL_MEMCRDS = 0x09,
EPUB_PRC_INVALID_PART = 0x0A,
- EPUB_PRC_RIO_PORTX = 0x0B,
- EPUB_PRC_DIMM_CONNECTOR = 0x0C,
- EPUB_PRC_FNM_CODE = 0x0D,
- EPUB_PRC_WAIT_FOR_PHYP = 0x0E,
- EPUB_PRC_SMA_CODE = 0x0F,
EPUB_PRC_LVL_SUPP = 0x10,
- EPUB_PRC_SUE_PREVERROR = 0x11,
- EPUB_PRC_CODE_UPDATE = 0x12,
- EPUB_PRC_PLUG_COUNT_EXCEED = 0x13,
- EPUB_PRC_SYSUNIT = 0x14,
- EPUB_PRC_IOPATH = 0x15,
EPUB_PRC_PROCPATH = 0x16,
- EPUB_PRC_FIPS_DUMP = 0x17,
- EPUB_PRC_REBOOT = 0x18,
- EPUB_PRC_THERMAL_FAULT = 0x19,
- EPUB_PRC_BACKPLANE = 0x1A,
- EPUB_PRC_ATTN_LINE = 0x1B,
EPUB_PRC_NO_VPD_FOR_FRU = 0x1C,
- EPUB_PRC_IOBRIDGE = 0x1D,
- EPUB_PRC_ANCHOR = 0x1E,
- EPUB_PRC_SYSTEM_VPD = 0x1F,
- EPUB_PRC_ENCLOSURE_VPD = 0x20,
- EPUB_PRC_SURV_HMC_ERROR = 0x21,
EPUB_PRC_MEMORY_PLUGGING_ERROR = 0x22,
- EPUB_PRC_MEM_SCRUB_REBOOT = 0x23,
- EPUB_PRC_SMP_CABLE = 0x24,
- EPUB_PRC_MS_PROC_TIMEOUT = 0x25,
- EPUB_PRC_JTAG_PATH = 0x26,
- EPUB_PRC_MNFG_DIMM_ISOLATION = 0x27,
- EPUB_PRC_LOGAUTH_WARN = 0x28,
- EPUB_PRC_IIC_BUS_ISOLATION = 0x29,
- EPUB_PRC_FABRIC_ISOLATION = 0x2A,
- EPUB_PRC_STATIC_IP = 0x2B,
- EPUB_PRC_MUX_CARD = 0x2C,
EPUB_PRC_FSI_PATH = 0x2D,
- EPUB_PRC_SERV_PROC = 0x2E,
- EPUB_PRC_PSI_LINK = 0x2F,
EPUB_PRC_PROC_AB_BUS = 0x30,
EPUB_PRC_PROC_XYZ_BUS = 0x31,
- EPUB_PRC_GX_SLOT = 0x32,
- EPUB_PRC_MEMBUS_REPAIR = 0x33,
EPUB_PRC_MEMBUS_ERROR = 0x34,
- EPUB_PRC_NET_SWITCH = 0x35,
- EPUB_PRC_OVER_TEMP = 0x36,
EPUB_PRC_EIBUS_ERROR = 0x37,
- EPUB_PRC_CCM_VPD_CARD = 0x38,
- EPUB_PRC_HOST_ONE_NETWORK = 0x39,
- EPUB_PRC_NET_CABLE_MISPLUG = 0x3A,
- EPUB_PRC_NET_DATA_NOT_AVAILABLE = 0x3B,
- EPUB_PRC_MAC_ADDRESS_DUP = 0x3C,
- EPUB_PRC_INVALID_HUB_CONNECTION = 0x3D,
- EPUB_PRC_MISSING_NODE = 0x3E,
EPUB_PRC_POWER_ERROR = 0x3F,
- EPUB_PRC_NO_LINKS = 0x40,
- EPUB_PRC_BAD_IP_SUBNET = 0x41,
- EPUB_PRC_RFSP = 0x42,
- EPUB_PRC_STANDBY_POWR = 0x43,
- EPUB_PRC_FSP_LVL_SUPP = 0x44,
- EPUB_PRC_BALANCED_MEMORY = 0x45,
- EPUB_PRC_CHECK_POWR_SRCS = 0x46,
- EPUB_PRC_BPC_PROC = 0x47,
- EPUB_PRC_BLADE_LNK_DWN = 0x48,
- EPUB_PRC_WRAP_PRBS = 0x49,
- EPUB_PRC_PRBS_SWRAP = 0x4A,
- EPUB_PRC_INVALID_IP = 0x4B,
- EPUB_PRC_CCIN_NOT_FOUND = 0x4C,
EPUB_PRC_PERFORMANCE_DEGRADED = 0x4D,
- EPUB_PRC_WKP_FAIL = 0x4E,
- EPUB_PRC_MEMORY_UE = 0x4F,
- EPUB_PRC_PLATFORM_CODE = 0x50,
- EPUB_PRC_MAX
+ EPUB_PRC_HB_CODE = 0x51
};
// from srci/fsp/srci.H
@@ -184,6 +122,7 @@ enum callOutPriority
SRCI_PRIORITY_HIGH = 6
};
+#ifndef PARSER
/**
* @brief processCallout process the userdetail for a callout, calling
@@ -201,6 +140,7 @@ void processCallout(const uint32_t i_errlPlid,
// typedef for function pointer that the errlog class will use.
typedef void (*processCalloutFn)(const uint32_t, uint8_t *, uint64_t);
+#endif // not PARSER
//
const uint8_t HW_CALLOUT = 0x01;
@@ -211,18 +151,19 @@ const uint8_t TARGET_IS_SENTINEL = 0xF0;
typedef struct callout_ud
{
uint8_t type;
- callOutPriority priority; // uint8_t
+ uint8_t pad[3];
+ callOutPriority priority; // uint32_t
union {
struct { // deconfigure / gard
- DeconfigEnum deconfigState; // uint8_t
- GARD_ErrorType gardErrorType; // uint8_t
+ DeconfigEnum deconfigState; // uint32_t
+ GARD_ErrorType gardErrorType; // uint32_t
uint32_t cpuid;
- } __attribute__((packed));
+ };
struct { // callout
- epubProcedureID procedure; // uint8_t
- } __attribute__((packed));
+ epubProcedureID procedure; // uint32_t
+ };
};
-} __attribute__((packed)) callout_ud_t;
+} callout_ud_t;
}; // end namespace
OpenPOWER on IntegriCloud