Memory Leak task_end

Change-Id: Idb7a2d8d72a55f644efd0b2548eca5df5d062e6d
RTC: 47491
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2011
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

28 files changed, 228 insertions, 224 deletions

diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C
index 760e2b808..3b6a834b0 100644
--- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C
+++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C
@@ -73,7 +73,7 @@ using   namespace   fapi;
 //  Wrapper function to call 09.1 :
 //      proc_build_smp
 //
-void    call_proc_build_smp( void    *io_pArgs )
+void*    call_proc_build_smp( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -197,7 +197,7 @@ void    call_proc_build_smp( void    *io_pArgs )
                "call_proc_build_smp exit" );
 
     // end task, returning any errorlogs to IStepDisp 
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H
index 284b76886..19215788d 100644
--- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H
+++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H
@@ -72,10 +72,10 @@ namespace   ACTIVATE_POWERBUS
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_build_smp( void    *io_pArgs );
+void*    call_proc_build_smp( void    *io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
index 95662a7eb..dd4afe3b5 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
@@ -296,7 +296,7 @@ errlHndl_t  applyPoreGenCpuRegs(   TARGETING::Target *i_cpuTarget,
 //  Wrapper function to call 15.1 :
 //      host_build_winkle
 //
-void    call_host_build_winkle( void    *io_pArgs )
+void*    call_host_build_winkle( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -412,7 +412,7 @@ void    call_host_build_winkle( void    *io_pArgs )
                "call_host_build_winkle exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -421,7 +421,7 @@ void    call_host_build_winkle( void    *io_pArgs )
 //  Wrapper function to call 15.2 :
 //      proc_set_pore_bar
 //
-void    call_proc_set_pore_bar( void    *io_pArgs )
+void*    call_proc_set_pore_bar( void    *io_pArgs )
 {
     errlHndl_t  l_errl      =   NULL;
 
@@ -512,7 +512,7 @@ void    call_proc_set_pore_bar( void    *io_pArgs )
                "call_proc_set_pore_bar exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H
index 52e562b51..a9145733f 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H
@@ -78,10 +78,10 @@ namespace   BUILD_WINKLE_IMAGES
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_build_winkle( void    *io_pArgs );
+void*    call_host_build_winkle( void    *io_pArgs );
 
 
 
@@ -92,10 +92,11 @@ void    call_host_build_winkle( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
+ *
  *
  */
-void    call_proc_set_pore_bar( void    *io_pArgs );
+void*    call_proc_set_pore_bar( void    *io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.C b/src/usr/hwpf/hwp/core_activate/core_activate.C
index b4b98a16c..89824647b 100644
--- a/src/usr/hwpf/hwp/core_activate/core_activate.C
+++ b/src/usr/hwpf/hwp/core_activate/core_activate.C
@@ -81,7 +81,7 @@ using   namespace   ISTEP;
 //  Wrapper function to call 16.1 :
 //      host_activate_master
 //
-    void    call_host_activate_master( void    *io_pArgs )
+    void*    call_host_activate_master( void    *io_pArgs )
     {
         errlHndl_t  l_errl  =   NULL;
 
@@ -202,7 +202,7 @@ using   namespace   ISTEP;
                    "call_host_activate_master exit" );
 
         // end task, returning any errorlogs to IStepDisp
-        task_end2( l_errl );
+        return l_errl;
 
     }
 
@@ -212,7 +212,7 @@ using   namespace   ISTEP;
 //  Wrapper function to call 16.2 :
 //      host_activate_slave_cores
 //
-void    call_host_activate_slave_cores( void    *io_pArgs )
+void*    call_host_activate_slave_cores( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -289,7 +289,7 @@ void    call_host_activate_slave_cores( void    *io_pArgs )
                "call_host_activate_slave_cores exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -298,7 +298,7 @@ void    call_host_activate_slave_cores( void    *io_pArgs )
 //  Wrapper function to call 16.3 :
 //      host_ipl_complete
 //
-void    call_host_ipl_complete( void    *io_pArgs )
+void*    call_host_ipl_complete( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -361,7 +361,7 @@ void    call_host_ipl_complete( void    *io_pArgs )
 
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.H b/src/usr/hwpf/hwp/core_activate/core_activate.H
index c7a848d6f..147118b47 100644
--- a/src/usr/hwpf/hwp/core_activate/core_activate.H
+++ b/src/usr/hwpf/hwp/core_activate/core_activate.H
@@ -84,10 +84,10 @@ namespace   CORE_ACTIVATE
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_activate_master( void    *io_pArgs );
+void*    call_host_activate_master( void    *io_pArgs );
 
 
 
@@ -98,10 +98,10 @@ void    call_host_activate_master( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_activate_slave_cores( void    *io_pArgs );
+void*    call_host_activate_slave_cores( void    *io_pArgs );
 
 
 
@@ -112,10 +112,10 @@ void    call_host_activate_slave_cores( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_ipl_complete( void    *io_pArgs );
+void*    call_host_ipl_complete( void    *io_pArgs );
 
 };   // end namespace
 
diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.C b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
index b3f11089e..40c3dc18c 100644
--- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C
+++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
@@ -74,7 +74,7 @@ using   namespace   fapi;
 //
 //  Wrapper function to call 11.1   dmi_scominit
 //
-void    call_dmi_scominit( void *io_pArgs )
+void*    call_dmi_scominit( void *io_pArgs )
 {
     errlHndl_t l_errl = NULL;
 
@@ -149,14 +149,14 @@ void    call_dmi_scominit( void *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_scominit exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
 //
 //  Wrapper function to call 11.2 :  dmi_erepair
 //
-void    call_dmi_erepair( void *io_pArgs )
+void*    call_dmi_erepair( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_erepair entry" );
@@ -164,13 +164,13 @@ void    call_dmi_erepair( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_erepair exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 11.3 : dmi_io_dccal
 //
-void    call_dmi_io_dccal( void *io_pArgs )
+void*    call_dmi_io_dccal( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -179,14 +179,14 @@ void    call_dmi_io_dccal( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_dccal exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
 //
 //  Wrapper function to call 11.4 : dmi_pre_trainadv
 //
-void    call_dmi_pre_trainadv( void *io_pArgs )
+void*    call_dmi_pre_trainadv( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -195,14 +195,14 @@ void    call_dmi_pre_trainadv( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_pre_trainadv exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
 //
 //  Wrapper function to call 11.5 : dmi_io_run_training
 //
-void    call_dmi_io_run_training( void *io_pArgs )
+void*    call_dmi_io_run_training( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -307,13 +307,13 @@ void    call_dmi_io_run_training( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_run_training exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 11.6 : dmi_post_trainadv
 //
-void    call_dmi_post_trainadv( void *io_pArgs )
+void*    call_dmi_post_trainadv( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -322,14 +322,14 @@ void    call_dmi_post_trainadv( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_post_trainadv exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
 //
 //  Wrapper function to call 11.7 : proc_cen_framelock
 //
-void    call_proc_cen_framelock( void *io_pArgs )
+void*    call_proc_cen_framelock( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
     proc_cen_framelock_args     l_args;
@@ -409,13 +409,13 @@ void    call_proc_cen_framelock( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_cen_framework exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 11.8 : host_startPRD_dmi
 //
-void    call_host_startPRD_dmi( void *io_pArgs )
+void*    call_host_startPRD_dmi( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_dmi entry" );
@@ -423,13 +423,13 @@ void    call_host_startPRD_dmi( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_dmi exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 11.9 : host_attnlisten_cen
 //
-void    call_host_attnlisten_cen( void *io_pArgs )
+void*    call_host_attnlisten_cen( void *io_pArgs )
 {
 
     errlHndl_t l_err = NULL;
@@ -439,13 +439,13 @@ void    call_host_attnlisten_cen( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_attnlisten_cen exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 11.10 : cen_set_inband_addr
 //
-void    call_cen_set_inband_addr( void *io_pArgs )
+void*    call_cen_set_inband_addr( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -454,7 +454,7 @@ void    call_cen_set_inband_addr( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_cen_set_inband_addr exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.H b/src/usr/hwpf/hwp/dmi_training/dmi_training.H
index 49cc8badf..5b25b817c 100644
--- a/src/usr/hwpf/hwp/dmi_training/dmi_training.H
+++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.H
@@ -120,10 +120,10 @@ namespace   DMI_TRAINING
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_dmi_scominit( void * io_pArgs );
+void*    call_dmi_scominit( void * io_pArgs );
 
 
 /**
@@ -133,10 +133,10 @@ void    call_dmi_scominit( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_dmi_erepair( void * io_pArgs );
+void*    call_dmi_erepair( void * io_pArgs );
 
 
 /**
@@ -146,10 +146,10 @@ void    call_dmi_erepair( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_dmi_io_dccal( void * io_pArgs );
+void*    call_dmi_io_dccal( void * io_pArgs );
 
 
 /**
@@ -159,10 +159,10 @@ void    call_dmi_io_dccal( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_dmi_pre_trainadv( void * io_pArgs );
+void*    call_dmi_pre_trainadv( void * io_pArgs );
 
 
 /**
@@ -172,10 +172,10 @@ void    call_dmi_pre_trainadv( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_dmi_io_run_training( void * io_pArgs );
+void*    call_dmi_io_run_training( void * io_pArgs );
 
 
 /**
@@ -185,10 +185,10 @@ void    call_dmi_io_run_training( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_dmi_post_trainadv( void * io_pArgs );
+void*    call_dmi_post_trainadv( void * io_pArgs );
 
 
 /**
@@ -198,10 +198,10 @@ void    call_dmi_post_trainadv( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_cen_framelock( void *io_pArgs );
+void*    call_proc_cen_framelock( void *io_pArgs );
 
 
 /**
@@ -211,10 +211,10 @@ void    call_proc_cen_framelock( void *io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_startPRD_dmi( void * io_pArgs );
+void*    call_host_startPRD_dmi( void * io_pArgs );
 
 
 /**
@@ -224,10 +224,10 @@ void    call_host_startPRD_dmi( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_attnlisten_cen( void * io_pArgs );
+void*    call_host_attnlisten_cen( void * io_pArgs );
 
 
 /**
@@ -237,10 +237,10 @@ void    call_host_attnlisten_cen( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                               or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_cen_set_inband_addr( void * io_pArgs );
+void*    call_cen_set_inband_addr( void * io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
index 0fb777893..b2af5d3a9 100644
--- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
+++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
@@ -88,7 +88,7 @@ using   namespace   fapi;
 //  Wrapper function to call 14.1 :
 //      host_startPRD_dram
 //
-void    call_host_startPRD_dram( void    *io_pArgs )
+void*    call_host_startPRD_dram( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -132,14 +132,14 @@ void    call_host_startPRD_dram( void    *io_pArgs )
                "call_host_startPRD_dram exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 //
 //  Wrapper function to call 14.2 :
 //      mss_extent_setup
 //
-void    call_mss_extent_setup( void    *io_pArgs )
+void*    call_mss_extent_setup( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -164,14 +164,14 @@ void    call_mss_extent_setup( void    *io_pArgs )
             "call_mss_extent_setup exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 //
 //  Wrapper function to call 14.3 :
 //      mss_memdiag
 //
-void    call_mss_memdiag( void    *io_pArgs )
+void*    call_mss_memdiag( void    *io_pArgs )
 {
     using namespace MDIA;
 
@@ -213,7 +213,7 @@ void    call_mss_memdiag( void    *io_pArgs )
                "call_mss_memdiag exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -222,7 +222,7 @@ void    call_mss_memdiag( void    *io_pArgs )
 //  Wrapper function to call 14.4 :
 //      mss_scrub
 //
-void    call_mss_scrub( void    *io_pArgs )
+void*    call_mss_scrub( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -266,7 +266,7 @@ void    call_mss_scrub( void    *io_pArgs )
                "call_mss_scrub exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -275,7 +275,7 @@ void    call_mss_scrub( void    *io_pArgs )
 //  Wrapper function to call 14.5 :
 //      mss_thermal_init
 //
-void    call_mss_thermal_init( void    *io_pArgs )
+void*    call_mss_thermal_init( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -319,7 +319,7 @@ void    call_mss_thermal_init( void    *io_pArgs )
                "call_mss_thermal_init exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -328,7 +328,7 @@ void    call_mss_thermal_init( void    *io_pArgs )
 //  Wrapper function to call 14.6 :
 //      proc_setup_bars
 //
-void    call_proc_setup_bars( void    *io_pArgs )
+void*    call_proc_setup_bars( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -487,7 +487,7 @@ void    call_proc_setup_bars( void    *io_pArgs )
                "call_proc_setup_bars exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -496,7 +496,7 @@ void    call_proc_setup_bars( void    *io_pArgs )
 //  Wrapper function to call 14.7 :
 //      proc_pcie_config
 //
-void    call_proc_pcie_config( void    *io_pArgs )
+void*    call_proc_pcie_config( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -540,7 +540,7 @@ void    call_proc_pcie_config( void    *io_pArgs )
                "call_proc_pcie_config exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -549,7 +549,7 @@ void    call_proc_pcie_config( void    *io_pArgs )
 //  Wrapper function to call 14.8 :
 //      proc_exit_cache_contained
 //
-void    call_proc_exit_cache_contained( void    *io_pArgs )
+void*    call_proc_exit_cache_contained( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -611,7 +611,7 @@ void    call_proc_exit_cache_contained( void    *io_pArgs )
     // @@@@@    END CUSTOM BLOCK:   @@@@@
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H
index 8221a079b..c9c6c98a6 100644
--- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H
+++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H
@@ -109,10 +109,10 @@ namespace   DRAM_INITIALIZATION
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_host_startPRD_dram( void    *io_pArgs );
+void*    call_host_startPRD_dram( void    *io_pArgs );
 
 
 
@@ -123,10 +123,10 @@ void    call_host_startPRD_dram( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_mss_extent_setup( void    *io_pArgs );
+void*    call_mss_extent_setup( void    *io_pArgs );
 
 
 
@@ -137,10 +137,10 @@ void    call_mss_extent_setup( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_mss_memdiag( void    *io_pArgs );
+void*    call_mss_memdiag( void    *io_pArgs );
 
 
 
@@ -151,10 +151,10 @@ void    call_mss_memdiag( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_mss_scrub( void    *io_pArgs );
+void*    call_mss_scrub( void    *io_pArgs );
 
 
 
@@ -165,10 +165,10 @@ void    call_mss_scrub( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_mss_thermal_init( void    *io_pArgs );
+void*    call_mss_thermal_init( void    *io_pArgs );
 
 
 
@@ -179,10 +179,10 @@ void    call_mss_thermal_init( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_proc_setup_bars( void    *io_pArgs );
+void*    call_proc_setup_bars( void    *io_pArgs );
 
 
 
@@ -193,10 +193,10 @@ void    call_proc_setup_bars( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_proc_pcie_config( void    *io_pArgs );
+void*    call_proc_pcie_config( void    *io_pArgs );
 
 
 
@@ -207,10 +207,10 @@ void    call_proc_pcie_config( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  pointer to any errlogs
  *
  */
-void    call_proc_exit_cache_contained( void    *io_pArgs );
+void*    call_proc_exit_cache_contained( void    *io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C
index 5bc590dd9..f0efc125e 100644
--- a/src/usr/hwpf/hwp/dram_training/dram_training.C
+++ b/src/usr/hwpf/hwp/dram_training/dram_training.C
@@ -90,7 +90,7 @@ using   namespace   fapi;
 //
 //  Wrapper function to call 13.1 : host_disable_vddr
 //
-void    call_host_disable_vddr( void *io_pArgs )
+void*    call_host_disable_vddr( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -143,7 +143,7 @@ void    call_host_disable_vddr( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_disable_vddr exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -151,7 +151,7 @@ void    call_host_disable_vddr( void *io_pArgs )
 //
 //  Wrapper function to call 13.2 : mem_pll_setup
 //
-void    call_mem_pll_setup( void *io_pArgs )
+void*    call_mem_pll_setup( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup entry" );
@@ -163,7 +163,8 @@ void    call_mem_pll_setup( void *io_pArgs )
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                             "WARNING: mem_pll_setup HWP is disabled in SIMICS run!");
         // end task
-        task_end2( l_err );
+        return l_err;
+       
     }
 
 
@@ -222,7 +223,7 @@ void    call_mem_pll_setup( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -230,7 +231,7 @@ void    call_mem_pll_setup( void *io_pArgs )
 //
 //  Wrapper function to call 13.3 : mem_startclocks
 //
-void    call_mem_startclocks( void *io_pArgs )
+void*    call_mem_startclocks( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -277,7 +278,7 @@ void    call_mem_startclocks( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_startclocks exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -285,7 +286,7 @@ void    call_mem_startclocks( void *io_pArgs )
 //
 //  Wrapper function to call 13.4 : host_enable_vddr
 //
-void    call_host_enable_vddr( void *io_pArgs )
+void*    call_host_enable_vddr( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -338,7 +339,7 @@ void    call_host_enable_vddr( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_enable_vddr exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -346,7 +347,7 @@ void    call_host_enable_vddr( void *io_pArgs )
 //
 //  Wrapper function to call 13.5 : mss_scominit
 //
-void    call_mss_scominit( void *io_pArgs )
+void*    call_mss_scominit( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -394,13 +395,13 @@ void    call_mss_scominit( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_scominit exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 13.6 : mss_ddr_phy_reset
 //
-void  call_mss_ddr_phy_reset( void *io_pArgs )
+void*  call_mss_ddr_phy_reset( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -453,14 +454,14 @@ void  call_mss_ddr_phy_reset( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_ddr_phy_reset exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
 //
 //  Wrapper function to call 13.7 : mss_draminit
 //
-void    call_mss_draminit( void *io_pArgs )
+void*    call_mss_draminit( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -514,14 +515,14 @@ void    call_mss_draminit( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
 //
 //  Wrapper function to call 13.8 : mss_draminit_training
 //
-void    call_mss_draminit_training( void *io_pArgs )
+void*    call_mss_draminit_training( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -576,13 +577,13 @@ void    call_mss_draminit_training( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_training exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 13.9 : mss_draminit_trainadv
 //
-void    call_mss_draminit_trainadv( void *io_pArgs )
+void*    call_mss_draminit_trainadv( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -635,13 +636,13 @@ void    call_mss_draminit_trainadv( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_trainadv exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 13.10 : mss_draminit_mc
 //
-void    call_mss_draminit_mc( void *io_pArgs )
+void*    call_mss_draminit_mc( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -695,7 +696,7 @@ void    call_mss_draminit_mc( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_mc exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.H b/src/usr/hwpf/hwp/dram_training/dram_training.H
index 7421c76ad..e7039c5f7 100644
--- a/src/usr/hwpf/hwp/dram_training/dram_training.H
+++ b/src/usr/hwpf/hwp/dram_training/dram_training.H
@@ -124,10 +124,10 @@ namespace   DRAM_TRAINING
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return any errlogs to istep 
  *
  */
-void    call_host_disable_vddr( void * io_pArgs );
+void*    call_host_disable_vddr( void * io_pArgs );
 
 
 
@@ -138,10 +138,10 @@ void    call_host_disable_vddr( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mem_pll_setup( void * io_pArgs );
+void*    call_mem_pll_setup( void * io_pArgs );
 
 
 
@@ -152,10 +152,10 @@ void    call_mem_pll_setup( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mem_startclocks( void * io_pArgs );
+void*    call_mem_startclocks( void * io_pArgs );
 
 
 
@@ -166,10 +166,11 @@ void    call_mem_startclocks( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
+
  *
  */
-void    call_host_enable_vddr( void * io_pArgs );
+void*    call_host_enable_vddr( void * io_pArgs );
 
 
 
@@ -180,10 +181,10 @@ void    call_host_enable_vddr( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mss_scominit( void * io_pArgs );
+void*    call_mss_scominit( void * io_pArgs );
 
 
 
@@ -194,10 +195,10 @@ void    call_mss_scominit( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mss_ddr_phy_reset( void * io_pArgs );
+void*    call_mss_ddr_phy_reset( void * io_pArgs );
 
 
 
@@ -208,10 +209,10 @@ void    call_mss_ddr_phy_reset( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mss_draminit( void * io_pArgs );
+void*    call_mss_draminit( void * io_pArgs );
 
 
 /**
@@ -221,10 +222,10 @@ void    call_mss_draminit( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mss_draminit_training( void * io_pArgs );
+void*    call_mss_draminit_training( void * io_pArgs );
 
 
 
@@ -235,10 +236,10 @@ void    call_mss_draminit_training( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mss_draminit_trainadv( void * io_pArgs );
+void*    call_mss_draminit_trainadv( void * io_pArgs );
 
 
 
@@ -249,10 +250,10 @@ void    call_mss_draminit_trainadv( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_mss_draminit_mc( void * io_pArgs );
+void*    call_mss_draminit_mc( void * io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
index bc51f6dee..f46a09a47 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
@@ -83,7 +83,7 @@ using   namespace   fapi;
 //  Wrapper function to call 08.1 :
 //      fabric_erepair
 //
-void    call_fabric_erepair( void    *io_pArgs )
+void*    call_fabric_erepair( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -127,7 +127,7 @@ void    call_fabric_erepair( void    *io_pArgs )
                "call_fabric_erepair exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -136,7 +136,7 @@ void    call_fabric_erepair( void    *io_pArgs )
 //  Wrapper function to call 08.2 :
 //      fabric_io_dccal
 //
-void    call_fabric_io_dccal( void    *io_pArgs )
+void*    call_fabric_io_dccal( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -180,7 +180,7 @@ void    call_fabric_io_dccal( void    *io_pArgs )
                "call_fabric_io_dccal exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -189,7 +189,7 @@ void    call_fabric_io_dccal( void    *io_pArgs )
 //  Wrapper function to call 08.3 :
 //      fabric_pre_trainadv
 //
-void    call_fabric_pre_trainadv( void    *io_pArgs )
+void*    call_fabric_pre_trainadv( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -233,7 +233,7 @@ void    call_fabric_pre_trainadv( void    *io_pArgs )
                "call_fabric_pre_trainadv exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -242,7 +242,7 @@ void    call_fabric_pre_trainadv( void    *io_pArgs )
 //  Wrapper function to call 08.4 :
 //      fabric_io_run_training
 //
-void    call_fabric_io_run_training( void    *io_pArgs )
+void*    call_fabric_io_run_training( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -292,7 +292,7 @@ void    call_fabric_io_run_training( void    *io_pArgs )
                "call_fabric_io_run_training exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -301,7 +301,7 @@ void    call_fabric_io_run_training( void    *io_pArgs )
 //  Wrapper function to call 08.5 :
 //      fabric_post_trainadv
 //
-void    call_fabric_post_trainadv( void    *io_pArgs )
+void*    call_fabric_post_trainadv( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -345,7 +345,7 @@ void    call_fabric_post_trainadv( void    *io_pArgs )
                "call_fabric_post_trainadv exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -354,7 +354,7 @@ void    call_fabric_post_trainadv( void    *io_pArgs )
 //  Wrapper function to call 08.6 :
 //      host_startPRD_pbus
 //
-void    call_host_startPRD_pbus( void    *io_pArgs )
+void*    call_host_startPRD_pbus( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -398,7 +398,7 @@ void    call_host_startPRD_pbus( void    *io_pArgs )
                "call_host_startPRD_pbus exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -407,7 +407,7 @@ void    call_host_startPRD_pbus( void    *io_pArgs )
 //  Wrapper function to call 08.7 :
 //      host_attnlisten_proc
 //
-void    call_host_attnlisten_proc( void    *io_pArgs )
+void*    call_host_attnlisten_proc( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -451,7 +451,7 @@ void    call_host_attnlisten_proc( void    *io_pArgs )
                "call_host_attnlisten_proc exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -460,7 +460,7 @@ void    call_host_attnlisten_proc( void    *io_pArgs )
 //  Wrapper function to call 08.8 :
 //      proc_fab_iovalid
 //
-void    call_proc_fab_iovalid( void    *io_pArgs )
+void*    call_proc_fab_iovalid( void    *io_pArgs )
 {
     ReturnCode l_rc;
     errlHndl_t l_errl = NULL;
@@ -566,7 +566,7 @@ void    call_proc_fab_iovalid( void    *io_pArgs )
                "call_proc_fab_iovalid exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H
index db1c8918e..ab6d0bf2c 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H
@@ -114,10 +114,10 @@ namespace   EDI_EI_INITIALIZATION
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return any errlogs to istep 
  *
  */
-void    call_fabric_erepair( void    *io_pArgs );
+void*    call_fabric_erepair( void    *io_pArgs );
 
 
 
@@ -128,10 +128,10 @@ void    call_fabric_erepair( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_fabric_io_dccal( void    *io_pArgs );
+void*    call_fabric_io_dccal( void    *io_pArgs );
 
 
 
@@ -142,10 +142,10 @@ void    call_fabric_io_dccal( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_fabric_pre_trainadv( void    *io_pArgs );
+void*    call_fabric_pre_trainadv( void    *io_pArgs );
 
 
 
@@ -156,10 +156,10 @@ void    call_fabric_pre_trainadv( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_fabric_io_run_training( void    *io_pArgs );
+void*    call_fabric_io_run_training( void    *io_pArgs );
 
 
 
@@ -170,10 +170,10 @@ void    call_fabric_io_run_training( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_fabric_post_trainadv( void    *io_pArgs );
+void*    call_fabric_post_trainadv( void    *io_pArgs );
 
 
 
@@ -184,10 +184,10 @@ void    call_fabric_post_trainadv( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_host_startPRD_pbus( void    *io_pArgs );
+void*    call_host_startPRD_pbus( void    *io_pArgs );
 
 
 
@@ -198,10 +198,10 @@ void    call_host_startPRD_pbus( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_host_attnlisten_proc( void    *io_pArgs );
+void*    call_host_attnlisten_proc( void    *io_pArgs );
 
 
 
@@ -212,10 +212,10 @@ void    call_host_attnlisten_proc( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any errlogs to istep 
  *
  */
-void    call_proc_fab_iovalid( void    *io_pArgs );
+void*    call_proc_fab_iovalid( void    *io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C
index 21c7e55f8..b6c2b8b76 100644
--- a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C
+++ b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C
@@ -70,7 +70,7 @@ using   namespace   fapi;
 //  Wrapper function to call 18.8 :
 //      host_coalesce_host
 //
-void    call_host_coalesce_host( void    *io_pArgs )
+void*    call_host_coalesce_host( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -114,7 +114,7 @@ void    call_host_coalesce_host( void    *io_pArgs )
                "call_host_coalesce_host exit" );
 
     // end task, returning any errorlogs to IStepDisp 
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H
index dd7be6183..db290f4c1 100644
--- a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H
+++ b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H
@@ -72,10 +72,10 @@ namespace   ESTABLISH_SYSTEM_SMP
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return any errlogs to istep
  *
  */
-void    call_host_coalesce_host( void    *io_pArgs );
+void*    call_host_coalesce_host( void    *io_pArgs );
 
 
 
diff --git a/src/usr/hwpf/hwp/mc_config/mc_config.C b/src/usr/hwpf/hwp/mc_config/mc_config.C
index f58635ca5..d1cb61c14 100644
--- a/src/usr/hwpf/hwp/mc_config/mc_config.C
+++ b/src/usr/hwpf/hwp/mc_config/mc_config.C
@@ -80,7 +80,7 @@ using   namespace   fapi;
 //
 //  Wrapper function to call 12.1 : host_collect_dimm_spd
 //
-void    call_host_collect_dimm_spd( void *io_pArgs )
+void*    call_host_collect_dimm_spd( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -132,7 +132,7 @@ void    call_host_collect_dimm_spd( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_collect_dimm_spd exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -140,7 +140,7 @@ void    call_host_collect_dimm_spd( void *io_pArgs )
 //
 //  Wrapper function to call 12.2 : mss_volt
 //
-void    call_mss_volt( void *io_pArgs )
+void*    call_mss_volt( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -193,13 +193,13 @@ void    call_mss_volt( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_volt exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 //
 //  Wrapper function to call 12.3 : mss_freq
 //
-void    call_mss_freq( void *io_pArgs )
+void*    call_mss_freq( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -246,7 +246,7 @@ void    call_mss_freq( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_freq exit" );
 
-    task_end2( NULL );
+    return l_err;
 }
 
 errlHndl_t call_mss_eff_grouping()
@@ -319,7 +319,7 @@ errlHndl_t call_mss_eff_grouping()
 //
 //  Wrapper function to call 12.4 : mss_eff_config
 //
-void    call_mss_eff_config( void *io_pArgs )
+void*    call_mss_eff_config( void *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -381,7 +381,7 @@ void    call_mss_eff_config( void *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_eff_config exit" );
 
-    task_end2( NULL );
+    return l_err;
 }
 
 
diff --git a/src/usr/hwpf/hwp/mc_config/mc_config.H b/src/usr/hwpf/hwp/mc_config/mc_config.H
index 122c210c1..5108eb706 100644
--- a/src/usr/hwpf/hwp/mc_config/mc_config.H
+++ b/src/usr/hwpf/hwp/mc_config/mc_config.H
@@ -88,10 +88,10 @@ namespace   MC_CONFIG
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_collect_dimm_spd( void * io_pArgs );
+void*    call_host_collect_dimm_spd( void * io_pArgs );
 
 
 
@@ -102,10 +102,10 @@ void    call_host_collect_dimm_spd( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_mss_volt( void * io_pArgs );
+void*    call_mss_volt( void * io_pArgs );
 
 
 
@@ -116,10 +116,10 @@ void    call_mss_volt( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_mss_freq( void * io_pArgs );
+void*    call_mss_freq( void * io_pArgs );
 
 
 
@@ -130,10 +130,10 @@ void    call_mss_freq( void * io_pArgs );
  *
  *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
  *                              or NULL.
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_mss_eff_config( void * io_pArgs );
+void*    call_mss_eff_config( void * io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C
index 59aaa21ae..24f877902 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C
@@ -77,7 +77,7 @@ using   namespace   fapi;
 //  Wrapper function to call 07.1 :
 //      proc_a_x_pci_dmi_pll_setup
 //
-void    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs )
+void*    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs )
 {
     errlHndl_t l_err = NULL;
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_a_x_pci_dmi_pll_setup entry" );
@@ -89,7 +89,7 @@ void    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs )
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                             "WARNING: proc_a_x_pci_dmi_pll_setup HWP is disabled in SIMICS run!");
         // end task
-        task_end2( l_err );
+        return  l_err ;
     }
 
     uint8_t l_cpuNum = 0;
@@ -156,7 +156,7 @@ void    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_a_x_pci_dmi_pll_setup exit" );
 
     // end task, returning any errorlogs to IStepDisp 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -165,7 +165,7 @@ void    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs )
 //  Wrapper function to call 07.2 :
 //      proc_startclock_chiplets
 //
-void    call_proc_startclock_chiplets( void    *io_pArgs )
+void*    call_proc_startclock_chiplets( void    *io_pArgs )
 {
     errlHndl_t l_err =   NULL;
 
@@ -212,7 +212,7 @@ void    call_proc_startclock_chiplets( void    *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_startclock_chiplets exit" );
 
     // end task, returning any errorlogs to IStepDisp 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -220,7 +220,7 @@ void    call_proc_startclock_chiplets( void    *io_pArgs )
 //  Wrapper function to call 07.3 :
 //      proc_chiplet_scominit
 //
-void    call_proc_chiplet_scominit( void    *io_pArgs )
+void*    call_proc_chiplet_scominit( void    *io_pArgs )
 {
     errlHndl_t l_err = NULL;
 
@@ -230,7 +230,7 @@ void    call_proc_chiplet_scominit( void    *io_pArgs )
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_chiplet_scominit exit" );
 
-    task_end2( l_err );
+    return l_err;
 }
 
 
@@ -238,7 +238,7 @@ void    call_proc_chiplet_scominit( void    *io_pArgs )
 //  Wrapper function to call 07.4 :
 //      proc_pcie_scominit
 //
-void    call_proc_pcie_scominit( void    *io_pArgs )
+void*    call_proc_pcie_scominit( void    *io_pArgs )
 {
     errlHndl_t          l_errl      =   NULL;  
 
@@ -292,7 +292,7 @@ void    call_proc_pcie_scominit( void    *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_pcie_scominit exit" );
 
     // end task, returning any errorlogs to IStepDisp 
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
@@ -301,7 +301,7 @@ void    call_proc_pcie_scominit( void    *io_pArgs )
 //  Wrapper function to call 07.5 :
 //      proc_scomoverride_chiplets
 //
-void    call_proc_scomoverride_chiplets( void    *io_pArgs )
+void*    call_proc_scomoverride_chiplets( void    *io_pArgs )
 {
     errlHndl_t          l_errl      =   NULL;  
 
@@ -323,7 +323,7 @@ void    call_proc_scomoverride_chiplets( void    *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_scomoverride_chiplets exit" );
 
     // end task, returning any errorlogs to IStepDisp 
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H
index def6c640e..915a23f0d 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H
+++ b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H
@@ -96,10 +96,10 @@ namespace   NEST_CHIPLETS
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *                    
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs );
+void*    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs );
 
 
 
@@ -110,10 +110,10 @@ void    call_proc_a_x_pci_dmi_pll_setup( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *                    
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_startclock_chiplets( void    *io_pArgs );
+void*    call_proc_startclock_chiplets( void    *io_pArgs );
 
 
 
@@ -124,10 +124,10 @@ void    call_proc_startclock_chiplets( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *                    
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_chiplet_scominit( void    *io_pArgs );
+void*    call_proc_chiplet_scominit( void    *io_pArgs );
 
 
 
@@ -138,10 +138,10 @@ void    call_proc_chiplet_scominit( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_pcie_scominit( void    *io_pArgs );
+void*    call_proc_pcie_scominit( void    *io_pArgs );
 
 
 
@@ -152,10 +152,10 @@ void    call_proc_pcie_scominit( void    *io_pArgs );
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *                    
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_proc_scomoverride_chiplets( void    *io_pArgs );
+void*    call_proc_scomoverride_chiplets( void    *io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C
index 1647fb039..140bfddd6 100644
--- a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C
+++ b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C
@@ -70,7 +70,7 @@ using   namespace   vsbe;
 //
 //  Wrapper function to call step 10 : sbe_centaur_init
 //
-void    call_sbe_centaur_init( void *io_pArgs )
+void*    call_sbe_centaur_init( void *io_pArgs )
 {
 
     TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
@@ -234,7 +234,7 @@ void    call_sbe_centaur_init( void *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                "call_sbe_centaur_init exit" );
 
-    task_end2( l_errl );
+    return l_errl;
 }
 
 };   // end namespace
diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H
index d4fbd19cc..e5e1de483 100644
--- a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H
+++ b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H
@@ -63,10 +63,10 @@ namespace   SBE_CENTAUR_INIT
      *
      *  param[in,out] io_pArgs  -   (normally) a pointer to args,
      *                              or NULL.
-     *  return  none
+     *  return  any errlors to istep
      *
      */
-    void    call_sbe_centaur_init( void * io_pArgs );
+    void*    call_sbe_centaur_init( void * io_pArgs );
 
 };   // end namespace
 
diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C
index 275abd8a3..3ec5bd2b0 100644
--- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C
+++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C
@@ -57,7 +57,7 @@ namespace SLAVE_SBE
 //  Wrapper function to call 6.8 :
 //      proc_revert_sbe_mcs_setup
 //
-void call_proc_revert_sbe_mcs_setup(void *io_pArgs)
+void* call_proc_revert_sbe_mcs_setup(void *io_pArgs)
 {
     errlHndl_t  l_errl = NULL;
 
@@ -87,7 +87,7 @@ void call_proc_revert_sbe_mcs_setup(void *io_pArgs)
               "call_proc_revert_sbe_mcs_setup exit");
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2(l_errl);
+    return l_errl;
 }
 
 }
diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H
index 80817ed00..cf2433380 100644
--- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H
+++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H
@@ -65,9 +65,9 @@ namespace SLAVE_SBE
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return none
+ *  return any error logs to istep 
  */
-void call_proc_revert_sbe_mcs_setup(void *io_pArgs);
+void* call_proc_revert_sbe_mcs_setup(void *io_pArgs);
 
 };   // end namespace
 
diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C
index c1e9327e9..fe6c351b7 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.C
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.C
@@ -103,7 +103,7 @@ errlHndl_t notifyFsp ( bool i_istepModeFlag,
 //  Wrapper function to call 21.1 :
 //      host_start_payload
 //
-void    call_host_start_payload( void    *io_pArgs )
+void*    call_host_start_payload( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
 
@@ -170,7 +170,7 @@ void    call_host_start_payload( void    *io_pArgs )
                "call_host_start_payload exit" );
 
     // end task, returning any errorlogs to IStepDisp
-    task_end2( l_errl );
+    return l_errl;
 }
 
 
diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.H b/src/usr/hwpf/hwp/start_payload/start_payload.H
index 589fd19a3..b4f620842 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.H
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.H
@@ -68,10 +68,10 @@ namespace   START_PAYLOAD
  *
  *  param[in,out]   -   pointer to any arguments, usually NULL
  *
- *  return  none
+ *  return  any error logs to istep
  *
  */
-void    call_host_start_payload( void    *io_pArgs );
+void*    call_host_start_payload( void    *io_pArgs );
 
 
 };   // end namespace
diff --git a/src/usr/hwpf/plat/fapiPlatTask.C b/src/usr/hwpf/plat/fapiPlatTask.C
index dfab334a9..c5cade74b 100644
--- a/src/usr/hwpf/plat/fapiPlatTask.C
+++ b/src/usr/hwpf/plat/fapiPlatTask.C
@@ -54,7 +54,7 @@ void platTaskEntry(errlHndl_t &io_errl)
 {
     FAPI_IMP("Starting platTaskEntry");
     g_attrOverride.iv_overrideVal = 0;
-    task_end();
+    io_errl=NULL;
 }
 
 // Macro that creates the _start function
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index bfbc4636f..88c25039f 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -68,7 +68,7 @@ static const uint32_t MAX_TEST_COUNT    = 0x000001FF;
  * @brief repeated Scom access and Attrubute access through Fapi until
  *        MAX_TEST_COUNT accesses has been done or an error occurs.
  */
-void testHwpScomAcc( void *i_phwpTestArgs )
+void* testHwpScomAcc( void *i_phwpTestArgs )
 {
     fapi::ReturnCode l_rc = fapi::FAPI_RC_SUCCESS;
     ecmdDataBufferBase l_ScomData(64);
@@ -145,6 +145,7 @@ void testHwpScomAcc( void *i_phwpTestArgs )
             }
         }
     }
+    return NULL;
 }
 
 class HwpfTest: public CxxTest::TestSuite