diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2012-08-31 14:41:37 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-09-07 17:39:53 -0500 |
| commit | 4e5c9ec9784fd33d9ea10dee94fac197ec90527b (patch) | |
| tree | fe6d7c7713f888bf63bff1e245bae8e912a6c483 /src | |
| parent | e859413ac33a2fb410c83cc8af4bf755181791e9 (diff) | |
| download | talos-hostboot-4e5c9ec9784fd33d9ea10dee94fac197ec90527b.tar.gz talos-hostboot-4e5c9ec9784fd33d9ea10dee94fac197ec90527b.zip | |
PSI and FSP attribute types for hwserver.
Muruli requires these for his RTC story noted below. This should be co-req'd or
checked in with feature 844814.
Change-Id: I37838d29e3dde29544675fada4be92ff586458f3
RTC:43017
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1657
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/hwas/common/hwas.C | 48 | ||||
| -rw-r--r-- | src/usr/targeting/common/entitypath.C | 5 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 6 |
3 files changed, 35 insertions, 24 deletions
diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C index 3d3ab10ca..868a3f19c 100644 --- a/src/usr/hwas/common/hwas.C +++ b/src/usr/hwas/common/hwas.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/hwas/common/hwas.C $ - * - * 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 - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/hwas/common/hwas.C $ */ +/* */ +/* 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 otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file hwas.C * @@ -132,9 +131,10 @@ errlHndl_t discoverTargets() // find TYPE_PROC, TYPE_MEMBUF and TYPE_DIMM PredicateCTM predProc(CLASS_CHIP, TYPE_PROC); PredicateCTM predMembuf(CLASS_CHIP, TYPE_MEMBUF); + PredicateCTM predFSP(CLASS_CHIP, TYPE_FSP); PredicateCTM predDimm(CLASS_LOGICAL_CARD, TYPE_DIMM); PredicatePostfixExpr checkExpr; - checkExpr.push(&predProc).push(&predMembuf).Or().push(&predDimm).Or(); + checkExpr.push(&predProc).push(&predMembuf).Or().push(&predDimm).Or().push(&predFSP).Or(); TargetHandleList pCheckPres; targetService().getAssociated( pCheckPres, pSys, diff --git a/src/usr/targeting/common/entitypath.C b/src/usr/targeting/common/entitypath.C index 46ba7d88a..53023e4f6 100644 --- a/src/usr/targeting/common/entitypath.C +++ b/src/usr/targeting/common/entitypath.C @@ -20,6 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ + /** * @file targeting/common/entitypath.C * @@ -353,6 +354,10 @@ const char* EntityPath::pathElementTypeAsString( return "DPSS"; case TYPE_OCC: return "OCC"; + case TYPE_PSI: + return "PSI"; + case TYPE_FSP: + return "FSP"; // case TYPE_FSI_LINK: // return "FSI-link"; // case TYPE_CFAM: diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 4dc420ceb..47214785c 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -162,6 +162,12 @@ <name>OCC</name> </enumerator> <enumerator> + <name>PSI</name> + </enumerator> + <enumerator> + <name>FSP</name> + </enumerator> + <enumerator> <name>LAST_IN_RANGE</name> </enumerator> <default>NA</default> |
