Add new attention types for P9

Change-Id: Ia9076e792627a82787dceddafb7c3a75b756ad98
RTC:149697
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22141
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23131
Tested-by: Jenkins Server
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Tested-by: FSP CI Jenkins

4 files changed, 6 insertions, 19 deletions

diff --git a/src/include/usr/diag/prdf/common/prdfMain_common.H b/src/include/usr/diag/prdf/common/prdfMain_common.H
index 0da9dd0ee..772762488 100755
--- a/src/include/usr/diag/prdf/common/prdfMain_common.H
+++ b/src/include/usr/diag/prdf/common/prdfMain_common.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -55,9 +55,11 @@ enum ATTENTION_VALUE_TYPE
     PROC_CS = UNIT_CS,
     RECOVERABLE = 3,
     SPECIAL = 4,
-    END_ATTENTION_TYPE = 5
+    HOST_ATTN = 5,
+    END_ATTENTION_TYPE = 6
 };
 
+
 // Move here from xspprdsdbug.C
 /**
  *  @brief Structure of target handle and its attention type
diff --git a/src/usr/diag/attn/common/attnfwd.H b/src/usr/diag/attn/common/attnfwd.H
index d613bca9e..fbc80e755 100644
--- a/src/usr/diag/attn/common/attnfwd.H
+++ b/src/usr/diag/attn/common/attnfwd.H
@@ -64,22 +64,6 @@ class ScomImpl;
 class ProcOps;
 class MemOps;
 
-
-enum
-{
-    /**
-     * @brief HOST Represents host attentions,
-     *         distinct from the local error attentions.
-     */
-    HOST_ATTN = 5,
-    END_ATTENTION_TYPE = 6,
-    //@TODO: RTC:149395  These enums should be removed once
-    // the other commit from PRD makes it to hostboot code.
-    //   https://ralgit01.raleigh.ibm.com/gerrit1/#/c/22141/
-};
-
-
-
 /**
  * @brief MessageType Attention service message types.
  */
diff --git a/src/usr/diag/attn/ipl/test/attntestmem.H b/src/usr/diag/attn/ipl/test/attntestmem.H
index affa61488..496d3df60 100644
--- a/src/usr/diag/attn/ipl/test/attntestmem.H
+++ b/src/usr/diag/attn/ipl/test/attntestmem.H
@@ -84,7 +84,7 @@ class AttnMemTest: public CxxTest::TestSuite
 
             targetSvc.getAllChips(membufs, TYPE_MEMBUF);
 
-            FakeIpoll hostIpoll(HOST_ATTN, presenter);
+            FakeIpoll hostIpoll(PRDF::HOST_ATTN, presenter);
             FakeMcs rec(RECOVERABLE), xstp(CHECK_STOP), special(SPECIAL);
             FakeGp1 gp1;
 
diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C
index ea66507ed..bf0d1fff1 100644
--- a/src/usr/diag/attn/runtime/attn_rt.C
+++ b/src/usr/diag/attn/runtime/attn_rt.C
@@ -38,6 +38,7 @@
 using namespace std;
 using namespace TARGETING;
 using namespace ATTN;
+using namespace PRDF;
 
 namespace ATTN_RT
 {