diff options
| author | Zane Shelley <zshelle@us.ibm.com> | 2019-08-21 13:47:54 -0500 |
|---|---|---|
| committer | Zane C Shelley <zshelle@us.ibm.com> | 2019-08-26 10:45:33 -0500 |
| commit | 69ad226636c14e0fdb754abc8a645d93e69710d6 (patch) | |
| tree | e4acef9e11714823433d4e87f7ee0213479e6f75 /src/usr/diag/prdf | |
| parent | 6c12d1ea9e6af6948d4fdae0e69c2841fbedee1d (diff) | |
| download | talos-hostboot-69ad226636c14e0fdb754abc8a645d93e69710d6.tar.gz talos-hostboot-69ad226636c14e0fdb754abc8a645d93e69710d6.zip | |
PRD: removed redundant header iipbits.h
Change-Id: I88903ba637a1f89910fcd226325a220c98169945
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82617
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamen G Tyner <ben.tyner@ibm.com>
Reviewed-by: Zane C Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82786
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf')
12 files changed, 15 insertions, 49 deletions
diff --git a/src/usr/diag/prdf/common/framework/config/iipSystem.h b/src/usr/diag/prdf/common/framework/config/iipSystem.h index ef4ed9322..b1b6ad1f4 100755 --- a/src/usr/diag/prdf/common/framework/config/iipSystem.h +++ b/src/usr/diag/prdf/common/framework/config/iipSystem.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 1996,2018 */ +/* Contributors Listed Below - COPYRIGHT 1996,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -87,9 +87,7 @@ #include <vector> #include <map> -#ifndef IIPCONST_H #include <iipconst.h> //TARGETING::TargetHandle_t, DOMAIN_ID_TYPE -#endif #include <iipsdbug.h> // Include file for ATTENTION_TYPE diff --git a/src/usr/diag/prdf/common/framework/register/iipCaptureData.h b/src/usr/diag/prdf/common/framework/register/iipCaptureData.h index e65e94d3f..9aae2880c 100755 --- a/src/usr/diag/prdf/common/framework/register/iipCaptureData.h +++ b/src/usr/diag/prdf/common/framework/register/iipCaptureData.h @@ -78,9 +78,7 @@ #include <list> -#ifndef IIPCONST_H #include <iipconst.h> -#endif #include <prdfPlatServices.H> #include <functional> // @jl04 a Needed for the unary function in new predicate. diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h index fb1443df8..af67c68aa 100755 --- a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h +++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2017 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -70,9 +70,7 @@ #include <iipErrorRegisterFilter.h> #endif -#ifndef IIPBITS_H -#include <iipbits.h> -#endif +#include <prdfBitString.H> namespace PRDF { diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.C b/src/usr/diag/prdf/common/framework/register/iipscr.C index d4d7017a2..6834c6415 100755 --- a/src/usr/diag/prdf/common/framework/register/iipscr.C +++ b/src/usr/diag/prdf/common/framework/register/iipscr.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 1997,2017 */ +/* Contributors Listed Below - COPYRIGHT 1997,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ /* Includes */ /*--------------------------------------------------------------------*/ -#include <iipbits.h> +#include <prdfBitString.H> #include <iipscr.h> #include <iipconst.h> diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.h b/src/usr/diag/prdf/common/framework/register/iipscr.h index 53c9bfa5a..cd1243dc6 100755 --- a/src/usr/diag/prdf/common/framework/register/iipscr.h +++ b/src/usr/diag/prdf/common/framework/register/iipscr.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2017 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -43,7 +43,7 @@ // Includes //---------------------------------------------------------------------- -#include <iipbits.h> +#include <prdfBitString.H> #include <iipconst.h> #include <iipsdbug.h> #include <prdfMain.H> diff --git a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C index 39113507b..5ddb11a4c 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C +++ b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C @@ -31,7 +31,7 @@ // Includes //---------------------------------------------------------------------- -#include <iipbits.h> +#include <prdfBitString.H> #include <prdfHomRegisterAccess.H> // dg06a #include <prdfScomRegister.H> #include <iipchip.h> diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C index 3244022c7..450a7bc9c 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <prdfMain.H> #include <prdfAssert.h> #include <iipstep.h> -#include <iipbits.h> +#include <prdfBitString.H> #include <iipResolution.h> #include <iipscr.h> #include <prdfErrorSignature.H> diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C index 1a808d23a..c7bf802a4 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C @@ -30,11 +30,10 @@ //---------------------------------------------------------------------- // Includes //---------------------------------------------------------------------- -#define prdfHomRegisterAccess_C #include <prdfHomRegisterAccess.H> #include <prdf_service_codes.H> -#include <iipbits.h> +#include <prdfBitString.H> #include <prdfMain.H> #include <prdfPlatServices.H> #include <prdfGlobal.H> @@ -46,9 +45,6 @@ #include <p9_stop_api.H> #endif -#undef prdfHomRegisterAccess_C - - using namespace TARGETING; namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H index be34884a3..8d069b3cb 100644 --- a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H +++ b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2017 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ /** @file prdfRegisterCache.H */ #include <map> -#include <iipbits.h> +#include <prdfBitString.H> #include <prdfGlobal.H> #include <prdfScanFacility.H> #include <prdfScomRegisterAccess.H> diff --git a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C index 9f7171c80..f8a445b20 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C @@ -37,7 +37,7 @@ #include <iipchip.h> #include <prdfScomRegister.H> #include <iipconst.h> -#include <iipbits.h> +#include <prdfBitString.H> #include <prdfMain.H> #include <prdfRasServices.H> #include <prdfRegisterCache.H> diff --git a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H index 8bb126ed9..3cf10f690 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H +++ b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H @@ -37,7 +37,7 @@ */ #include <iipscr.h> -#include <iipbits.h> +#include <prdfBitString.H> #include <prdfHomRegisterAccess.H> #include <prdfTrace.H> diff --git a/src/usr/diag/prdf/common/util/iipbits.h b/src/usr/diag/prdf/common/util/iipbits.h deleted file mode 100755 index 7b02e52f3..000000000 --- a/src/usr/diag/prdf/common/util/iipbits.h +++ /dev/null @@ -1,24 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/common/util/iipbits.h $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* COPYRIGHT International Business Machines Corp. 1993,2014 */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ -/* */ -/* IBM_PROLOG_END_TAG */ - -#include<prdfBitString.H> |
