Initservice: Eliminate task specific module ids

Change-Id: Id01a11505b3a720c646de7ef8e8663c1478615ce
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/772
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Bradley W. Bishop <bradleyb@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 2 insertions, 33 deletions

diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C
index ed4191e87..532d899d6 100644
--- a/src/usr/initservice/baseinitsvc/initservice.C
+++ b/src/usr/initservice/baseinitsvc/initservice.C
@@ -100,8 +100,7 @@ errlHndl_t InitService::startTask( const TaskInfo       *i_ptask,
              *  @errortype      ERRL_SEV_CRITICAL_SYS_TERM
              *  @moduleid       INITSVC_START_TASK_MOD_ID
              *  @reasoncode     START_TASK_FAILED
-             *  @userdata1      task module id
-             *  @userdata2      task id or task return code
+             *  @userdata1      task return code
              *
              *  @devdesc        Initialization Service failed to start a task.
              *
@@ -110,7 +109,6 @@ errlHndl_t InitService::startTask( const TaskInfo       *i_ptask,
                     ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM,
                     INITSERVICE::INITSVC_START_TASK_MOD_ID,
                     INITSERVICE::START_TASK_FAILED,
-                    i_ptask->taskflags.module_id,
                     l_tidrc );
 
             // Add the task name as user detail data
@@ -157,8 +155,7 @@ errlHndl_t InitService::executeFn( const TaskInfo   *i_ptask,
          *  @errortype      ERRL_SEV_CRITICAL_SYS_TERM
          *  @moduleid       INITSVC_START_FN_MOD_ID
          *  @reasoncode     START_FN_FAILED
-         *  @userdata1      task module id
-         *  @userdata2      task id or task return code
+         *  @userdata1      task return code
          *
          *  @devdesc        Initialization Service attempted to start a
          *                  function within a module but the function
@@ -168,7 +165,6 @@ errlHndl_t InitService::executeFn( const TaskInfo   *i_ptask,
                 ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM,
                 INITSERVICE::INITSVC_START_FN_MOD_ID,
                 INITSERVICE::START_FN_FAILED,
-                i_ptask->taskflags.module_id,
                 l_tidrc );
 
         // Add the task name as user detail data
diff --git a/src/usr/initservice/baseinitsvc/initsvctasks.H b/src/usr/initservice/baseinitsvc/initsvctasks.H
index 26e78d6f5..69b146c92 100644
--- a/src/usr/initservice/baseinitsvc/initsvctasks.H
+++ b/src/usr/initservice/baseinitsvc/initsvctasks.H
@@ -49,8 +49,6 @@ const TaskInfo    g_taskinfolist[]   =   {
                 {
                         NONE,                       // don't start
                         BASE_IMAGE,                 // Base Module
-                        START_ERRL_ERRL_ID,         // module id for errorlog
-
                 }
         },
 
@@ -64,7 +62,6 @@ const TaskInfo    g_taskinfolist[]   =   {
                 {
                         START_TASK,                 // start
                         BASE_IMAGE,                 // Base Module
-                        START_PNORDD_ERRL_ID,       // module id for errorlog
                 }
         },
 
@@ -77,7 +74,6 @@ const TaskInfo    g_taskinfolist[]   =   {
                 {
                         START_TASK,                 // start task
                         BASE_IMAGE,                 // Base Module
-                        START_VFS_ERRL_ID,          // module id for error log
                 }
         },
 
@@ -92,7 +88,6 @@ const TaskInfo    g_taskinfolist[]   =   {
                 {
                         START_TASK,                 // call start()
                         EXT_IMAGE,                  // EXT_IMAGE
-                        START_EXTINITSVC_ERRL_ID,   // module id for errorlog
                 }
         },
 
@@ -110,7 +105,6 @@ const TaskInfo    g_taskinfolist[]   =   {
                 {
                         END_TASK_LIST,              // end of list
                         UNDEFINED_MT,               // dummy module type
-                        UNDEFINED_MODULE_ERRL_ID,   // dummy errorlog
                 }
         },
 
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H
index 1360c9d5d..3f8960d1f 100644
--- a/src/usr/initservice/extinitsvc/extinitsvctasks.H
+++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H
@@ -51,7 +51,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 INIT_TASK,                         // init only
                 EXT_IMAGE,                         // extended image module
-                START_UTIL_ERRL_ID,                // error module id
             }
         },
 
@@ -64,7 +63,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 START_TASK,                         // task type
                 EXT_IMAGE,                          // Extended Module
-                START_TARGETING_ERRL_ID,            // module id
             }
         },
 
@@ -77,7 +75,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 START_TASK,                             // task type
                 EXT_IMAGE,                              // Extended Module
-                START_INTR_ERRL_ID,                     // module id
             }
         },
 
