RTC3872: Hardware Availability Service: Add HWAS as first ISTEP

- first commit
- change isteplist to call hwas
- comment out test isteps
- modify xml to add HWAS_STATE attribute
- add macros to taskargs
- remove debug trace from taskargs
- add call to init_fsi
- post-review
- merge xml files
- forgot one printkd

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

4 files changed, 29 insertions, 21 deletions

diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C
index e26da0a8c..a51e909ed 100644
--- a/src/usr/initservice/baseinitsvc/initservice.C
+++ b/src/usr/initservice/baseinitsvc/initservice.C
@@ -45,7 +45,7 @@ namespace   INITSERVICE
 {
 
 trace_desc_t *g_trac_initsvc = NULL;
-TRAC_INIT(&g_trac_initsvc, "INITSERVICE", 4096 );
+TRAC_INIT(&g_trac_initsvc, "INITSVC", 4096 );
 
 
 errlHndl_t InitService::startTask( const TaskInfo       *i_ptask,
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index 42e66ab0c..addc6f071 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -44,12 +44,14 @@
 #include    <errl/errlentry.H>              //  errlHndl_t
 #include    <devicefw/userif.H>             //  targeting
 #include    <sys/mmio.h>                    //  mmio_scratch_read()
+#include    <initservice/taskargs.H>        //  TaskArgs    structs
+
 
 #include    "istepdispatcher.H"
 
 #include    "splesscommon.H"
 
-#include    <isteps/isteplist.H>
+#include    <isteps/istepmasterlist.H>
 
 
 namespace   INITSERVICE
@@ -100,15 +102,26 @@ const TaskInfo *IStepDispatcher::findTaskInfo( const uint16_t i_IStep,
 {
     const TaskInfo      *l_pistep       =   NULL;
 
-    TRACDCOMP( g_trac_initsvc,
-               "g_isteps[%d].numitems = 0x%x",
-               i_IStep,
-               g_isteps[i_IStep].numitems );
 
     //  apply filters
     do
     {
 
+        //  Sanity check / dummy IStep
+        if ( g_isteps[i_IStep].pti == NULL)
+        {
+            TRACDCOMP( g_trac_initsvc,
+                       "g_isteps[%d].pti == NULL",
+                       i_IStep );
+            break;
+        }
+
+        TRACDCOMP( g_trac_initsvc,
+                   "g_isteps[%d].numitems = 0x%x",
+                   i_IStep,
+                   g_isteps[i_IStep].numitems );
+
+
         // check input range - IStep
         if  (   i_IStep >= MAX_ISTEPS   )
         {
@@ -445,7 +458,7 @@ void    IStepDispatcher::runAllISteps( void * io_ptr )   const
             {
 
                 TRACDCOMP( g_trac_initsvc,
-                           "End of ISubStep list." );
+                           "End of ISubStep 0x%x list.", l_SubStep );
                 break;  // break out of inner for loop
             }
 
@@ -457,9 +470,10 @@ void    IStepDispatcher::runAllISteps( void * io_ptr )   const
             l_args.clear();
 
             TRACFCOMP( g_trac_initsvc,
-                       "Run IStep 0x%x / Substep 0x%x",
+                       INFO_MRK "Run IStep 0x%x / Substep 0x%x %s",
                        l_IStep,
-                       l_SubStep );
+                       l_SubStep,
+                       l_pistep->taskname );
 
             l_errl = InitService::getTheInstance().executeFn( l_pistep,
                                                               &l_args );
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.H b/src/usr/initservice/istepdispatcher/istepdispatcher.H
index 352b0f450..b507cbe21 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.H
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.H
@@ -30,6 +30,12 @@
  *
  */
 
+/**
+ * @page    IStepDispatcher IStep Dispatcher
+ *
+ *
+ */
+
 
 /******************************************************************************/
 // Includes
diff --git a/src/usr/initservice/taskargs/taskargs.C b/src/usr/initservice/taskargs/taskargs.C
index ecb4cd88c..186bb93c6 100644
--- a/src/usr/initservice/taskargs/taskargs.C
+++ b/src/usr/initservice/taskargs/taskargs.C
@@ -60,28 +60,16 @@ extern  trace_desc_t *g_trac_initsvc;
 void    TaskArgs::waitParentSync( )
 {
 
-    TRACDCOMP( g_trac_initsvc,
-            "Parent: wait for barrier %p", &iv_sync_barrier );
-
     barrier_wait( &iv_sync_barrier);
 
-    TRACDCOMP( g_trac_initsvc,
-            "Parent: returned from barrier %p", &iv_sync_barrier );
-
 }
 
 
 void    TaskArgs::waitChildSync( )
 {
 
-    TRACDCOMP( g_trac_initsvc,
-            "Child: wait for barrier %p", &iv_sync_barrier );
-
     barrier_wait( &iv_sync_barrier);
 
-    TRACDCOMP( g_trac_initsvc,
-            "Child: returned from barrier %p", &iv_sync_barrier );
-
 }