Improve FAPI Bus Callouts (working/830)

When FAPI calls out a bus an additional procedure callout is made and
there are changes in priorities of other items being called out.
This commit covers the working/830 change.

Change-Id: I3f265371436be100124b8ec97d808d2295ea59db
CQ: SW263291
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13974
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 22 insertions, 2 deletions

diff --git a/src/usr/hwpf/fapi/fapiReturnCode.C b/src/usr/hwpf/fapi/fapiReturnCode.C
index f8d14ad05..27d23e9be 100644
--- a/src/usr/hwpf/fapi/fapiReturnCode.C
+++ b/src/usr/hwpf/fapi/fapiReturnCode.C
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: fapiReturnCode.C,v 1.20 2014/07/23 16:20:32 whs Exp $
+// $Id: fapiReturnCode.C,v 1.21 2014/10/27 15:38:22 baiocchi Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCode.C,v $
 
 /**
@@ -342,7 +342,27 @@ void ReturnCode::addErrorInfo(const void * const * i_pObjects,
             const Target * l_pTarget2 = static_cast<const Target *>(
                 i_pObjects[l_ep2Index]);
 
-            // Add the ErrorInfo
+            // Add Procedure ErrorInfo section first
+            ProcedureCallouts::ProcedureCallout l_proc =
+                ProcedureCallouts::BUS_CALLOUT;
+            FAPI_DBG("addErrorInfo: Bus Callout: Adding procedure "
+                     "proc: %d, pri: %d",
+                     l_proc, l_pri);
+            addEIProcedureCallout(l_proc, l_pri);
+
+            // Update priority for bus callout (with targets):
+            // use priority 1 level down of initial callout priority
+            if (l_pri == CalloutPriorities::HIGH)
+            {
+                l_pri = CalloutPriorities::MEDIUM;
+            }
+            else
+            {
+                // Medium or low, so set to low
+                l_pri = CalloutPriorities::LOW;
+            }
+
+            // Add the Bus Callout ErrorInfo section next with updated priority
             FAPI_DBG("addErrorInfo: Adding bus callout, pri: %d", l_pri);
             addEIBusCallout(*l_pTarget1, *l_pTarget2, l_pri);
         }