diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/usr/diag/attn/attn.H | 4 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attn_common.mk | 32 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnbits.C (renamed from src/usr/diag/attn/attnbits.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnbits.H (renamed from src/usr/diag/attn/attnbits.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnfwd.H (renamed from src/usr/diag/attn/attnfwd.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnlist.C (renamed from src/usr/diag/attn/attnlist.C) | 12 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnlist.H (renamed from src/usr/diag/attn/attnlist.H) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnmem.C (renamed from src/usr/diag/attn/attnmem.C) | 12 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnmem.H (renamed from src/usr/diag/attn/attnmem.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnops.H (renamed from src/usr/diag/attn/attnops.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnprd.H (renamed from src/usr/diag/attn/attnprd.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnproc.C (renamed from src/usr/diag/attn/attnproc.C) | 12 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnproc.H (renamed from src/usr/diag/attn/attnproc.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnscom.C (renamed from src/usr/diag/attn/attnscom.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attnscom.H (renamed from src/usr/diag/attn/attnscom.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attntarget.C (renamed from src/usr/diag/attn/attntarget.C) | 14 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attntarget.H (renamed from src/usr/diag/attn/attntarget.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attntrace.C (renamed from src/usr/diag/attn/attntrace.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/common/attntrace.H (renamed from src/usr/diag/attn/attntrace.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/attn.C (renamed from src/usr/diag/attn/attn.C) | 22 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/attn_hb.mk | 27 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/attnsvc.C (renamed from src/usr/diag/attn/attnsvc.C) | 16 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/attnsvc.H (renamed from src/usr/diag/attn/attnsvc.H) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/makefile | 45 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attncomp.H (renamed from src/usr/diag/attn/test/attncomp.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakeelement.H (renamed from src/usr/diag/attn/test/attnfakeelement.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakegfir.C (renamed from src/usr/diag/attn/test/attnfakegfir.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakegfir.H (renamed from src/usr/diag/attn/test/attnfakegfir.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakegp1.C (renamed from src/usr/diag/attn/test/attnfakegp1.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakegp1.H (renamed from src/usr/diag/attn/test/attnfakegp1.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakeipoll.C (renamed from src/usr/diag/attn/test/attnfakeipoll.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakeipoll.H (renamed from src/usr/diag/attn/test/attnfakeipoll.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakemcs.C (renamed from src/usr/diag/attn/test/attnfakemcs.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakemcs.H (renamed from src/usr/diag/attn/test/attnfakemcs.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakeprd.C (renamed from src/usr/diag/attn/test/attnfakeprd.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakeprd.H (renamed from src/usr/diag/attn/test/attnfakeprd.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakepresenter.C (renamed from src/usr/diag/attn/test/attnfakepresenter.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakepresenter.H (renamed from src/usr/diag/attn/test/attnfakepresenter.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakesys.C (renamed from src/usr/diag/attn/test/attnfakesys.C) | 12 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfakesys.H (renamed from src/usr/diag/attn/test/attnfakesys.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfaketarget.C (renamed from src/usr/diag/attn/test/attnfaketarget.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnfaketarget.H (renamed from src/usr/diag/attn/test/attnfaketarget.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attninject.H (renamed from src/usr/diag/attn/test/attninject.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnmeminject.C (renamed from src/usr/diag/attn/test/attnmeminject.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnmeminject.H (renamed from src/usr/diag/attn/test/attnmeminject.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnrand.S (renamed from src/usr/diag/attn/test/attnrand.S) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnrandsource.C (renamed from src/usr/diag/attn/test/attnrandsource.C) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnrandsource.H (renamed from src/usr/diag/attn/test/attnrandsource.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntest.C (renamed from src/usr/diag/attn/test/attntest.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntest.H (renamed from src/usr/diag/attn/test/attntest.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestipl.H (renamed from src/usr/diag/attn/test/attntestipl.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestlist.H (renamed from src/usr/diag/attn/test/attntestlist.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestmem.H (renamed from src/usr/diag/attn/test/attntestmem.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestops.H (renamed from src/usr/diag/attn/test/attntestops.H) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestproc.H (renamed from src/usr/diag/attn/test/attntestproc.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestscom.H (renamed from src/usr/diag/attn/test/attntestscom.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntestsvc.H (renamed from src/usr/diag/attn/test/attntestsvc.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntesttest.H (renamed from src/usr/diag/attn/test/attntesttest.H) | 8 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attntesttrace.H (renamed from src/usr/diag/attn/test/attntesttrace.H) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnvalidate.C (renamed from src/usr/diag/attn/test/attnvalidate.C) | 10 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/attnvalidate.H (renamed from src/usr/diag/attn/test/attnvalidate.H) | 6 | ||||
-rw-r--r-- | src/usr/diag/attn/ipl/test/makefile (renamed from src/usr/diag/attn/test/makefile) | 9 | ||||
-rw-r--r-- | src/usr/diag/attn/makefile | 21 | ||||
-rw-r--r-- | src/usr/diag/attn/runtime/attn_rt.C | 56 | ||||
-rw-r--r-- | src/usr/diag/attn/runtime/attn_rt.mk | 26 | ||||
-rw-r--r-- | src/usr/diag/attn/runtime/makefile | 43 | ||||
-rw-r--r-- | src/usr/diag/attn/runtime/test/attntest_rt.H | 53 | ||||
-rw-r--r-- | src/usr/diag/attn/runtime/test/makefile | 35 | ||||
-rw-r--r-- | src/usr/ibscom/ibscom.C | 4 |
69 files changed, 633 insertions, 210 deletions
diff --git a/src/include/usr/diag/attn/attn.H b/src/include/usr/diag/attn/attn.H index f0b3cf209..9fdea28f2 100644 --- a/src/include/usr/diag/attn/attn.H +++ b/src/include/usr/diag/attn/attn.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/common/attn_common.mk b/src/usr/diag/attn/common/attn_common.mk new file mode 100644 index 000000000..f5993c83c --- /dev/null +++ b/src/usr/diag/attn/common/attn_common.mk @@ -0,0 +1,32 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/attn/common/attn_common.mk $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# +# +# 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 + +ATTN_COMMON_OBJS += attntrace.o +ATTN_COMMON_OBJS += attnlist.o +ATTN_COMMON_OBJS += attnbits.o +ATTN_COMMON_OBJS += attntarget.o +ATTN_COMMON_OBJS += attnscom.o +ATTN_COMMON_OBJS += attnproc.o +ATTN_COMMON_OBJS += attnmem.o diff --git a/src/usr/diag/attn/attnbits.C b/src/usr/diag/attn/common/attnbits.C index 3a906e2f5..4edcddb7e 100644 --- a/src/usr/diag/attn/attnbits.C +++ b/src/usr/diag/attn/common/attnbits.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnbits.C $ */ +/* $Source: src/usr/diag/attn/common/attnbits.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,8 +28,8 @@ * @brief HBATTN register addresses, bits of interest. */ -#include "attnfwd.H" -#include "attnbits.H" +#include "common/attnfwd.H" +#include "common/attnbits.H" using namespace PRDF; using namespace std; diff --git a/src/usr/diag/attn/attnbits.H b/src/usr/diag/attn/common/attnbits.H index cff1de0e4..df7673519 100644 --- a/src/usr/diag/attn/attnbits.H +++ b/src/usr/diag/attn/common/attnbits.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnbits.H $ */ +/* $Source: src/usr/diag/attn/common/attnbits.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/attnfwd.H b/src/usr/diag/attn/common/attnfwd.H index ade739ee8..18061ee38 100644 --- a/src/usr/diag/attn/attnfwd.H +++ b/src/usr/diag/attn/common/attnfwd.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnfwd.H $ */ +/* $Source: src/usr/diag/attn/common/attnfwd.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -37,7 +39,7 @@ #include <targeting/common/target.H> #include <vector> #include <builtins.h> -#include "attnbits.H" +#include "common/attnbits.H" class AttnTraceTest; class AttnSvcTest; diff --git a/src/usr/diag/attn/attnlist.C b/src/usr/diag/attn/common/attnlist.C index 3a7c347b1..864625f04 100644 --- a/src/usr/diag/attn/attnlist.C +++ b/src/usr/diag/attn/common/attnlist.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnlist.C $ */ +/* $Source: src/usr/diag/attn/common/attnlist.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,9 +28,9 @@ * @brief HBATTN AttentionList function definitions. */ -#include "attnfwd.H" -#include "attnlist.H" -#include "attnops.H" +#include "common/attnfwd.H" +#include "common/attnlist.H" +#include "common/attnops.H" #include <algorithm> using namespace std; diff --git a/src/usr/diag/attn/attnlist.H b/src/usr/diag/attn/common/attnlist.H index 60fd29fe0..b1e741ede 100644 --- a/src/usr/diag/attn/attnlist.H +++ b/src/usr/diag/attn/common/attnlist.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnlist.H $ */ +/* $Source: src/usr/diag/attn/common/attnlist.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,8 +31,8 @@ * @brief HBATTN AttentionList definition. */ -#include "attnops.H" -#include "attnfwd.H" +#include "common/attnops.H" +#include "common/attnfwd.H" namespace ATTN { diff --git a/src/usr/diag/attn/attnmem.C b/src/usr/diag/attn/common/attnmem.C index 43317605b..9357ca240 100644 --- a/src/usr/diag/attn/attnmem.C +++ b/src/usr/diag/attn/common/attnmem.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnmem.C $ */ +/* $Source: src/usr/diag/attn/common/attnmem.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -28,9 +30,9 @@ #include <errl/errlmanager.H> #include <targeting/common/targetservice.H> -#include "attnmem.H" -#include "attnlist.H" -#include "attntarget.H" +#include "common/attnmem.H" +#include "common/attnlist.H" +#include "common/attntarget.H" using namespace std; using namespace PRDF; diff --git a/src/usr/diag/attn/attnmem.H b/src/usr/diag/attn/common/attnmem.H index d873ba7de..80799cee6 100644 --- a/src/usr/diag/attn/attnmem.H +++ b/src/usr/diag/attn/common/attnmem.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnmem.H $ */ +/* $Source: src/usr/diag/attn/common/attnmem.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN memory attention operations definition. */ -#include "attnops.H" +#include "common/attnops.H" #include <map> namespace ATTN diff --git a/src/usr/diag/attn/attnops.H b/src/usr/diag/attn/common/attnops.H index 108bf1186..6494f1078 100644 --- a/src/usr/diag/attn/attnops.H +++ b/src/usr/diag/attn/common/attnops.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnops.H $ */ +/* $Source: src/usr/diag/attn/common/attnops.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN Attention and AttentionOps definitions. */ -#include "attnfwd.H" +#include "common/attnfwd.H" namespace ATTN { diff --git a/src/usr/diag/attn/attnprd.H b/src/usr/diag/attn/common/attnprd.H index 894c12198..219d6926e 100644 --- a/src/usr/diag/attn/attnprd.H +++ b/src/usr/diag/attn/common/attnprd.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnprd.H $ */ +/* $Source: src/usr/diag/attn/common/attnprd.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN PRD wrapper class definitions. */ -#include "attnfwd.H" +#include "common/attnfwd.H" namespace ATTN { diff --git a/src/usr/diag/attn/attnproc.C b/src/usr/diag/attn/common/attnproc.C index 5c1a013ff..79f5a7732 100644 --- a/src/usr/diag/attn/attnproc.C +++ b/src/usr/diag/attn/common/attnproc.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnproc.C $ */ +/* $Source: src/usr/diag/attn/common/attnproc.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -27,9 +29,9 @@ */ #include <errl/errlmanager.H> -#include "attnproc.H" -#include "attnlist.H" -#include "attntrace.H" +#include "common/attnproc.H" +#include "common/attnlist.H" +#include "common/attntrace.H" using namespace std; using namespace PRDF; diff --git a/src/usr/diag/attn/attnproc.H b/src/usr/diag/attn/common/attnproc.H index 5d4b08d4c..c5ad171a3 100644 --- a/src/usr/diag/attn/attnproc.H +++ b/src/usr/diag/attn/common/attnproc.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnproc.H $ */ +/* $Source: src/usr/diag/attn/common/attnproc.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN Processor attention operations definition. */ -#include "attnops.H" +#include "common/attnops.H" namespace ATTN { diff --git a/src/usr/diag/attn/attnscom.C b/src/usr/diag/attn/common/attnscom.C index 51b65f5ee..4faf602a8 100644 --- a/src/usr/diag/attn/attnscom.C +++ b/src/usr/diag/attn/common/attnscom.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnscom.C $ */ +/* $Source: src/usr/diag/attn/common/attnscom.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,8 +28,8 @@ * @brief HBATTN ATTN SCOM abstraction layer function definitions. */ -#include "attnscom.H" -#include "attntrace.H" +#include "common/attnscom.H" +#include "common/attntrace.H" #include <devicefw/userif.H> #include <ibscom/ibscomreasoncodes.H> diff --git a/src/usr/diag/attn/attnscom.H b/src/usr/diag/attn/common/attnscom.H index bf480b3dc..0d2458a19 100644 --- a/src/usr/diag/attn/attnscom.H +++ b/src/usr/diag/attn/common/attnscom.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnscom.H $ */ +/* $Source: src/usr/diag/attn/common/attnscom.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN SCOM abstraction layer definitions. */ -#include "attnfwd.H" +#include "common/attnfwd.H" namespace ATTN { diff --git a/src/usr/diag/attn/attntarget.C b/src/usr/diag/attn/common/attntarget.C index e182637fc..fcc9df417 100644 --- a/src/usr/diag/attn/attntarget.C +++ b/src/usr/diag/attn/common/attntarget.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attntarget.C $ */ +/* $Source: src/usr/diag/attn/common/attntarget.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,10 +28,10 @@ * @brief HBATTN Target service wrapper class method definitions. */ -#include "attntarget.H" -#include "attntrace.H" -#include "targeting/common/predicates/predicates.H" -#include "targeting/common/utilFilter.H" +#include "common/attntarget.H" +#include "common/attntrace.H" +#include <targeting/common/predicates/predicates.H> +#include <targeting/common/utilFilter.H> #include <util/singleton.H> using namespace TARGETING; diff --git a/src/usr/diag/attn/attntarget.H b/src/usr/diag/attn/common/attntarget.H index 31070744f..141dcdf7a 100644 --- a/src/usr/diag/attn/attntarget.H +++ b/src/usr/diag/attn/common/attntarget.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attntarget.H $ */ +/* $Source: src/usr/diag/attn/common/attntarget.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN Target service wrapper class definitions. */ -#include "attnfwd.H" +#include "common/attnfwd.H" #include <map> namespace ATTN diff --git a/src/usr/diag/attn/attntrace.C b/src/usr/diag/attn/common/attntrace.C index 1ed7681bc..d8f0cd282 100644 --- a/src/usr/diag/attn/attntrace.C +++ b/src/usr/diag/attn/common/attntrace.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attntrace.C $ */ +/* $Source: src/usr/diag/attn/common/attntrace.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,7 +28,7 @@ * @brief HBATTN trace descriptors. */ -#include "attntrace.H" +#include "common/attntrace.H" #include <limits.h> namespace ATTN diff --git a/src/usr/diag/attn/attntrace.H b/src/usr/diag/attn/common/attntrace.H index e031696c9..df90e5c55 100644 --- a/src/usr/diag/attn/attntrace.H +++ b/src/usr/diag/attn/common/attntrace.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attntrace.H $ */ +/* $Source: src/usr/diag/attn/common/attntrace.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/attn.C b/src/usr/diag/attn/ipl/attn.C index b99298c51..021c275bb 100644 --- a/src/usr/diag/attn/attn.C +++ b/src/usr/diag/attn/ipl/attn.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attn.C $ */ +/* $Source: src/usr/diag/attn/hostboot/attn.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -27,15 +29,15 @@ * @brief HBATTN utility function definitions. */ -#include "attnprd.H" -#include "attnops.H" -#include "attnlist.H" -#include "attntrace.H" -#include "attnsvc.H" -#include "attnproc.H" -#include "attnmem.H" +#include "ipl/attnsvc.H" +#include "common/attnprd.H" +#include "common/attnops.H" +#include "common/attnlist.H" +#include "common/attntrace.H" +#include "common/attntarget.H" +#include "common/attnproc.H" +#include "common/attnmem.H" #include <util/singleton.H> -#include "attntarget.H" #include <errl/errlmanager.H> using namespace std; diff --git a/src/usr/diag/attn/ipl/attn_hb.mk b/src/usr/diag/attn/ipl/attn_hb.mk new file mode 100644 index 000000000..ef8bab79e --- /dev/null +++ b/src/usr/diag/attn/ipl/attn_hb.mk @@ -0,0 +1,27 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/attn/hostboot/attn_hb.mk $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# +# +# 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 + +ATTN_HB_OBJS += attn.o +ATTN_HB_OBJS += attnsvc.o diff --git a/src/usr/diag/attn/attnsvc.C b/src/usr/diag/attn/ipl/attnsvc.C index db130ac30..4b6b75faa 100644 --- a/src/usr/diag/attn/attnsvc.C +++ b/src/usr/diag/attn/ipl/attnsvc.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnsvc.C $ */ +/* $Source: src/usr/diag/attn/hostboot/attnsvc.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -30,12 +30,12 @@ #include <sys/msg.h> #include <errl/errlmanager.H> -#include "attnsvc.H" -#include "attntrace.H" -#include "attnprd.H" -#include "attnproc.H" -#include "attnmem.H" -#include "attntarget.H" +#include "ipl/attnsvc.H" +#include "common/attntrace.H" +#include "common/attnprd.H" +#include "common/attnproc.H" +#include "common/attnmem.H" +#include "common/attntarget.H" using namespace std; using namespace PRDF; diff --git a/src/usr/diag/attn/attnsvc.H b/src/usr/diag/attn/ipl/attnsvc.H index 6d5c4c5ad..27713e3a2 100644 --- a/src/usr/diag/attn/attnsvc.H +++ b/src/usr/diag/attn/ipl/attnsvc.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/attnsvc.H $ */ +/* $Source: src/usr/diag/attn/hostboot/attnsvc.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -31,8 +33,8 @@ #include <sys/task.h> #include <sys/sync.h> -#include "attnfwd.H" -#include "attnlist.H" +#include "common/attnfwd.H" +#include "common/attnlist.H" namespace ATTN { diff --git a/src/usr/diag/attn/ipl/makefile b/src/usr/diag/attn/ipl/makefile new file mode 100644 index 000000000..528a8d1b0 --- /dev/null +++ b/src/usr/diag/attn/ipl/makefile @@ -0,0 +1,45 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/attn/hostboot/makefile $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2014 +# [+] International Business Machines Corp. +# +# +# 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 + +ROOTPATH = ../../../../.. + +EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag +CFLAGS += -iquote${ROOTPATH}/src/usr/diag/attn + +MODULE = attn + +include attn_hb.mk +include ../common/attn_common.mk + +OBJS += ${ATTN_HB_OBJS} +OBJS += ${ATTN_COMMON_OBJS} + +SUBDIRS += test.d + +VPATH += .. +VPATH += ../.. +VPATH += ../common + +include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/attn/test/attncomp.H b/src/usr/diag/attn/ipl/test/attncomp.H index fd6de6ccc..ae1cda2e9 100644 --- a/src/usr/diag/attn/test/attncomp.H +++ b/src/usr/diag/attn/ipl/test/attncomp.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attncomp.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attncomp.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakeelement.H b/src/usr/diag/attn/ipl/test/attnfakeelement.H index d72aa96ed..13a40eec6 100644 --- a/src/usr/diag/attn/test/attnfakeelement.H +++ b/src/usr/diag/attn/ipl/test/attnfakeelement.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakeelement.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakeelement.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakegfir.C b/src/usr/diag/attn/ipl/test/attnfakegfir.C index 48252fcbc..809ac6955 100644 --- a/src/usr/diag/attn/test/attnfakegfir.C +++ b/src/usr/diag/attn/ipl/test/attnfakegfir.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakegfir.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakegfir.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -28,7 +30,7 @@ #include "attnfakegfir.H" #include "attnfakesys.H" -#include "../attntarget.H" +#include "../../common/attntarget.H" using namespace TARGETING; using namespace PRDF; diff --git a/src/usr/diag/attn/test/attnfakegfir.H b/src/usr/diag/attn/ipl/test/attnfakegfir.H index df223a97b..530ef8850 100644 --- a/src/usr/diag/attn/test/attnfakegfir.H +++ b/src/usr/diag/attn/ipl/test/attnfakegfir.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakegfir.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakegfir.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakegp1.C b/src/usr/diag/attn/ipl/test/attnfakegp1.C index 790a4e29b..91793be7e 100644 --- a/src/usr/diag/attn/test/attnfakegp1.C +++ b/src/usr/diag/attn/ipl/test/attnfakegp1.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakegp1.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakegp1.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -28,7 +30,7 @@ #include "attnfakegp1.H" #include "attnfakesys.H" -#include "../attntarget.H" +#include "../../common/attntarget.H" using namespace TARGETING; using namespace PRDF; diff --git a/src/usr/diag/attn/test/attnfakegp1.H b/src/usr/diag/attn/ipl/test/attnfakegp1.H index 9d3542166..6191ffef8 100644 --- a/src/usr/diag/attn/test/attnfakegp1.H +++ b/src/usr/diag/attn/ipl/test/attnfakegp1.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakegp1.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakegp1.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakeipoll.C b/src/usr/diag/attn/ipl/test/attnfakeipoll.C index 5f37fb64e..5d030a858 100644 --- a/src/usr/diag/attn/test/attnfakeipoll.C +++ b/src/usr/diag/attn/ipl/test/attnfakeipoll.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakeipoll.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakeipoll.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ #include "attnfakeipoll.H" #include "attnfakesys.H" #include "attnfakepresenter.H" -#include "../attntarget.H" +#include "../../common/attntarget.H" using namespace PRDF; using namespace TARGETING; diff --git a/src/usr/diag/attn/test/attnfakeipoll.H b/src/usr/diag/attn/ipl/test/attnfakeipoll.H index ddea7bc55..641c0efd5 100644 --- a/src/usr/diag/attn/test/attnfakeipoll.H +++ b/src/usr/diag/attn/ipl/test/attnfakeipoll.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakeipoll.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakeipoll.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakemcs.C b/src/usr/diag/attn/ipl/test/attnfakemcs.C index 53ff5e8b5..a4d5685a7 100644 --- a/src/usr/diag/attn/test/attnfakemcs.C +++ b/src/usr/diag/attn/ipl/test/attnfakemcs.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakemcs.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakemcs.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -28,7 +30,7 @@ #include "attnfakemcs.H" #include "attnfakesys.H" -#include "../attntarget.H" +#include "../../common/attntarget.H" using namespace TARGETING; using namespace PRDF; diff --git a/src/usr/diag/attn/test/attnfakemcs.H b/src/usr/diag/attn/ipl/test/attnfakemcs.H index 95ecda018..c351ab83f 100644 --- a/src/usr/diag/attn/test/attnfakemcs.H +++ b/src/usr/diag/attn/ipl/test/attnfakemcs.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakemcs.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakemcs.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakeprd.C b/src/usr/diag/attn/ipl/test/attnfakeprd.C index 6b6c4cf7b..0f4bd9a3d 100644 --- a/src/usr/diag/attn/test/attnfakeprd.C +++ b/src/usr/diag/attn/ipl/test/attnfakeprd.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakeprd.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakeprd.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -28,8 +30,8 @@ #include "attnfakeprd.H" #include "attninject.H" -#include "../attnops.H" -#include "../attnlist.H" +#include "../../common/attnops.H" +#include "../../common/attnlist.H" #include <sys/time.h> using namespace PRDF; diff --git a/src/usr/diag/attn/test/attnfakeprd.H b/src/usr/diag/attn/ipl/test/attnfakeprd.H index a731ef51e..ae034b68b 100644 --- a/src/usr/diag/attn/test/attnfakeprd.H +++ b/src/usr/diag/attn/ipl/test/attnfakeprd.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakeprd.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakeprd.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -30,7 +32,7 @@ */ #include "attntest.H" -#include "../attnprd.H" +#include "../../common/attnprd.H" namespace ATTN { diff --git a/src/usr/diag/attn/test/attnfakepresenter.C b/src/usr/diag/attn/ipl/test/attnfakepresenter.C index 15e6b8fa8..d44bdf7de 100644 --- a/src/usr/diag/attn/test/attnfakepresenter.C +++ b/src/usr/diag/attn/ipl/test/attnfakepresenter.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakepresenter.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakepresenter.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -27,8 +29,8 @@ */ #include "attnfakepresenter.H" -#include "../attntrace.H" -#include "../attntarget.H" +#include "../../common/attntrace.H" +#include "../../common/attntarget.H" using namespace TARGETING; using namespace PRDF; diff --git a/src/usr/diag/attn/test/attnfakepresenter.H b/src/usr/diag/attn/ipl/test/attnfakepresenter.H index c5b2baf43..38abb15e8 100644 --- a/src/usr/diag/attn/test/attnfakepresenter.H +++ b/src/usr/diag/attn/ipl/test/attnfakepresenter.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakepresenter.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakepresenter.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnfakesys.C b/src/usr/diag/attn/ipl/test/attnfakesys.C index 611a801a4..b2ef23f4c 100644 --- a/src/usr/diag/attn/test/attnfakesys.C +++ b/src/usr/diag/attn/ipl/test/attnfakesys.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakesys.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakesys.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,9 +28,9 @@ * @brief HBATTN fake system class method definitions. */ -#include "../attnlist.H" -#include "../attntrace.H" -#include "../attntarget.H" +#include "../../common/attnlist.H" +#include "../../common/attntrace.H" +#include "../../common/attntarget.H" #include "attnfakeelement.H" #include "attnfakesys.H" #include "attntest.H" diff --git a/src/usr/diag/attn/test/attnfakesys.H b/src/usr/diag/attn/ipl/test/attnfakesys.H index 26ab5946d..4525cad91 100644 --- a/src/usr/diag/attn/test/attnfakesys.H +++ b/src/usr/diag/attn/ipl/test/attnfakesys.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfakesys.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfakesys.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN fake system class definition. */ -#include "../attnscom.H" +#include "../../common/attnscom.H" #include "attntest.H" #include "attncomp.H" #include "attninject.H" diff --git a/src/usr/diag/attn/test/attnfaketarget.C b/src/usr/diag/attn/ipl/test/attnfaketarget.C index 28d9b3c14..9f76135ea 100644 --- a/src/usr/diag/attn/test/attnfaketarget.C +++ b/src/usr/diag/attn/ipl/test/attnfaketarget.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfaketarget.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfaketarget.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -27,7 +29,7 @@ */ #include "attnfaketarget.H" -#include "../attntrace.H" +#include "../../common/attntrace.H" using namespace TARGETING; using namespace std; diff --git a/src/usr/diag/attn/test/attnfaketarget.H b/src/usr/diag/attn/ipl/test/attnfaketarget.H index de03d891f..b49c5bfe8 100644 --- a/src/usr/diag/attn/test/attnfaketarget.H +++ b/src/usr/diag/attn/ipl/test/attnfaketarget.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnfaketarget.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnfaketarget.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -30,7 +32,7 @@ */ #include "attntest.H" -#include "../attntarget.H" +#include "../../common/attntarget.H" namespace ATTN { diff --git a/src/usr/diag/attn/test/attninject.H b/src/usr/diag/attn/ipl/test/attninject.H index bc4ffad6e..be3d07f98 100644 --- a/src/usr/diag/attn/test/attninject.H +++ b/src/usr/diag/attn/ipl/test/attninject.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attninject.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attninject.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnmeminject.C b/src/usr/diag/attn/ipl/test/attnmeminject.C index 3388bbae3..947e84958 100644 --- a/src/usr/diag/attn/test/attnmeminject.C +++ b/src/usr/diag/attn/ipl/test/attnmeminject.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnmeminject.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnmeminject.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -21,8 +23,8 @@ /* */ /* IBM_PROLOG_END_TAG */ #include "attnmeminject.H" -#include "../attnscom.H" -#include "../attntarget.H" +#include "../../common/attnscom.H" +#include "../../common/attntarget.H" using namespace PRDF; using namespace TARGETING; diff --git a/src/usr/diag/attn/test/attnmeminject.H b/src/usr/diag/attn/ipl/test/attnmeminject.H index 21c4a5947..b9dfe856f 100644 --- a/src/usr/diag/attn/test/attnmeminject.H +++ b/src/usr/diag/attn/ipl/test/attnmeminject.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnmeminject.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnmeminject.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attnrand.S b/src/usr/diag/attn/ipl/test/attnrand.S index f6a97602d..4230ff097 100644 --- a/src/usr/diag/attn/test/attnrand.S +++ b/src/usr/diag/attn/ipl/test/attnrand.S @@ -1,11 +1,13 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/attn/test/attnrand.S $ +# $Source: src/usr/diag/attn/hostboot/test/attnrand.S $ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2012,2014 +# Contributors Listed Below - COPYRIGHT 2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/usr/diag/attn/test/attnrandsource.C b/src/usr/diag/attn/ipl/test/attnrandsource.C index c229d2455..81bd03002 100644 --- a/src/usr/diag/attn/test/attnrandsource.C +++ b/src/usr/diag/attn/ipl/test/attnrandsource.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnrandsource.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnrandsource.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -28,7 +30,7 @@ #include "attnrandsource.H" #include "attninject.H" -#include "../attntrace.H" +#include "../../common/attntrace.H" #include "sys/time.h" using namespace PRDF; diff --git a/src/usr/diag/attn/test/attnrandsource.H b/src/usr/diag/attn/ipl/test/attnrandsource.H index 5a5e837b2..19550f3b9 100644 --- a/src/usr/diag/attn/test/attnrandsource.H +++ b/src/usr/diag/attn/ipl/test/attnrandsource.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnrandsource.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnrandsource.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attntest.C b/src/usr/diag/attn/ipl/test/attntest.C index b3ec212c2..c06b5e895 100644 --- a/src/usr/diag/attn/test/attntest.C +++ b/src/usr/diag/attn/ipl/test/attntest.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntest.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntest.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,8 +31,8 @@ #include <arch/ppc.H> #include <algorithm> #include "attntest.H" -#include "../attntrace.H" -#include "../attntarget.H" +#include "../../common/attntrace.H" +#include "../../common/attntarget.H" using namespace std; using namespace PRDF; diff --git a/src/usr/diag/attn/test/attntest.H b/src/usr/diag/attn/ipl/test/attntest.H index 1132f8b90..98a43901c 100644 --- a/src/usr/diag/attn/test/attntest.H +++ b/src/usr/diag/attn/ipl/test/attntest.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntest.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntest.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief HBATTN test utility function declarations. */ -#include "../attnfwd.H" +#include "../../common/attnfwd.H" #include <map> namespace ATTN diff --git a/src/usr/diag/attn/test/attntestipl.H b/src/usr/diag/attn/ipl/test/attntestipl.H index 05dc874e3..28b69fb4f 100644 --- a/src/usr/diag/attn/test/attntestipl.H +++ b/src/usr/diag/attn/ipl/test/attntestipl.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestipl.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestipl.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -37,7 +39,7 @@ #include "attnrandsource.H" #include "attnfakeprd.H" #include "attntest.H" -#include "../attnproc.H" +#include "../../common/attnproc.H" #include <cxxtest/TestSuite.H> using namespace ATTN; diff --git a/src/usr/diag/attn/test/attntestlist.H b/src/usr/diag/attn/ipl/test/attntestlist.H index 684cc6e00..61a26e0c6 100644 --- a/src/usr/diag/attn/test/attntestlist.H +++ b/src/usr/diag/attn/ipl/test/attntestlist.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestlist.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestlist.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ @@ -31,8 +31,8 @@ * @brief Unit test for the attnlist module. */ -#include "../attnfwd.H" -#include "../attnlist.H" +#include "../../common/attnfwd.H" +#include "../../common/attnlist.H" #include <cxxtest/TestSuite.H> using namespace ATTN; diff --git a/src/usr/diag/attn/test/attntestmem.H b/src/usr/diag/attn/ipl/test/attntestmem.H index c2ef6215c..b0f7739fd 100644 --- a/src/usr/diag/attn/test/attntestmem.H +++ b/src/usr/diag/attn/ipl/test/attntestmem.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestmem.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestmem.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief Unit test for the attnmem module. */ -#include "../attnmem.H" +#include "../../common/attnmem.H" #include "../attnsvc.H" #include "attntest.H" #include "attncomp.H" diff --git a/src/usr/diag/attn/test/attntestops.H b/src/usr/diag/attn/ipl/test/attntestops.H index a6b862cac..82b03e605 100644 --- a/src/usr/diag/attn/test/attntestops.H +++ b/src/usr/diag/attn/ipl/test/attntestops.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestops.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestops.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -30,8 +32,8 @@ * @brief Unit test for the attnops module. */ -#include "../attnfwd.H" -#include "../attnops.H" +#include "../../common/attnfwd.H" +#include "../../common/attnops.H" #include <cxxtest/TestSuite.H> using namespace ATTN; diff --git a/src/usr/diag/attn/test/attntestproc.H b/src/usr/diag/attn/ipl/test/attntestproc.H index 094077c6c..7e56daeb1 100644 --- a/src/usr/diag/attn/test/attntestproc.H +++ b/src/usr/diag/attn/ipl/test/attntestproc.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestproc.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestproc.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,7 +31,7 @@ * @brief Unit test for the attnproc module. */ -#include "../attnproc.H" +#include "../../common/attnproc.H" #include "../attnsvc.H" #include "attnfakesys.H" #include "attnfakeprd.H" diff --git a/src/usr/diag/attn/test/attntestscom.H b/src/usr/diag/attn/ipl/test/attntestscom.H index a9ba42adc..58e433f3e 100644 --- a/src/usr/diag/attn/test/attntestscom.H +++ b/src/usr/diag/attn/ipl/test/attntestscom.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestscom.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestscom.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attntestsvc.H b/src/usr/diag/attn/ipl/test/attntestsvc.H index 59ff91893..f873108ce 100644 --- a/src/usr/diag/attn/test/attntestsvc.H +++ b/src/usr/diag/attn/ipl/test/attntestsvc.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntestsvc.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntestsvc.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/attntesttest.H b/src/usr/diag/attn/ipl/test/attntesttest.H index 9f69c0d4b..3738b38cf 100644 --- a/src/usr/diag/attn/test/attntesttest.H +++ b/src/usr/diag/attn/ipl/test/attntesttest.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntesttest.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntesttest.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -30,7 +32,7 @@ * @brief Unit test for the attntest module. */ -#include "../attnfwd.H" +#include "../../common/attnfwd.H" #include "attntest.H" #include <cxxtest/TestSuite.H> diff --git a/src/usr/diag/attn/test/attntesttrace.H b/src/usr/diag/attn/ipl/test/attntesttrace.H index b540ba6bf..0fbf6cba4 100644 --- a/src/usr/diag/attn/test/attntesttrace.H +++ b/src/usr/diag/attn/ipl/test/attntesttrace.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attntesttrace.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attntesttrace.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -30,8 +32,8 @@ * @brief Unit test for the attntrace module. */ -#include "../attnfwd.H" -#include "../attntrace.H" +#include "../../common/attnfwd.H" +#include "../../common/attntrace.H" #include <cxxtest/TestSuite.H> /** diff --git a/src/usr/diag/attn/test/attnvalidate.C b/src/usr/diag/attn/ipl/test/attnvalidate.C index e502d5645..7ab910fd4 100644 --- a/src/usr/diag/attn/test/attnvalidate.C +++ b/src/usr/diag/attn/ipl/test/attnvalidate.C @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnvalidate.C $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnvalidate.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -29,8 +31,8 @@ #include "attncomp.H" #include "attnvalidate.H" #include "attnfakesys.H" -#include "../attntarget.H" -#include "../attntrace.H" +#include "../../common/attntarget.H" +#include "../../common/attntrace.H" using namespace PRDF; using namespace TARGETING; diff --git a/src/usr/diag/attn/test/attnvalidate.H b/src/usr/diag/attn/ipl/test/attnvalidate.H index cbc9e3cb7..d4db0fb7f 100644 --- a/src/usr/diag/attn/test/attnvalidate.H +++ b/src/usr/diag/attn/ipl/test/attnvalidate.H @@ -1,11 +1,13 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/diag/attn/test/attnvalidate.H $ */ +/* $Source: src/usr/diag/attn/hostboot/test/attnvalidate.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ diff --git a/src/usr/diag/attn/test/makefile b/src/usr/diag/attn/ipl/test/makefile index 6e794d9b0..e4ceab6db 100644 --- a/src/usr/diag/attn/test/makefile +++ b/src/usr/diag/attn/ipl/test/makefile @@ -1,11 +1,13 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/attn/test/makefile $ +# $Source: src/usr/diag/attn/hostboot/test/makefile $ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2012,2014 +# Contributors Listed Below - COPYRIGHT 2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,9 +22,10 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG -ROOTPATH = ../../../../.. +ROOTPATH = ../../../../../.. EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag +CFLAGS += -iquote${ROOTPATH}/src/usr/diag/attn OBJS += attnfakesys.o OBJS += attntest.o diff --git a/src/usr/diag/attn/makefile b/src/usr/diag/attn/makefile index 769ebc1d8..29f858077 100644 --- a/src/usr/diag/attn/makefile +++ b/src/usr/diag/attn/makefile @@ -5,7 +5,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2012,2014 +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,20 +24,7 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../../.. -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag - -MODULE = attn - -OBJS += attntrace.o -OBJS += attn.o -OBJS += attnsvc.o -OBJS += attnlist.o -OBJS += attnbits.o -OBJS += attntarget.o -OBJS += attnscom.o -OBJS += attnproc.o -OBJS += attnmem.o - -SUBDIRS += test.d +SUBDIRS += ipl.d +SUBDIRS += runtime.d include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C new file mode 100644 index 000000000..0fcddc386 --- /dev/null +++ b/src/usr/diag/attn/runtime/attn_rt.C @@ -0,0 +1,56 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/attn/runtime/attn_rt.C $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* 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 "common/attntrace.H" +#include <runtime/interface.h> +#include <runtime/rt_targeting.H> +#include <targeting/common/target.H> +#include <targeting/common/targetservice.H> +#include <targeting/common/utilFilter.H> +#include <errl/errlentry.H> +#include <errl/errlmanager.H> +#include <errno.h> + +using namespace std; +using namespace TARGETING; +using namespace ATTN; + +namespace ATTN_RT +{ + // enableAttns() and handleAttns() + // will be added later on. + + // will be used to register runtimeInterfaces + struct registerAttn + { + registerAttn() + { + ATTN_FAST("registerAttn"); + } + }; + + registerAttn g_registerAttn; +} + diff --git a/src/usr/diag/attn/runtime/attn_rt.mk b/src/usr/diag/attn/runtime/attn_rt.mk new file mode 100644 index 000000000..c571865b7 --- /dev/null +++ b/src/usr/diag/attn/runtime/attn_rt.mk @@ -0,0 +1,26 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/attn/runtime/attn_common.mk $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# +# +# 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 + +ATTN_RT_OBJS += attn_rt.o diff --git a/src/usr/diag/attn/runtime/makefile b/src/usr/diag/attn/runtime/makefile new file mode 100644 index 000000000..352a39b4b --- /dev/null +++ b/src/usr/diag/attn/runtime/makefile @@ -0,0 +1,43 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/attn/runtime/makefile $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2014 +# [+] International Business Machines Corp. +# +# +# 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 + +HOSTBOOT_RUNTIME = 1 +ROOTPATH = ../../../../.. + +EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag +CFLAGS += -iquote${ROOTPATH}/src/usr/diag/attn + +MODULE = attn_rt + +include attn_rt.mk + +OBJS += ${ATTN_RT_OBJS} + +SUBDIRS += test.d + +VPATH += .. +VPATH += ../common + +include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/attn/runtime/test/attntest_rt.H b/src/usr/diag/attn/runtime/test/attntest_rt.H new file mode 100644 index 000000000..841f66bd5 --- /dev/null +++ b/src/usr/diag/attn/runtime/test/attntest_rt.H @@ -0,0 +1,53 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/attn/runtime/test/attntest_rt.H $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* 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 */ +#ifndef __ATTNTEST_RT_H +#define __ATTNTEST_RT_H + +#include <cxxtest/TestSuite.H> +#include <runtime/interface.h> +#include <targeting/common/commontargeting.H> +#include "../../common/attntrace.H" + +class AttnTestRT: public CxxTest::TestSuite +{ + public: + + void testAttnIntf() + { + ATTN_SLOW("runtime testAttnIntf"); + + runtimeInterfaces_t* rt_intf = getRuntimeInterfaces(); + if (NULL == rt_intf) + { + TS_FAIL("AttnTestRT: runtimeIntfaces not set"); + return; + } + } + + private: + +}; + +#endif diff --git a/src/usr/diag/attn/runtime/test/makefile b/src/usr/diag/attn/runtime/test/makefile new file mode 100644 index 000000000..208bf830e --- /dev/null +++ b/src/usr/diag/attn/runtime/test/makefile @@ -0,0 +1,35 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/diag/attn/runtime/test/makefile $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2014 +# [+] International Business Machines Corp. +# +# +# 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 + +HOSTBOOT_RUNTIME = 1 +ROOTPATH = ../../../../../.. + +EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag + +MODULE = testattn_rt + +TESTS = *.H + +include ${ROOTPATH}/config.mk diff --git a/src/usr/ibscom/ibscom.C b/src/usr/ibscom/ibscom.C index 405708ee2..f4c3030e8 100644 --- a/src/usr/ibscom/ibscom.C +++ b/src/usr/ibscom/ibscom.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ |