PRD: updates from XML and XML parser

Change-Id: Iec8436e61c339e242ac9cd02fd6609cdbc904e45
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68594
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68819
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

21 files changed, 286 insertions, 351 deletions

diff --git a/src/usr/diag/prdf/common/plat/centaur/centaur_membuf_actions.rule b/src/usr/diag/prdf/common/plat/centaur/centaur_membuf_actions.rule
index 6ff24cbc3..d8c586a40 100644
--- a/src/usr/diag/prdf/common/plat/centaur/centaur_membuf_actions.rule
+++ b/src/usr/diag/prdf/common/plat/centaur/centaur_membuf_actions.rule
@@ -242,3 +242,10 @@ actionclass mainline_ue_handling_1_UERE
 actionclass mainline_rce_pue_handling_0 { funccall("AnalyzeFetchRcePue0"); };
 actionclass mainline_rce_pue_handling_1 { funccall("AnalyzeFetchRcePue1"); };
 
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedMBA0 { analyze(connected(TYPE_MBA, 0)); };
+actionclass analyzeConnectedMBA1 { analyze(connected(TYPE_MBA, 1)); };
+
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_eq.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_eq.rule
index c6a6d7369..9eb1513b4 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_eq.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_eq.rule
@@ -362,5 +362,3 @@ group gEQ_LFIR filter singlebit, cs_root_cause
 .include "p9_common_actions.rule";
 .include "p9_common_eq_actions.rule";
 
-actionclass analyzeConnectedEX0 { analyze(connected(TYPE_EX, 0)); };
-actionclass analyzeConnectedEX1 { analyze(connected(TYPE_EX, 1)); };
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule
index 63df89ae3..2be40e394 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule
@@ -726,7 +726,7 @@ group gL3FIR filter singlebit, cs_root_cause( 5, 8, 11, 17, 21 )
     (rL3FIR, bit(28)) ? l3_lru_parity_error;
 
     /** L3FIR[29]
-     *  L3 cache congruence cache deleted
+     *  L3 cache congruence class deleted
      */
     (rL3FIR, bit(29)) ? self_th_1;
 
@@ -774,27 +774,27 @@ group gCMEFIR filter singlebit, cs_root_cause
     /** CMEFIR[0]
      *  PPE asserted an internal error
      */
-    (rCMEFIR, bit(0)) ? defaultMaskedError;
+    (rCMEFIR, bit(0)) ? TBDDefaultCallout;
 
     /** CMEFIR[1]
      *  PPE  external interface error
      */
-    (rCMEFIR, bit(1)) ? defaultMaskedError;
+    (rCMEFIR, bit(1)) ? TBDDefaultCallout;
 
     /** CMEFIR[2]
      *  PPE  lack of forward progress
      */
-    (rCMEFIR, bit(2)) ? defaultMaskedError;
+    (rCMEFIR, bit(2)) ? TBDDefaultCallout;
 
     /** CMEFIR[3]
      *  PPE software-requested breakpoint event.
      */
-    (rCMEFIR, bit(3)) ? defaultMaskedError;
+    (rCMEFIR, bit(3)) ? TBDDefaultCallout;
 
     /** CMEFIR[4]
      *  PPE watchdog timeout
      */
