Separate attr override section of PNOR into 2 parts

New Sections: ATTR_TMP, ATTR_PERM

Change-Id: Id66495509076f9637e8720f3d2631e8db7456fb2
RTC:113615
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14168
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 26 insertions, 16 deletions

diff --git a/src/include/usr/targeting/common/attributeTank.H b/src/include/usr/targeting/common/attributeTank.H
index 94cb69716..2acd48d42 100644
--- a/src/include/usr/targeting/common/attributeTank.H
+++ b/src/include/usr/targeting/common/attributeTank.H
@@ -86,6 +86,7 @@ public:
         TANK_LAYER_TARG,
         TANK_LAYER_PERM,
         TANK_LAYER_LAST = TANK_LAYER_PERM,
+        TANK_LAYER_TERM = 0xFFFFFFFF,
     };
 
     /**
@@ -354,6 +355,13 @@ public:
      */
     errlHndl_t writePermAttributes();
 
+    /**
+     * @brief This retuns the number of attributes overrides in an attr tank
+     *
+     * @return size_t Number of overrides in attr tank
+     */
+    size_t size() const;
+
 private:
     // Copy constructor and assignment operator disabled
     AttributeTank(const AttributeTank & i_right);
diff --git a/src/include/usr/targeting/common/targreasoncodes.H b/src/include/usr/targeting/common/targreasoncodes.H
index 63da83bf3..b26b60d9e 100644
--- a/src/include/usr/targeting/common/targreasoncodes.H
+++ b/src/include/usr/targeting/common/targreasoncodes.H
@@ -50,22 +50,24 @@ enum TargetingModuleId
 
 enum TargetingReasonCode
 {
-    TARG_RC_TEST_TARGET_FFDC              = TARG_COMP_ID | 0x01,
-    TARG_RC_BAD_EYECATCH                  = TARG_COMP_ID | 0x02,
-    TARG_RC_MM_BLOCK_FAIL                 = TARG_COMP_ID | 0x03,
-    TARG_RC_MM_PERM_FAIL                  = TARG_COMP_ID | 0x04,
-    TARG_RC_ATTR_MSG_FAIL                 = TARG_COMP_ID | 0x05,
-    TARG_RC_UNHANDLED_ATTR_SEC_TYPE       = TARG_COMP_ID | 0x06,
-    TARG_RC_ATTR_SYNC_TO_FSP_FAIL         = TARG_COMP_ID | 0x07,
-    TARG_RC_ATTR_SYNC_REQUEST_TO_HB_FAIL  = TARG_COMP_ID | 0x08,
-    TARG_RC_ATTR_SYNC_TO_HB_FAIL          = TARG_COMP_ID | 0x09,
-    TARG_RT_UNIT_TARGET_NOT_FOUND         = TARG_COMP_ID | 0x0a,
-    TARG_RT_NO_PROC_TARGET                = TARG_COMP_ID | 0x0b,
-    TARG_RT_TARGET_TYPE_NOT_SUPPORTED     = TARG_COMP_ID | 0x0c,
-    TARG_RC_ATTR_OVER_PNOR_SEC_SPACE_FAIL = TARG_COMP_ID | 0x0d,
-    TARG_RC_ATTR_OVER_ATTR_DATA_SIZE_FAIL = TARG_COMP_ID | 0x0e,
-    TARG_RC_WRITE_PERM_ATTR_FAIL          = TARG_COMP_ID | 0x0f,
-    TARG_RC_WRITE_PERM_ATTR_TARGET_FAIL   = TARG_COMP_ID | 0x10,
+    TARG_RC_TEST_TARGET_FFDC                = TARG_COMP_ID | 0x01,
+    TARG_RC_BAD_EYECATCH                    = TARG_COMP_ID | 0x02,
+    TARG_RC_MM_BLOCK_FAIL                   = TARG_COMP_ID | 0x03,
+    TARG_RC_MM_PERM_FAIL                    = TARG_COMP_ID | 0x04,
+    TARG_RC_ATTR_MSG_FAIL                   = TARG_COMP_ID | 0x05,
+    TARG_RC_UNHANDLED_ATTR_SEC_TYPE         = TARG_COMP_ID | 0x06,
+    TARG_RC_ATTR_SYNC_TO_FSP_FAIL           = TARG_COMP_ID | 0x07,
+    TARG_RC_ATTR_SYNC_REQUEST_TO_HB_FAIL    = TARG_COMP_ID | 0x08,
+    TARG_RC_ATTR_SYNC_TO_HB_FAIL            = TARG_COMP_ID | 0x09,
+    TARG_RT_UNIT_TARGET_NOT_FOUND           = TARG_COMP_ID | 0x0a,
+    TARG_RT_NO_PROC_TARGET                  = TARG_COMP_ID | 0x0b,
+    TARG_RT_TARGET_TYPE_NOT_SUPPORTED       = TARG_COMP_ID | 0x0c,
+    TARG_RC_ATTR_OVER_PNOR_SEC_SPACE_FAIL   = TARG_COMP_ID | 0x0d,
+    TARG_RC_ATTR_OVER_ATTR_DATA_SIZE_FAIL   = TARG_COMP_ID | 0x0e,
+    TARG_RC_WRITE_PERM_ATTR_FAIL            = TARG_COMP_ID | 0x0f,
+    TARG_RC_WRITE_PERM_ATTR_TARGET_FAIL     = TARG_COMP_ID | 0x10,
+    TARG_RC_WRITE_ATTR_OVER_WRONG_PNOR_SEC  = TARG_COMP_ID | 0x11,
+    TARG_RC_WRITE_ATTR_OVER_NO_TANK_LAYER   = TARG_COMP_ID | 0x12,
 };
 
 }; // End TARGETING namespace