diff options
author | Mike Jones <mjjones@us.ibm.com> | 2013-11-08 14:16:43 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-11-08 15:28:30 -0600 |
commit | d0a89f3ad739fef9c62a9bf6d7f3fdea0983cfa7 (patch) | |
tree | 65cd11c9c029be1807ca5a03312909c137bb106e | |
parent | 4b0ab464ceaa66fbb9b3d4f833215c26f441b1c9 (diff) | |
download | talos-hostboot-d0a89f3ad739fef9c62a9bf6d7f3fdea0983cfa7.tar.gz talos-hostboot-d0a89f3ad739fef9c62a9bf6d7f3fdea0983cfa7.zip |
Cronus aix exe compile warnings for fapiReturnCode.H
Seems like you cannot declare structures inside anonymous unions.
Change-Id: I3d0358e0dd87a2392e9eeb15706359f41eec7864
RTC: 90972
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7132
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r-- | src/include/usr/hwpf/fapi/fapiReturnCode.H | 102 |
1 files changed, 55 insertions, 47 deletions
diff --git a/src/include/usr/hwpf/fapi/fapiReturnCode.H b/src/include/usr/hwpf/fapi/fapiReturnCode.H index 31d1b0ebc..f637bc701 100644 --- a/src/include/usr/hwpf/fapi/fapiReturnCode.H +++ b/src/include/usr/hwpf/fapi/fapiReturnCode.H @@ -52,6 +52,7 @@ * mjjones 08/26/2013 Support Hw Callout * rjknight 09/10/2013 Support DIMM callout from * MBA port and dimm number + * mjjones 11/08/2013 Do not define struct in union */ #ifndef FAPIRETURNCODE_H_ @@ -298,58 +299,65 @@ public: * An array of these is passed to the addErrorInfo function when a HWP * generates an error by calling the FAPI_SET_HWP_ERROR macro */ + struct ErrorInfoEntryFfdc + { + uint8_t iv_ffdcObjIndex; + uint16_t iv_ffdcSize; + uint32_t iv_ffdcId; + }; + + struct ErrorInfoEntryHwCallout + { + uint8_t iv_hw; + uint8_t iv_calloutPriority; + uint8_t iv_refObjIndex; + }; + + struct ErrorInfoEntryProcCallout + { + uint8_t iv_procedure; + uint8_t iv_calloutPriority; + }; + + struct ErrorInfoEntryBusCallout + { + uint8_t iv_endpoint1ObjIndex; + uint8_t iv_endpoint2ObjIndex; + uint8_t iv_calloutPriority; + }; + + struct ErrorInfoEntryTargetCDG + { + uint8_t iv_targetObjIndex; + uint8_t iv_callout; + uint8_t iv_deconfigure; + uint8_t iv_gard; + uint8_t iv_calloutPriority; + }; + + struct ErrorInfoEntryChildrenCDG + { + uint8_t iv_parentObjIndex; + uint8_t iv_callout; + uint8_t iv_deconfigure; + uint32_t iv_childType; + uint8_t iv_childPort; + uint8_t iv_childNumber; + uint8_t iv_gard; + uint8_t iv_calloutPriority; + }; + struct ErrorInfoEntry { uint8_t iv_type; // Value from ErrorInfoType union { - struct - { - uint8_t iv_ffdcObjIndex; - uint16_t iv_ffdcSize; - uint32_t iv_ffdcId; - } ffdc; - - struct - { - uint8_t iv_hw; - uint8_t iv_calloutPriority; - uint8_t iv_refObjIndex; - } hw_callout; - - struct - { - uint8_t iv_procedure; - uint8_t iv_calloutPriority; - } proc_callout; - - struct - { - uint8_t iv_endpoint1ObjIndex; - uint8_t iv_endpoint2ObjIndex; - uint8_t iv_calloutPriority; - } bus_callout; - - struct - { - uint8_t iv_targetObjIndex; - uint8_t iv_callout; - uint8_t iv_deconfigure; - uint8_t iv_gard; - uint8_t iv_calloutPriority; - } target_cdg; - - struct - { - uint8_t iv_parentObjIndex; - uint8_t iv_callout; - uint8_t iv_deconfigure; - uint32_t iv_childType; - uint8_t iv_childPort; - uint8_t iv_childNumber; - uint8_t iv_gard; - uint8_t iv_calloutPriority; - } children_cdg; + ErrorInfoEntryFfdc ffdc; + ErrorInfoEntryHwCallout hw_callout; + ErrorInfoEntryProcCallout proc_callout; + ErrorInfoEntryBusCallout bus_callout; + ErrorInfoEntryTargetCDG target_cdg; + ErrorInfoEntryChildrenCDG children_cdg; }; }; |