-    (rCMEFIR, bit(4)) ? defaultMaskedError;
+    (rCMEFIR, bit(4)) ? TBDDefaultCallout;
 
     /** CMEFIR[5]
      *  PPE asserted a halt condition.
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc.rule
index f2fc88383..eddf86751 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc.rule
@@ -535,7 +535,7 @@ rule rIOMCFIR
     IOMCFIR & ~IOMCFIR_MASK &  IOMCFIR_ACT0 &  IOMCFIR_ACT1;
 };
 
-group gIOMCFIR filter singlebit, cs_root_cause( 10, 12, 18, 20, 26, 28, 34, 36 )
+group gIOMCFIR filter singlebit, cs_root_cause( 12, 20, 28, 36 )
 {
     /** IOMCFIR[0]
      *  RX_INVALID_STATE_OR_PARITY_ERROR
@@ -844,7 +844,3 @@ group gMCBISTFIR filter singlebit, cs_root_cause
 .include "p9_common_actions.rule";
 .include "cumulus_mc_actions.rule";
 
-actionclass analyzeConnectedDMI0 { analyze(connected(TYPE_DMI, 0)); };
-actionclass analyzeConnectedDMI1 { analyze(connected(TYPE_DMI, 1)); };
-actionclass analyzeConnectedDMI2 { analyze(connected(TYPE_DMI, 2)); };
-actionclass analyzeConnectedDMI3 { analyze(connected(TYPE_DMI, 3)); };
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule
index ad9a4cf4d..43f57d85c 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule
@@ -100,3 +100,12 @@ actionclass analyzeMCBISTFIR { analyze(gMCBISTFIR); };
 actionclass analyzeIOMCFIR   { analyze(gIOMCFIR);   };
 actionclass analyzeMCPPEFIR  { analyze(gMCPPEFIR);  };
 
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedDMI0 { analyze(connected(TYPE_DMI, 0)); };
+actionclass analyzeConnectedDMI1 { analyze(connected(TYPE_DMI, 1)); };
+actionclass analyzeConnectedDMI2 { analyze(connected(TYPE_DMI, 2)); };
+actionclass analyzeConnectedDMI3 { analyze(connected(TYPE_DMI, 3)); };
+
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_obus.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_obus.rule
index 6d844c1a6..ccbcbe2d2 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_obus.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_obus.rule
@@ -162,23 +162,6 @@ chip cumulus_obus
         capture     req nonzero("IOOLFIR");
     };
 
-    register IOOLFIR_AND
-    {
-        name        "P9 chip IOOLFIR atomic AND";
-        scomaddr    0x09010801;
-        capture     group never;
-        access      write_only;
-    };
-
-    register IOOLFIR_MASK_OR
-    {
-        name        "P9 chip IOOLFIR atomic OR";
-        scomaddr    0x09010805;
-        capture     group never;
-        access      write_only;
-    };
-
-
     ############################################################################
     # P9 OBUS target IOOBFIR
     ############################################################################
@@ -251,94 +234,6 @@ chip cumulus_obus
         capture     req nonzero("OBPPEFIR");
     };
 
-    ############################################################################
-    # P9 OBUS targets for cable FFDC
-    #    One additional reg (IOOLFIR) is in default group
-    ############################################################################
-    register OLL0_XMITLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK0 TRANSMIT LANE CTL";
-        scomaddr    0x09010810;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_XMITLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK1 TRANSMIT LANE CTL";
-        scomaddr    0x09010811;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_RECVLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK0 RECEIVE LANE CTL";
-        scomaddr    0x09010812;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_RECVLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK1 RECEIVE LANE CTL";
-        scomaddr    0x09010813;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_INFO_REG
-    {
-        name        "P9 OBUS target OLL LINK0 INFORMATION REG";
-        scomaddr    0x09010814;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_INFO_REG
-    {
-        name        "P9 OBUS target OLL LINK1 INFORMATION REG";
-        scomaddr    0x09010815;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_ERROR_STATUS_REG
-    {
-        name        "P9 OBUS target OLL LINK0 ERROR STATUS";
-        scomaddr    0x09010816;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_ERROR_STATUS_REG
-    {
-        name        "P9 OBUS target OLL LINK1 ERROR STATUS";
-        scomaddr    0x09010817;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL_REPLAY_THRESHOLD_REG
-    {
-        name        "P9 OBUS target OLL REPLAY THRESHOLD";
-        scomaddr    0x09010818;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL_SLECC_THRESHOLD_REG
-    {
-        name        "P9 OBUS target OLL SL ECC THRESHOLD";
-        scomaddr    0x09010819;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_SYNDROME_CAP_REG
-    {
-        name        "P9 OBUS target OLL LINK0 SYNDROME CAPTURE";
-        scomaddr    0x09010822;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_SYNDROME_CAP_REG
-    {
-        name        "P9 OBUS target OLL LINK1 SYNDROME CAPTURE";
-        scomaddr    0x09010823;
-        capture     group smpCableFFDC;
-    };
-
 # Include registers not defined by the xml
 .include "p9_common_obus_regs.rule";
 
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule
index 801a433a5..dd60d324f 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule
@@ -7899,58 +7899,5 @@ group gPCI2_CHIPLET_FIR filter singlebit
 # Include the actions defined for this target
 .include "p9_common_actions.rule";
 .include "p9_common_proc_actions.rule";
+.include "cumulus_proc_actions.rule";
 
-actionclass analyzeConnectedEQ0     { analyze(connected(TYPE_EQ,      0)); };
-actionclass analyzeConnectedEQ1     { analyze(connected(TYPE_EQ,      1)); };
-actionclass analyzeConnectedEQ2     { analyze(connected(TYPE_EQ,      2)); };
-actionclass analyzeConnectedEQ3     { analyze(connected(TYPE_EQ,      3)); };
-actionclass analyzeConnectedEQ4     { analyze(connected(TYPE_EQ,      4)); };
-actionclass analyzeConnectedEQ5     { analyze(connected(TYPE_EQ,      5)); };
-actionclass analyzeConnectedEC0     { analyze(connected(TYPE_CORE,    0)); };
-actionclass analyzeConnectedEC1     { analyze(connected(TYPE_CORE,    1)); };
-actionclass analyzeConnectedEC2     { analyze(connected(TYPE_CORE,    2)); };
-actionclass analyzeConnectedEC3     { analyze(connected(TYPE_CORE,    3)); };
-actionclass analyzeConnectedEC4     { analyze(connected(TYPE_CORE,    4)); };
-actionclass analyzeConnectedEC5     { analyze(connected(TYPE_CORE,    5)); };
-actionclass analyzeConnectedEC6     { analyze(connected(TYPE_CORE,    6)); };
-actionclass analyzeConnectedEC7     { analyze(connected(TYPE_CORE,    7)); };
-actionclass analyzeConnectedEC8     { analyze(connected(TYPE_CORE,    8)); };
-actionclass analyzeConnectedEC9     { analyze(connected(TYPE_CORE,    9)); };
-actionclass analyzeConnectedEC10    { analyze(connected(TYPE_CORE,   10)); };
-actionclass analyzeConnectedEC11    { analyze(connected(TYPE_CORE,   11)); };
-actionclass analyzeConnectedEC12    { analyze(connected(TYPE_CORE,   12)); };
-actionclass analyzeConnectedEC13    { analyze(connected(TYPE_CORE,   13)); };
-actionclass analyzeConnectedEC14    { analyze(connected(TYPE_CORE,   14)); };
-actionclass analyzeConnectedEC15    { analyze(connected(TYPE_CORE,   15)); };
-actionclass analyzeConnectedEC16    { analyze(connected(TYPE_CORE,   16)); };
-actionclass analyzeConnectedEC17    { analyze(connected(TYPE_CORE,   17)); };
-actionclass analyzeConnectedEC18    { analyze(connected(TYPE_CORE,   18)); };
-actionclass analyzeConnectedEC19    { analyze(connected(TYPE_CORE,   19)); };
-actionclass analyzeConnectedEC20    { analyze(connected(TYPE_CORE,   20)); };
-actionclass analyzeConnectedEC21    { analyze(connected(TYPE_CORE,   21)); };
-actionclass analyzeConnectedEC22    { analyze(connected(TYPE_CORE,   22)); };
-actionclass analyzeConnectedEC23    { analyze(connected(TYPE_CORE,   23)); };
-actionclass analyzeConnectedCAPP0   { analyze(connected(TYPE_CAPP,    0)); };
-actionclass analyzeConnectedCAPP1   { analyze(connected(TYPE_CAPP,    1)); };
-actionclass analyzeConnectedOBUS0   { analyze(connected(TYPE_OBUS,    0)); };
-actionclass analyzeConnectedOBUS1   { analyze(connected(TYPE_OBUS,    1)); };
-actionclass analyzeConnectedOBUS2   { analyze(connected(TYPE_OBUS,    2)); };
-actionclass analyzeConnectedOBUS3   { analyze(connected(TYPE_OBUS,    3)); };
-actionclass analyzeConnectedXBUS0   { analyze(connected(TYPE_XBUS,    0)); };
-actionclass analyzeConnectedXBUS1   { analyze(connected(TYPE_XBUS,    1)); };
-actionclass analyzeConnectedXBUS2   { analyze(connected(TYPE_XBUS,    2)); };
-actionclass analyzeConnectedPEC0    { analyze(connected(TYPE_PEC,     0)); };
-actionclass analyzeConnectedPEC1    { analyze(connected(TYPE_PEC,     1)); };
-actionclass analyzeConnectedPEC2    { analyze(connected(TYPE_PEC,     2)); };
-actionclass analyzeConnectedPHB0    { analyze(connected(TYPE_PHB,     0)); };
-actionclass analyzeConnectedPHB1    { analyze(connected(TYPE_PHB,     1)); };
-actionclass analyzeConnectedPHB2    { analyze(connected(TYPE_PHB,     2)); };
-actionclass analyzeConnectedPHB3    { analyze(connected(TYPE_PHB,     3)); };
-actionclass analyzeConnectedPHB4    { analyze(connected(TYPE_PHB,     4)); };
-actionclass analyzeConnectedPHB5    { analyze(connected(TYPE_PHB,     5)); };
-actionclass analyzeConnectedMC0     { analyze(connected(TYPE_MC,      0)); };
-actionclass analyzeConnectedMC1     { analyze(connected(TYPE_MC,      1)); };
-actionclass analyzeConnectedMI0     { analyze(connected(TYPE_MI,      0)); };
-actionclass analyzeConnectedMI1     { analyze(connected(TYPE_MI,      1)); };
-actionclass analyzeConnectedMI2     { analyze(connected(TYPE_MI,      2)); };
-actionclass analyzeConnectedMI3     { analyze(connected(TYPE_MI,      3)); };
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule
new file mode 100644
index 000000000..26d62e95f
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule
@@ -0,0 +1,39 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] 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
+
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedOBUS1   { analyze(connected(TYPE_OBUS,    1)); };
+actionclass analyzeConnectedOBUS2   { analyze(connected(TYPE_OBUS,    2)); };
+actionclass analyzeConnectedXBUS0   { analyze(connected(TYPE_XBUS,    0)); };
+actionclass analyzeConnectedMC0     { analyze(connected(TYPE_MC,      0)); };
+actionclass analyzeConnectedMC1     { analyze(connected(TYPE_MC,      1)); };
+actionclass analyzeConnectedMI0     { analyze(connected(TYPE_MI,      0)); };
+actionclass analyzeConnectedMI1     { analyze(connected(TYPE_MI,      1)); };
+actionclass analyzeConnectedMI2     { analyze(connected(TYPE_MI,      2)); };
+actionclass analyzeConnectedMI3     { analyze(connected(TYPE_MI,      3)); };
+
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule
index 94e619193..08c5c3a9e 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule
@@ -362,5 +362,3 @@ group gEQ_LFIR filter singlebit, cs_root_cause
 .include "p9_common_actions.rule";
 .include "p9_common_eq_actions.rule";
 
-actionclass analyzeConnectedEX0 { analyze(connected(TYPE_EX, 0)); };
-actionclass analyzeConnectedEX1 { analyze(connected(TYPE_EX, 1)); };
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule
index ed965755c..dc9e92251 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule
@@ -726,7 +726,7 @@ group gL3FIR filter singlebit, cs_root_cause( 5, 8, 11, 17, 21 )
     (rL3FIR, bit(28)) ? l3_lru_parity_error;
 
     /** L3FIR[29]
-     *  L3 cache congruence cache deleted
+     *  L3 cache congruence class deleted
      */
     (rL3FIR, bit(29)) ? self_th_1;
 
