Add multi-node support to _deconfigureAssocProc

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

1 files changed, 23 insertions, 15 deletions

diff --git a/src/usr/targeting/common/utilFilter.C b/src/usr/targeting/common/utilFilter.C
index b6ab6ff3f..e926e2033 100644
--- a/src/usr/targeting/common/utilFilter.C
+++ b/src/usr/targeting/common/utilFilter.C
@@ -58,10 +58,10 @@ namespace TARGETING
  *
  * @return N/A
  */
-void _getChipOrChipletResources( TARGETING::TargetHandleList & o_vector,
+void _getClassResources( TARGETING::TargetHandleList & o_vector,
                      CLASS i_class, TYPE  i_type, ResourceState i_state )
 {
-    #define TARG_FN "_getChipOrChipletResources(...)"
+    #define TARG_FN "_getClassResources(...)"
     TARG_ENTER();
     switch(i_state)
     {
@@ -186,17 +186,22 @@ void _getChipOrChipletResources( TARGETING::TargetHandleList & o_vector,
     #undef TARG_FN
 }
 
-
 void getChipResources( TARGETING::TargetHandleList & o_vector,
-                  TYPE i_chipType, ResourceState i_state )
+                       TYPE i_chipType, ResourceState i_state )
+{
+    _getClassResources(o_vector, CLASS_CHIP, i_chipType, i_state);
+}
+
+void getEncResources( TARGETING::TargetHandleList & o_vector,
+                      TYPE i_type, ResourceState i_state )
 {
-    _getChipOrChipletResources(o_vector, CLASS_CHIP, i_chipType, i_state);
+    _getClassResources(o_vector, CLASS_ENC, i_type, i_state);
 }
 
 void getChipletResources( TARGETING::TargetHandleList & o_vector,
-                     TYPE i_chipletType, ResourceState i_state )
+                          TYPE i_chipletType, ResourceState i_state )
 {
-    _getChipOrChipletResources(o_vector, CLASS_UNIT, i_chipletType, i_state);
+    _getClassResources(o_vector, CLASS_UNIT, i_chipletType, i_state);
 }
 
 // Retrofit functions to getChipOrChipletResources
@@ -205,11 +210,12 @@ void getAllChips( TARGETING::TargetHandleList & o_vector,
 {
     if (i_functional)
     {
-        _getChipOrChipletResources(o_vector, CLASS_CHIP, i_chipType, UTIL_FILTER_FUNCTIONAL);
+        _getClassResources(o_vector, CLASS_CHIP, i_chipType,
+                           UTIL_FILTER_FUNCTIONAL);
     }
     else
     {
-        _getChipOrChipletResources(o_vector, CLASS_CHIP, i_chipType, UTIL_FILTER_ALL);
+        _getClassResources(o_vector, CLASS_CHIP, i_chipType, UTIL_FILTER_ALL);
     }
 }
 
@@ -220,14 +226,14 @@ void getAllLogicalCards( TARGETING::TargetHandleList & o_vector,
 {
     if (i_functional)
     {
-        _getChipOrChipletResources( o_vector,
+        _getClassResources( o_vector,
                                 CLASS_LOGICAL_CARD,
                                 i_cardType,
                                 UTIL_FILTER_FUNCTIONAL );
     }
     else
     {
-        _getChipOrChipletResources( o_vector,
+        _getClassResources( o_vector,
                                 CLASS_LOGICAL_CARD,
                                 i_cardType,
                                 UTIL_FILTER_ALL );
@@ -241,14 +247,14 @@ void getAllCards( TARGETING::TargetHandleList & o_vector,
 {
     if (i_functional)
     {
-        _getChipOrChipletResources( o_vector,
+        _getClassResources( o_vector,
                                 CLASS_CARD,
                                 i_cardType,
                                 UTIL_FILTER_FUNCTIONAL );
     }
     else
     {
-        _getChipOrChipletResources( o_vector,
+        _getClassResources( o_vector,
                                 CLASS_CARD,
                                 i_cardType,
                                 UTIL_FILTER_ALL );
@@ -261,11 +267,13 @@ void getAllChiplets( TARGETING::TargetHandleList & o_vector,
 {
     if (i_functional)
     {
-        _getChipOrChipletResources(o_vector, CLASS_UNIT, i_chipletType, UTIL_FILTER_FUNCTIONAL);
+        _getClassResources(o_vector, CLASS_UNIT, i_chipletType,
+                           UTIL_FILTER_FUNCTIONAL);
     }
     else
     {
-        _getChipOrChipletResources(o_vector, CLASS_UNIT, i_chipletType, UTIL_FILTER_ALL);
+        _getClassResources(o_vector, CLASS_UNIT, i_chipletType,
+                           UTIL_FILTER_ALL);
     }
 }