Move testHWP to the last substep of HWAS (ISTEP 4)

- fix istep numbering, thanks Dan
- remove src/usr/isteps dir

Change-Id: I9420b7bddf6f9237045cecf888f01b37afa2df0e
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/459
Tested-by: Jenkins Server
Reviewed-by: CAMVAN T. NGUYEN <ctnguyen@us.ibm.com>

4 files changed, 21 insertions, 1 deletions

diff --git a/src/include/usr/hwas/hwas.H b/src/include/usr/hwas/hwas.H
index b053bc843..883de2dd0 100644
--- a/src/include/usr/hwas/hwas.H
+++ b/src/include/usr/hwas/hwas.H
@@ -132,6 +132,15 @@ namespace   HWAS
      */
     void    apply_gard( void *io_pArgs );
 
+    /**
+     * @brief   testHWP
+     *
+     * test Hardware procedure.  Althought this is called a test, we want it
+     * to run even in non-test builds.  Thus it is added here at the end of
+     * HWAS inititialization.
+     */
+    void    testHWP( void * io_pArgs );
+
 
 };   // end namespace
 
diff --git a/src/include/usr/initservice/initsvcreasoncodes.H b/src/include/usr/initservice/initsvcreasoncodes.H
index 52c58d669..1f13850ea 100644
--- a/src/include/usr/initservice/initsvcreasoncodes.H
+++ b/src/include/usr/initservice/initsvcreasoncodes.H
@@ -93,6 +93,7 @@ enum    InitServiceModuleID
     HWAS_6_ERRL_ID,
     HWAS_7_ERRL_ID,
     HWAS_8_ERRL_ID,
+    HWAS_9_ERRL_ID,
 
     //  reserve some tasks for my unit tests...
     START_CXXTEST_ERRL_ID       =   0xf0,
diff --git a/src/include/usr/isteps/istep4list.H b/src/include/usr/isteps/istep4list.H
index bae45fc18..f520452ec 100644
--- a/src/include/usr/isteps/istep4list.H
+++ b/src/include/usr/isteps/istep4list.H
@@ -121,6 +121,15 @@ const   TaskInfo    g_istep4[]  =   {
                         EXT_IMAGE,                      // Extended Module
                         HWAS_8_ERRL_ID,                 // module id
                 }
+        },
+        {
+                "testHWP" ,                  // substep name
+                HWAS::testHWP,                       // pointer to fn
+                {
+                        START_FN,                       // task type
+                        EXT_IMAGE,                      // Extended Module
+                        HWAS_9_ERRL_ID,                 // module id
+                }
         }
 
         //  END OF LIST!
diff --git a/src/include/usr/isteps/istepmasterlist.H b/src/include/usr/isteps/istepmasterlist.H
index ebdad717d..d0123d6ca 100644
--- a/src/include/usr/isteps/istepmasterlist.H
+++ b/src/include/usr/isteps/istepmasterlist.H
@@ -62,10 +62,11 @@ namespace   INITSERVICE
 
 // initialize an array of ExtTaskInfo
 const  ExtTaskInfo  g_isteps[]    =   {
+        { NULL, 0 },                                //  dummy IStep 0
         { NULL, 0 },                                //  dummy IStep 1
         { NULL, 0 },                                //  dummy IStep 2
         { NULL, 0 },                                //  dummy IStep 3
-        INITSERVICE::g_istep4TaskList,              //  HWAS
+        INITSERVICE::g_istep4TaskList,              //  HWAS  IStep 4
 
         //
         // add further istep lists at the end.