@@ -774,27 +774,27 @@ group gCMEFIR filter singlebit, cs_root_cause
     /** CMEFIR[0]
      *  PPE asserted an internal error
      */
-    (rCMEFIR, bit(0)) ? defaultMaskedError;
+    (rCMEFIR, bit(0)) ? TBDDefaultCallout;
 
     /** CMEFIR[1]
      *  PPE  external interface error
      */
-    (rCMEFIR, bit(1)) ? defaultMaskedError;
+    (rCMEFIR, bit(1)) ? TBDDefaultCallout;
 
     /** CMEFIR[2]
      *  PPE  lack of forward progress
      */
-    (rCMEFIR, bit(2)) ? defaultMaskedError;
+    (rCMEFIR, bit(2)) ? TBDDefaultCallout;
 
     /** CMEFIR[3]
      *  PPE software-requested breakpoint event.
      */
-    (rCMEFIR, bit(3)) ? defaultMaskedError;
+    (rCMEFIR, bit(3)) ? TBDDefaultCallout;
 
     /** CMEFIR[4]
      *  PPE watchdog timeout
      */
-    (rCMEFIR, bit(4)) ? defaultMaskedError;
+    (rCMEFIR, bit(4)) ? TBDDefaultCallout;
 
     /** CMEFIR[5]
      *  PPE asserted a halt condition.
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
index e4a64cf9f..30b2f43ce 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
@@ -74,8 +74,8 @@ chip nimbus_mca
         name        "P9 MCA target MCACALFIR ACT0";
         scomaddr    0x07010906;
         capture     group default;
-        capture     req nonzero("MCACALFIR");
         capture     group McbistCapture;
+        capture     req nonzero("MCACALFIR");
     };
 
     register MCACALFIR_ACT1
@@ -83,8 +83,8 @@ chip nimbus_mca
         name        "P9 MCA target MCACALFIR ACT1";
         scomaddr    0x07010907;
         capture     group default;
-        capture     req nonzero("MCACALFIR");
         capture     group McbistCapture;
+        capture     req nonzero("MCACALFIR");
     };
 
     ############################################################################
@@ -115,8 +115,8 @@ chip nimbus_mca
         name        "P9 MCA target MCAECCFIR ACT0";
         scomaddr    0x07010a06;
         capture     group default;
-        capture     req nonzero("MCAECCFIR");
         capture     group McbistCapture;
+        capture     req nonzero("MCAECCFIR");
     };
 
     register MCAECCFIR_ACT1
@@ -124,8 +124,8 @@ chip nimbus_mca
         name        "P9 MCA target MCAECCFIR ACT1";
         scomaddr    0x07010a07;
         capture     group default;
-        capture     req nonzero("MCAECCFIR");
         capture     group McbistCapture;
+        capture     req nonzero("MCAECCFIR");
     };
 
     ############################################################################
@@ -155,8 +155,8 @@ chip nimbus_mca
         name        "P9 MCA target DDRPHYFIR ACT0";
         scomaddr    0x07011006;
         capture     group default;
-        capture     req nonzero("DDRPHYFIR");
         capture     group McbistCapture;
+        capture     req nonzero("DDRPHYFIR");
     };
 
     register DDRPHYFIR_ACT1
@@ -164,8 +164,8 @@ chip nimbus_mca
         name        "P9 MCA target DDRPHYFIR ACT1";
         scomaddr    0x07011007;
         capture     group default;
-        capture     req nonzero("DDRPHYFIR");
         capture     group McbistCapture;
+        capture     req nonzero("DDRPHYFIR");
     };
 
 # Include registers not defined by the xml
@@ -449,7 +449,7 @@ group gMCAECCFIR filter priority( 14, 17, 37 ), # ensure UEs handled before NCEs
     /** MCAECCFIR[19]
      *  Mainline read IMPE
      */