@@ -91,7 +88,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 INIT_TASK,                          // task type
                 EXT_IMAGE,                          // Extended Module
-                START_FSIDD_ERRL_ID,                // module id
             }
         },
 
@@ -104,7 +100,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 {
                         INIT_TASK,                          // task type
                         EXT_IMAGE,                          // Extended Module
-                        START_FSISCOM_ERRL_ID,              // module id
                 }
         },
 
@@ -117,7 +112,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 INIT_TASK,                      // task type
                 EXT_IMAGE,                      // Extended Module
-                START_I2C_ERRL_ID,              // module id
             }
         },
 
@@ -130,7 +124,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 INIT_TASK,                                  // task type
                 EXT_IMAGE,                                  // Extended module
-                START_SPD_ERRL_ID                           // module id
             }
         },
 
@@ -149,7 +142,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 INIT_TASK,                                  // task type
                 EXT_IMAGE,                                  // Extended Module
-                EXECUTE_ISTEPS_ERRL_ID,                     // module id
             }
         },
 // end TODO
@@ -163,7 +155,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 {
                         INIT_TASK,                          // task type
                         EXT_IMAGE,                          // Extended Module
-                        START_ECMDDATABUFFER_ERRL_ID,       // module id
                 }
         },
 
@@ -176,7 +167,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 {
                         INIT_TASK,                          // task type
                         EXT_IMAGE,                          // Extended Module
-                        START_FAPI_ERRL_ID,                 // module id
                 }
         },
 
@@ -189,7 +179,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 {
                         INIT_TASK,                          // task type
                         EXT_IMAGE,                          // Extended Module
-                        START_HWP_ERRL_ID,                  // module id
                 }
         },
 
@@ -202,7 +191,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 {
                         INIT_TASK,                          // task type
                         EXT_IMAGE,                          // Extended Module
-                        START_PLAT_ERRL_ID,                 // module id
                 }
         },
 
@@ -216,7 +204,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 INIT_TASK,                         // task type
                 EXT_IMAGE,                         // Extended Module
-                START_FAPIPOREVE_ERRL_ID           // module id
             }
         },
 
@@ -229,7 +216,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                INIT_TASK,                         // task type
                EXT_IMAGE,                         // Extended Module
-               START_POREVE_ERRL_ID               // module id
             }
         },
 
@@ -242,7 +228,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                INIT_TASK,                         // task type
                EXT_IMAGE,                         // Extended Module
-               START_MDIA_ERRL_ID                 // module id
             }
         },
 
@@ -262,7 +247,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
             {
                 START_TASK,                                 // task type
                 EXT_IMAGE,                                  // Extended Module
-                EXECUTE_ISTEPS_ERRL_ID,                     // module id
             }
         },
         // NOTE: libistepdisp.so needs to always be last in this list!!
@@ -280,7 +264,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 {
                         END_TASK_LIST,                      // end of list
                         UNDEFINED_MT,                       // dummy module type
-                        UNDEFINED_MODULE_ERRL_ID,           // dummy errorlog
                 }
         },
 
@@ -295,7 +278,6 @@ const   TaskInfo    CXXTEST_TASK    =   {
                 {
                         START_TASK,                         // task type
                         EXT_IMAGE,                          // Extended Module
-                        START_CXXTEST_ERRL_ID,              // module id
                 }
         };
 
diff --git a/src/usr/initservice/test/initservicetest.H b/src/usr/initservice/test/initservicetest.H
index f1494d5ec..bfb751954 100644
--- a/src/usr/initservice/test/initservicetest.H
+++ b/src/usr/initservice/test/initservicetest.H
@@ -48,7 +48,6 @@ const   INITSERVICE::TaskInfo    TASK_TEST1  =  {
         {
                 INITSERVICE::START_TASK,                // startflag=true, try to start
                 INITSERVICE::BASE_IMAGE,                // Base Module
-                INITSERVICE::INIT_SVC_TEST1_ERRL_ID,    // module id for errorlog
         },
 };
 
@@ -64,7 +63,6 @@ const   INITSERVICE::TaskInfo    TASK_TEST2  =  {
         {
                 INITSERVICE::START_TASK,                // startflag=true, try to start
                 INITSERVICE::EXT_IMAGE,                 // Ext Inmage Module
-                INITSERVICE::INIT_SVC_TEST2_ERRL_ID,    // module id for errorlog
         },
 };
 
@@ -81,7 +79,6 @@ const   INITSERVICE::TaskInfo    TASK_TEST3  =  {
         {
                 INITSERVICE::START_TASK,                // startflag=true, try to start
                 INITSERVICE::BASE_IMAGE,                // Base Module
-                INITSERVICE::INIT_SVC_TEST3_ERRL_ID,    // module id for errorlog
         },
 };