INITPROC: Hostboot - SW236290 - HWP Week 11/19

Change-Id: If83a0b4ae1380d246ab817a50aa4cd3dd7e8d0f8
CQ:SW236290
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7536
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 16 insertions, 16 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 45a474897..9156963ca 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.13 2013/07/30 15:23:25 jeshua Exp $
+// $Id: proc_prep_master_winkle.C,v 1.14 2013/11/08 22:48:47 jeshua Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_prep_master_winkle.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -55,10 +55,10 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "proc_prep_master_winkle.H"
-#include "p8_scom_addresses.H"
-#include "p8_istep_num.H"
-#include "proc_sbe_trigger_winkle.H"
+#include <proc_prep_master_winkle.H>
+#include <p8_scom_addresses.H>
+#include <p8_istep_num.H>
+#include <proc_sbe_trigger_winkle.H>
 
 //------------------------------------------------------------------------------
 // Function definitions
@@ -77,13 +77,13 @@ extern "C"
 //
 // parameters: i_ex_target     => Reference to master chiplet target
 //             i_useRealSBE => True if proc_sbe_trigger_winkle is supposed to be
-//                             running on the real SBE (default is true), else
+//                             running on the real SBE (usually true), else
 //                             false if proc_sbe_trigger_winkle is running on
 //                             the FSP (via poreve).
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
     fapi::ReturnCode proc_prep_master_winkle(const fapi::Target & i_ex_target, 
-                                             const bool & i_useRealSBE = true)
+                                             const bool & i_useRealSBE)
     {
         // data buffer to hold register values
         ecmdDataBufferBase data(64);
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 ae37dcf63..fa488de8e 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.7 2013/07/01 18:41:37 stillgs Exp $
+// $Id: proc_prep_master_winkle.H,v 1.8 2013/11/08 22:47:42 jeshua Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_prep_master_winkle.H,v $
 //------------------------------------------------------------------------------
 // *|
@@ -69,7 +69,7 @@ extern "C"
  *
  * @param[in] i_ex_target  Reference to master chiplet target
  * @param[in] i_useRealSBE True if proc_sbe_trigger_winkle is supposed to be
- *                         running on the real SBE (default is true), else
+ *                         running on the real SBE (usually true), else
  *                         false if proc_sbe_trigger_winkle is running on
  *                         the FSP (via poreve).
  *
diff --git a/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C b/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C
index 6708a8a07..d5240c7b0 100644
--- a/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C
+++ b/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C
@@ -21,7 +21,7 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 // -*- mode: C++; c-file-style: "linux";  -*-
-// $Id: proc_stop_deadman_timer.C,v 1.8 2013/06/05 14:40:54 jeshua Exp $
+// $Id: proc_stop_deadman_timer.C,v 1.9 2013/11/08 22:10:44 jeshua Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_stop_deadman_timer.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -52,10 +52,10 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "proc_stop_deadman_timer.H"
-#include "p8_scom_addresses.H"
-#include "p8_istep_num.H"
-#include "proc_sbe_trigger_winkle.H"
+#include <proc_stop_deadman_timer.H>
+#include <p8_scom_addresses.H>
+#include <p8_istep_num.H>
+#include <proc_sbe_trigger_winkle.H>
 
 //------------------------------------------------------------------------------
 // Function definitions
@@ -119,7 +119,7 @@ extern "C"
                 const fapi::Target & CHIP_IN_ERROR = i_target;
                 ecmdDataBufferBase & SBE_VITAL = data;
                 FAPI_SET_HWP_ERROR(rc, RC_PROC_STOP_DEADMAN_TIMER_BAD_ISTEP_NUM);
-                break;
+                fapiLogError(rc);
             }
 
             if( substep_num != SUBSTEP_DEADMAN_WAITING_FOR_HOSTBOOT )
@@ -130,7 +130,7 @@ extern "C"
                 const fapi::Target & CHIP_IN_ERROR = i_target;
                 ecmdDataBufferBase & SBE_VITAL = data;
                 FAPI_SET_HWP_ERROR(rc, RC_PROC_STOP_DEADMAN_TIMER_BAD_SUBSTEP_NUM);
-                break;
+                fapiLogError(rc);
             }
 
             //Notify SBE that HB is alive again