-    (rMCAECCFIR, bit(19)) ? impe_handling;
+    (rMCAECCFIR, bit(19)) ? memory_impe_handling;
 
     /** MCAECCFIR[20:27]
      *  Maintenance MPE
@@ -514,7 +514,7 @@ group gMCAECCFIR filter priority( 14, 17, 37 ), # ensure UEs handled before NCEs
     /** MCAECCFIR[39]
      *  Maintenance IMPE
      */
-    (rMCAECCFIR, bit(39)) ? impe_handling;
+    (rMCAECCFIR, bit(39)) ? memory_impe_handling;
 
     /** MCAECCFIR[40]
      *  spare
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
index 75dd81b9e..8ff6618b1 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
@@ -89,7 +89,7 @@ actionclass maintenance_iue_handling
     funccall("AnalyzeMaintIue");
 };
 
-actionclass impe_handling { funccall("AnalyzeImpe"); };
+actionclass memory_impe_handling { funccall("AnalyzeImpe"); };
 
 /** Handle Mainline AUEs/IAUEs */
 actionclass mainline_aue_iaue_handling
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule
index 8a4b63142..7735d8341 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule
@@ -636,7 +636,3 @@ group gMCBISTFIR filter singlebit, cs_root_cause
 .include "p9_common_actions.rule";
 .include "nimbus_mcbist_actions.rule";
 
