PON - HW procedures update - Set #1

Change-Id: Ibe998c8cfd6ad39f63e9ab91f836a1d9aa428431
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2661
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 40 insertions, 31 deletions

diff --git a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C
index 2ef60754d..453c13493 100644
--- a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C
+++ b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C
@@ -21,7 +21,7 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 // -*- mode: C++; c-file-style: "linux";  -*-
-// $Id: proc_prep_master_winkle.C,v 1.9 2012/09/11 14:06:21 jeshua Exp $
+// $Id: proc_prep_master_winkle.C,v 1.11 2012/10/24 22:22:23 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_prep_master_winkle.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -57,7 +57,6 @@
 //------------------------------------------------------------------------------
 #include "proc_prep_master_winkle.H"
 #include "p8_scom_addresses.H"
-#include "proc_sbe_ffdc.H"
 #include "p8_istep_num.H"
 #include "proc_sbe_trigger_winkle.H"
 
@@ -84,7 +83,7 @@ extern "C"
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
     fapi::ReturnCode proc_prep_master_winkle(const fapi::Target & i_target, 
-                                             bool i_useRealSBE = true)
+                                             const bool & i_useRealSBE = true)
     {
         // data buffer to hold register values
         ecmdDataBufferBase data(64);
@@ -137,6 +136,7 @@ extern "C"
             if(rc_ecmd)
             {
                 FAPI_ERR("Error (0x%x) setting up ecmdDataBufferBase", rc_ecmd);
+
                 rc.setEcmdError(rc_ecmd);
                 break;
             }
diff --git a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H
index 0a384b567..39aeabf14 100644
--- a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H
+++ b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_prep_master_winkle.H,v 1.5 2012/08/24 18:32:51 jeshua Exp $
+// $Id: proc_prep_master_winkle.H,v 1.6 2012/10/24 22:22:43 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_prep_master_winkle.H,v $
 //------------------------------------------------------------------------------
 // *|
@@ -76,7 +76,7 @@ extern "C"
  * @return ReturnCode
  */
   fapi::ReturnCode proc_prep_master_winkle(const fapi::Target & i_target,
-                                           const bool i_useRealSBE);
+                                           const bool & i_useRealSBE);
 
 } // extern "C"
 
diff --git a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml
index 400d9e700..b1ee724c7 100644
--- a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml
+++ b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml
@@ -1,46 +1,55 @@
-<!--  IBM_PROLOG_BEGIN_TAG
-     This is an automatically generated prolog.
-
-     $Source: src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml $
-
-     IBM CONFIDENTIAL
-
-     COPYRIGHT International Business Machines Corp. 2012
-
-     p1
-
-     Object Code Only (OCO) source materials
-     Licensed Internal Code Source Materials
-     IBM HostBoot Licensed Internal Code
-
-     The source code for this program is not published or other-
-     wise divested of its trade secrets, irrespective of what has
-     been deposited with the U.S. Copyright Office.
-
-     Origin: 30
-
-     IBM_PROLOG_END_TAG -->
-<!-- Error definitions for proc_prep_master_winkle procedure  -->
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml $ -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2012                   -->
+<!--                                                                        -->
+<!-- p1                                                                     -->
+<!--                                                                        -->
+<!-- Object Code Only (OCO) source materials                                -->
+<!-- Licensed Internal Code Source Materials                                -->
+<!-- IBM HostBoot Licensed Internal Code                                    -->
+<!--                                                                        -->
+<!-- The source code for this program is not published or otherwise         -->
+<!-- divested of its trade secrets, irrespective of what has been           -->
+<!-- deposited with the U.S. Copyright Office.                              -->
+<!--                                                                        -->
+<!-- Origin: 30                                                             -->
+<!--                                                                        -->
+<!-- IBM_PROLOG_END_TAG                                                     -->
+<!-- Error definitions for proc_prep_master_winkle procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_PREP_MASTER_WINKLE_SBE_NOT_RUNNING</rc>
     <description>The SBE is stopped and so will never wake up the master core</description>
-    <collectFfdc>proc_sbe_ffdc, CHIP_IN_ERROR</collectFfdc>
+    <collectRegisterFfdc>
+        <id>REG_FFDC_PROC_SBE_REGISTERS</id>
+        <target>CHIP_IN_ERROR</target>
+    </collectRegisterFfdc>
     <ffdc>SBE_STATUS</ffdc>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_PREP_MASTER_WINKLE_BAD_ISTEP_NUM</rc>
     <description>The SBE is not at the correct istep number</description>
-    <collectFfdc>proc_sbe_ffdc, CHIP_IN_ERROR</collectFfdc>
+    <collectRegisterFfdc>
+        <id>REG_FFDC_PROC_SBE_REGISTERS</id>
+        <target>CHIP_IN_ERROR</target>
+    </collectRegisterFfdc>
     <ffdc>SBE_VITAL</ffdc>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_PREP_MASTER_WINKLE_BAD_SUBSTEP_NUM</rc>
     <description>The SBE is not at the correct substep number</description>
-    <collectFfdc>proc_sbe_ffdc, CHIP_IN_ERROR</collectFfdc>
+    <collectRegisterFfdc>
+        <id>REG_FFDC_PROC_SBE_REGISTERS</id>
+        <target>CHIP_IN_ERROR</target>
+    </collectRegisterFfdc>
     <ffdc>SBE_VITAL</ffdc>
   </hwpError>
 </hwpErrors>