-actionclass analyzeConnectedMCA0 { analyze(connected(TYPE_MCA, 0)); };
-actionclass analyzeConnectedMCA1 { analyze(connected(TYPE_MCA, 1)); };
-actionclass analyzeConnectedMCA2 { analyze(connected(TYPE_MCA, 2)); };
-actionclass analyzeConnectedMCA3 { analyze(connected(TYPE_MCA, 3)); };
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule
index eb5c14c3b..9b2127f3f 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule
@@ -48,3 +48,12 @@ actionclass analyzeMCBISTFIR
     analyze(gMCBISTFIR);
 };
 
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedMCA0 { analyze(connected(TYPE_MCA, 0)); };
+actionclass analyzeConnectedMCA1 { analyze(connected(TYPE_MCA, 1)); };
+actionclass analyzeConnectedMCA2 { analyze(connected(TYPE_MCA, 2)); };
+actionclass analyzeConnectedMCA3 { analyze(connected(TYPE_MCA, 3)); };
+
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule
index a5403a1c6..827b7a1a5 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule
@@ -70,8 +70,8 @@ chip nimbus_mcs
         name        "P9 MCS target MCFIR ACT0";
         scomaddr    0x05010806;
         capture     group default;
-        capture     req nonzero("MCFIR");
         capture     group MirrorConfig;
+        capture     req nonzero("MCFIR");
     };
 
     register MCFIR_ACT1
@@ -79,8 +79,8 @@ chip nimbus_mcs
         name        "P9 MCS target MCFIR ACT1";
         scomaddr    0x05010807;
         capture     group default;
-        capture     req nonzero("MCFIR");
         capture     group MirrorConfig;
+        capture     req nonzero("MCFIR");
     };
 
 # Include registers not defined by the xml
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule
index 22417bf91..058b0b42d 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule
@@ -162,23 +162,6 @@ chip nimbus_obus
         capture     req nonzero("IOOLFIR");
     };
 
-    register IOOLFIR_AND
-    {
-        name        "P9 chip IOOLFIR atomic AND";
-        scomaddr    0x09010801;
-        capture     group never;
-        access      write_only;
-    };
-
-    register IOOLFIR_MASK_OR
-    {
-        name        "P9 chip IOOLFIR atomic OR";
-        scomaddr    0x09010805;
-        capture     group never;
-        access      write_only;
-    };
-
-
     ############################################################################
     # P9 OBUS target IOOBFIR
     ############################################################################
@@ -251,94 +234,6 @@ chip nimbus_obus
         capture     req nonzero("OBPPEFIR");
     };
 
-    ############################################################################
-    # P9 OBUS targets for cable FFDC
-    #    One additional reg (IOOLFIR) is in default group
-    ############################################################################
-    register OLL0_XMITLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK0 TRANSMIT LANE CTL";
-        scomaddr    0x09010810;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_XMITLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK1 TRANSMIT LANE CTL";
-        scomaddr    0x09010811;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_RECVLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK0 RECEIVE LANE CTL";
-        scomaddr    0x09010812;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_RECVLANE_CTL
-    {
-        name        "P9 OBUS target OLL LINK1 RECEIVE LANE CTL";
-        scomaddr    0x09010813;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_INFO_REG
-    {
-        name        "P9 OBUS target OLL LINK0 INFORMATION REG";
-        scomaddr    0x09010814;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_INFO_REG
-    {
-        name        "P9 OBUS target OLL LINK1 INFORMATION REG";
-        scomaddr    0x09010815;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_ERROR_STATUS_REG
-    {
-        name        "P9 OBUS target OLL LINK0 ERROR STATUS";
-        scomaddr    0x09010816;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_ERROR_STATUS_REG
-    {
-        name        "P9 OBUS target OLL LINK1 ERROR STATUS";
-        scomaddr    0x09010817;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL_REPLAY_THRESHOLD_REG
-    {
-        name        "P9 OBUS target OLL REPLAY THRESHOLD";
-        scomaddr    0x09010818;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL_SLECC_THRESHOLD_REG
-    {
-        name        "P9 OBUS target OLL SL ECC THRESHOLD";
-        scomaddr    0x09010819;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL0_SYNDROME_CAP_REG
-    {
-        name        "P9 OBUS target OLL LINK0 SYNDROME CAPTURE";
-        scomaddr    0x09010822;
-        capture     group smpCableFFDC;
-    };
-
-    register OLL1_SYNDROME_CAP_REG
-    {
-        name        "P9 OBUS target OLL LINK1 SYNDROME CAPTURE";
-        scomaddr    0x09010823;
-        capture     group smpCableFFDC;
-    };
-
 # Include registers not defined by the xml
 .include "p9_common_obus_regs.rule";
 
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
index ec7eff569..96b00dd95 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
@@ -7858,55 +7858,5 @@ group gPCI2_CHIPLET_FIR filter singlebit
 # Include the actions defined for this target
 .include "p9_common_actions.rule";
 .include "p9_common_proc_actions.rule";
+.include "nimbus_proc_actions.rule";
 
-actionclass analyzeConnectedEQ0     { analyze(connected(TYPE_EQ,      0)); };
-actionclass analyzeConnectedEQ1     { analyze(connected(TYPE_EQ,      1)); };
-actionclass analyzeConnectedEQ2     { analyze(connected(TYPE_EQ,      2)); };
-actionclass analyzeConnectedEQ3     { analyze(connected(TYPE_EQ,      3)); };
-actionclass analyzeConnectedEQ4     { analyze(connected(TYPE_EQ,      4)); };
-actionclass analyzeConnectedEQ5     { analyze(connected(TYPE_EQ,      5)); };
-actionclass analyzeConnectedEC0     { analyze(connected(TYPE_CORE,    0)); };
-actionclass analyzeConnectedEC1     { analyze(connected(TYPE_CORE,    1)); };
-actionclass analyzeConnectedEC2     { analyze(connected(TYPE_CORE,    2)); };
-actionclass analyzeConnectedEC3     { analyze(connected(TYPE_CORE,    3)); };
-actionclass analyzeConnectedEC4     { analyze(connected(TYPE_CORE,    4)); };
-actionclass analyzeConnectedEC5     { analyze(connected(TYPE_CORE,    5)); };
-actionclass analyzeConnectedEC6     { analyze(connected(TYPE_CORE,    6)); };
-actionclass analyzeConnectedEC7     { analyze(connected(TYPE_CORE,    7)); };
-actionclass analyzeConnectedEC8     { analyze(connected(TYPE_CORE,    8)); };
-actionclass analyzeConnectedEC9     { analyze(connected(TYPE_CORE,    9)); };
-actionclass analyzeConnectedEC10    { analyze(connected(TYPE_CORE,   10)); };
-actionclass analyzeConnectedEC11    { analyze(connected(TYPE_CORE,   11)); };
-actionclass analyzeConnectedEC12    { analyze(connected(TYPE_CORE,   12)); };
-actionclass analyzeConnectedEC13    { analyze(connected(TYPE_CORE,   13)); };
-actionclass analyzeConnectedEC14    { analyze(connected(TYPE_CORE,   14)); };
-actionclass analyzeConnectedEC15    { analyze(connected(TYPE_CORE,   15)); };
-actionclass analyzeConnectedEC16    { analyze(connected(TYPE_CORE,   16)); };
-actionclass analyzeConnectedEC17    { analyze(connected(TYPE_CORE,   17)); };
-actionclass analyzeConnectedEC18    { analyze(connected(TYPE_CORE,   18)); };
-actionclass analyzeConnectedEC19    { analyze(connected(TYPE_CORE,   19)); };
-actionclass analyzeConnectedEC20    { analyze(connected(TYPE_CORE,   20)); };
-actionclass analyzeConnectedEC21    { analyze(connected(TYPE_CORE,   21)); };
-actionclass analyzeConnectedEC22    { analyze(connected(TYPE_CORE,   22)); };
-actionclass analyzeConnectedEC23    { analyze(connected(TYPE_CORE,   23)); };
-actionclass analyzeConnectedCAPP0   { analyze(connected(TYPE_CAPP,    0)); };
-actionclass analyzeConnectedCAPP1   { analyze(connected(TYPE_CAPP,    1)); };
-actionclass analyzeConnectedOBUS0   { analyze(connected(TYPE_OBUS,    0)); };
-actionclass analyzeConnectedOBUS3   { analyze(connected(TYPE_OBUS,    3)); };
-actionclass analyzeConnectedXBUS1   { analyze(connected(TYPE_XBUS,    1)); };
-actionclass analyzeConnectedXBUS2   { analyze(connected(TYPE_XBUS,    2)); };
-actionclass analyzeConnectedPEC0    { analyze(connected(TYPE_PEC,     0)); };
-actionclass analyzeConnectedPEC1    { analyze(connected(TYPE_PEC,     1)); };
-actionclass analyzeConnectedPEC2    { analyze(connected(TYPE_PEC,     2)); };
-actionclass analyzeConnectedPHB0    { analyze(connected(TYPE_PHB,     0)); };
-actionclass analyzeConnectedPHB1    { analyze(connected(TYPE_PHB,     1)); };
-actionclass analyzeConnectedPHB2    { analyze(connected(TYPE_PHB,     2)); };
-actionclass analyzeConnectedPHB3    { analyze(connected(TYPE_PHB,     3)); };
-actionclass analyzeConnectedPHB4    { analyze(connected(TYPE_PHB,     4)); };
-actionclass analyzeConnectedPHB5    { analyze(connected(TYPE_PHB,     5)); };
-actionclass analyzeConnectedMCBIST0 { analyze(connected(TYPE_MCBIST,  0)); };
-actionclass analyzeConnectedMCBIST1 { analyze(connected(TYPE_MCBIST,  1)); };
-actionclass analyzeConnectedMCS0    { analyze(connected(TYPE_MCS,     0)); };
-actionclass analyzeConnectedMCS1    { analyze(connected(TYPE_MCS,     1)); };
-actionclass analyzeConnectedMCS2    { analyze(connected(TYPE_MCS,     2)); };
-actionclass analyzeConnectedMCS3    { analyze(connected(TYPE_MCS,     3)); };
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule
new file mode 100644
index 000000000..826308710
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule
@@ -0,0 +1,36 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] 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
+
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedMCBIST0 { analyze(connected(TYPE_MCBIST,  0)); };
+actionclass analyzeConnectedMCBIST1 { analyze(connected(TYPE_MCBIST,  1)); };
+actionclass analyzeConnectedMCS0    { analyze(connected(TYPE_MCS,     0)); };
+actionclass analyzeConnectedMCS1    { analyze(connected(TYPE_MCS,     1)); };
+actionclass analyzeConnectedMCS2    { analyze(connected(TYPE_MCS,     2)); };
+actionclass analyzeConnectedMCS3    { analyze(connected(TYPE_MCS,     3)); };
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_eq_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_eq_actions.rule
index 73333cbf3..59e183933 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_common_eq_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_common_eq_actions.rule
@@ -29,3 +29,10 @@
 
 actionclass analyzeEQ_LFIR { analyze(gEQ_LFIR); };
 
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedEX0 { analyze(connected(TYPE_EX, 0)); };
+actionclass analyzeConnectedEX1 { analyze(connected(TYPE_EX, 1)); };
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule
index 3559662af..461fbc664 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule
@@ -23,6 +23,22 @@
 #
 # IBM_PROLOG_END_TAG
 
+    register IOOLFIR_AND
+    {
+        name        "P9 chip IOOLFIR atomic AND";
+        scomaddr    0x09010801;
+        capture     group never;
+        access      write_only;
+    };
+
+    register IOOLFIR_MASK_OR
+    {
+        name        "P9 chip IOOLFIR atomic OR";
+        scomaddr    0x09010805;
+        capture     group never;
+        access      write_only;
+    };
+
     register OBUS_ERROR_REG
     {
         name        "OBUS PCB Slave error reg";
@@ -69,4 +85,91 @@
         capture     group default;
     };
 
+    ############################################################################
+    # P9 OBUS targets for cable FFDC
+    #    One additional reg (IOOLFIR) is in default group
+    ############################################################################
+    register OLL0_XMITLANE_CTL
+    {
+        name        "P9 OBUS target OLL LINK0 TRANSMIT LANE CTL";
+        scomaddr    0x09010810;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL1_XMITLANE_CTL
+    {
+        name        "P9 OBUS target OLL LINK1 TRANSMIT LANE CTL";
+        scomaddr    0x09010811;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL0_RECVLANE_CTL
+    {
+        name        "P9 OBUS target OLL LINK0 RECEIVE LANE CTL";
+        scomaddr    0x09010812;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL1_RECVLANE_CTL
+    {
+        name        "P9 OBUS target OLL LINK1 RECEIVE LANE CTL";
+        scomaddr    0x09010813;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL0_INFO_REG
+    {
+        name        "P9 OBUS target OLL LINK0 INFORMATION REG";
+        scomaddr    0x09010814;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL1_INFO_REG
+    {
+        name        "P9 OBUS target OLL LINK1 INFORMATION REG";
+        scomaddr    0x09010815;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL0_ERROR_STATUS_REG
+    {
+        name        "P9 OBUS target OLL LINK0 ERROR STATUS";
+        scomaddr    0x09010816;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL1_ERROR_STATUS_REG
+    {
+        name        "P9 OBUS target OLL LINK1 ERROR STATUS";
+        scomaddr    0x09010817;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL_REPLAY_THRESHOLD_REG
+    {
+        name        "P9 OBUS target OLL REPLAY THRESHOLD";
+        scomaddr    0x09010818;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL_SLECC_THRESHOLD_REG
+    {
+        name        "P9 OBUS target OLL SL ECC THRESHOLD";
+        scomaddr    0x09010819;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL0_SYNDROME_CAP_REG
+    {
+        name        "P9 OBUS target OLL LINK0 SYNDROME CAPTURE";
+        scomaddr    0x09010822;
+        capture     group smpCableFFDC;
+    };
+
+    register OLL1_SYNDROME_CAP_REG
+    {
+        name        "P9 OBUS target OLL LINK1 SYNDROME CAPTURE";
+        scomaddr    0x09010823;
+        capture     group smpCableFFDC;
+    };
 
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule
index 21bfc3101..3aea1d282 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule
@@ -698,3 +698,53 @@ actionclass analyzeNPU2FIR
     analyze(gNPU2FIR);
 };
 
+###############################################################################
+# Analyze connected
+###############################################################################
+
+actionclass analyzeConnectedEQ0   { analyze(connected(TYPE_EQ,      0)); };
+actionclass analyzeConnectedEQ1   { analyze(connected(TYPE_EQ,      1)); };
+actionclass analyzeConnectedEQ2   { analyze(connected(TYPE_EQ,      2)); };
+actionclass analyzeConnectedEQ3   { analyze(connected(TYPE_EQ,      3)); };
+actionclass analyzeConnectedEQ4   { analyze(connected(TYPE_EQ,      4)); };
+actionclass analyzeConnectedEQ5   { analyze(connected(TYPE_EQ,      5)); };
+actionclass analyzeConnectedEC0   { analyze(connected(TYPE_CORE,    0)); };
+actionclass analyzeConnectedEC1   { analyze(connected(TYPE_CORE,    1)); };
+actionclass analyzeConnectedEC2   { analyze(connected(TYPE_CORE,    2)); };
+actionclass analyzeConnectedEC3   { analyze(connected(TYPE_CORE,    3)); };
+actionclass analyzeConnectedEC4   { analyze(connected(TYPE_CORE,    4)); };
+actionclass analyzeConnectedEC5   { analyze(connected(TYPE_CORE,    5)); };
+actionclass analyzeConnectedEC6   { analyze(connected(TYPE_CORE,    6)); };
+actionclass analyzeConnectedEC7   { analyze(connected(TYPE_CORE,    7)); };
+actionclass analyzeConnectedEC8   { analyze(connected(TYPE_CORE,    8)); };
+actionclass analyzeConnectedEC9   { analyze(connected(TYPE_CORE,    9)); };
+actionclass analyzeConnectedEC10  { analyze(connected(TYPE_CORE,   10)); };
+actionclass analyzeConnectedEC11  { analyze(connected(TYPE_CORE,   11)); };
+actionclass analyzeConnectedEC12  { analyze(connected(TYPE_CORE,   12)); };
+actionclass analyzeConnectedEC13  { analyze(connected(TYPE_CORE,   13)); };
+actionclass analyzeConnectedEC14  { analyze(connected(TYPE_CORE,   14)); };
+actionclass analyzeConnectedEC15  { analyze(connected(TYPE_CORE,   15)); };
+actionclass analyzeConnectedEC16  { analyze(connected(TYPE_CORE,   16)); };
+actionclass analyzeConnectedEC17  { analyze(connected(TYPE_CORE,   17)); };
+actionclass analyzeConnectedEC18  { analyze(connected(TYPE_CORE,   18)); };
+actionclass analyzeConnectedEC19  { analyze(connected(TYPE_CORE,   19)); };
+actionclass analyzeConnectedEC20  { analyze(connected(TYPE_CORE,   20)); };
+actionclass analyzeConnectedEC21  { analyze(connected(TYPE_CORE,   21)); };
+actionclass analyzeConnectedEC22  { analyze(connected(TYPE_CORE,   22)); };
+actionclass analyzeConnectedEC23  { analyze(connected(TYPE_CORE,   23)); };
+actionclass analyzeConnectedCAPP0 { analyze(connected(TYPE_CAPP,    0)); };
+actionclass analyzeConnectedCAPP1 { analyze(connected(TYPE_CAPP,    1)); };
+actionclass analyzeConnectedOBUS0 { analyze(connected(TYPE_OBUS,    0)); };
+actionclass analyzeConnectedOBUS3 { analyze(connected(TYPE_OBUS,    3)); };
+actionclass analyzeConnectedXBUS1 { analyze(connected(TYPE_XBUS,    1)); };
+actionclass analyzeConnectedXBUS2 { analyze(connected(TYPE_XBUS,    2)); };
+actionclass analyzeConnectedPEC0  { analyze(connected(TYPE_PEC,     0)); };
+actionclass analyzeConnectedPEC1  { analyze(connected(TYPE_PEC,     1)); };
+actionclass analyzeConnectedPEC2  { analyze(connected(TYPE_PEC,     2)); };
+actionclass analyzeConnectedPHB0  { analyze(connected(TYPE_PHB,     0)); };
+actionclass analyzeConnectedPHB1  { analyze(connected(TYPE_PHB,     1)); };
+actionclass analyzeConnectedPHB2  { analyze(connected(TYPE_PHB,     2)); };
+actionclass analyzeConnectedPHB3  { analyze(connected(TYPE_PHB,     3)); };
+actionclass analyzeConnectedPHB4  { analyze(connected(TYPE_PHB,     4)); };
+actionclass analyzeConnectedPHB5  { analyze(connected(TYPE_PHB,     5)); };
+