diff options
-rw-r--r-- | src/makefile | 6 | ||||
-rw-r--r-- | src/usr/initservice/baseinitsvc/initsvctasks.H | 48 | ||||
-rw-r--r-- | src/usr/initservice/extinitsvc/extinitsvctasks.H | 113 |
3 files changed, 88 insertions, 79 deletions
diff --git a/src/makefile b/src/makefile index fd59896b2..322496a98 100644 --- a/src/makefile +++ b/src/makefile @@ -45,10 +45,10 @@ DIRECT_BOOT_OBJECTS = start.o kernel.o taskmgr.o cpumgr.o syscall.o \ RUNTIME_OBJECTS = BASE_MODULES = trace errl devicefw scom xscom initservice taskargs \ - pnor i2c fsi vfs + pnor i2c vfs -EXTENDED_MODULES = targeting ecmddatabuffer fapi hwp plat \ - extinitsvc istepdisp hwas fsiscom +EXTENDED_MODULES = targeting ecmddatabuffer fapi hwp plat \ + extinitsvc istepdisp hwas fsi fsiscom DIRECT_BOOT_MODULES = example RUNTIME_MODULES = diff --git a/src/usr/initservice/baseinitsvc/initsvctasks.H b/src/usr/initservice/baseinitsvc/initsvctasks.H index 6fa02022b..26e78d6f5 100644 --- a/src/usr/initservice/baseinitsvc/initsvctasks.H +++ b/src/usr/initservice/baseinitsvc/initsvctasks.H @@ -44,12 +44,12 @@ const TaskInfo g_taskinfolist[] = { * @brief Errorlog Task */ { - "liberrl.so" , // taskname - NULL, // no ptr to fn + "liberrl.so" , // taskname + NULL, // no ptr to fn { - NONE, // don't start - BASE_IMAGE, // Base Module - START_ERRL_ERRL_ID, // module id for errorlog + NONE, // don't start + BASE_IMAGE, // Base Module + START_ERRL_ERRL_ID, // module id for errorlog } }, @@ -59,12 +59,12 @@ const TaskInfo g_taskinfolist[] = { * @brief PNOR Driver Task */ { - "libpnor.so" , // taskname - NULL, // no pointer to fn + "libpnor.so" , // taskname + NULL, // no pointer to fn { - START_TASK, // start - BASE_IMAGE, // Base Module - START_PNORDD_ERRL_ID, // module id for errorlog + START_TASK, // start + BASE_IMAGE, // Base Module + START_PNORDD_ERRL_ID, // module id for errorlog } }, @@ -72,12 +72,12 @@ const TaskInfo g_taskinfolist[] = { * @brief Extended VFS module */ { - "libvfs.so", // taskname + "libvfs.so", // taskname NULL, { - START_TASK, // start task - BASE_IMAGE, // Base Module - START_VFS_ERRL_ID, // module id for error log + START_TASK, // start task + BASE_IMAGE, // Base Module + START_VFS_ERRL_ID, // module id for error log } }, @@ -87,12 +87,12 @@ const TaskInfo g_taskinfolist[] = { * @brief extinitsvc, initializes extended module area */ { - "libextinitsvc.so" , // taskname - NULL, // no pointer to fn + "libextinitsvc.so" , // taskname + NULL, // no pointer to fn { - START_TASK, // call start() - EXT_IMAGE, // EXT_IMAGE - START_EXTINITSVC_ERRL_ID, // module id for errorlog + START_TASK, // call start() + EXT_IMAGE, // EXT_IMAGE + START_EXTINITSVC_ERRL_ID, // module id for errorlog } }, @@ -105,12 +105,12 @@ const TaskInfo g_taskinfolist[] = { * @brief last task in the list */ { - "end" , // dummy string - NULL, // pointer to fn + "end" , // dummy string + NULL, // pointer to fn { - END_TASK_LIST, // end of list - UNDEFINED_MT, // dummy module type - UNDEFINED_MODULE_ERRL_ID, // dummy errorlog + 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 2ca99207f..1cf6e3026 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -43,7 +43,7 @@ const TaskInfo g_exttaskinfolist[] = { // ----- Extended Image ------------------------------------------ /** - * @brief ecmddatabuffer task, + * @brief ecmddatabuffer task, */ { "libecmddatabuffer.so" , // taskname @@ -56,7 +56,21 @@ const TaskInfo g_exttaskinfolist[] = { }, /** - * @brief fapi task, + * @brief targeting task, + * + */ + { + "libtargeting.so" , // taskname + NULL, // no pointer to fn + { + START_TASK, // task type + EXT_IMAGE, // Extended Module + START_TARGETING_ERRL_ID, // module id + } + }, + + /** + * @brief fapi task, */ { "libfapi.so" , // taskname @@ -67,9 +81,9 @@ const TaskInfo g_exttaskinfolist[] = { START_FAPI_ERRL_ID, // module id } }, - + /** - * @brief hwp task, + * @brief hwp task, */ { "libhwp.so" , // taskname @@ -80,9 +94,9 @@ const TaskInfo g_exttaskinfolist[] = { START_HWP_ERRL_ID, // module id } }, - + /** - * @brief plat task, + * @brief plat task, */ { "libplat.so" , // taskname @@ -97,17 +111,17 @@ const TaskInfo g_exttaskinfolist[] = { // TODO: Added this in order to successfull init.. Need to remove this and put // the module load and unload from a the istep dispatcher /** - * @brief HWAS, + * @brief HWAS, */ { - "libhwas.so" , // taskname - NULL, // no pointer to fn + "libhwas.so" , // taskname + NULL, // no pointer to fn { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - EXECUTE_ISTEPS_ERRL_ID, // module id + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + EXECUTE_ISTEPS_ERRL_ID, // module id } }, // end TODO @@ -115,56 +129,50 @@ const TaskInfo g_exttaskinfolist[] = { /** * @brief FSI Device Driver */ - { - "libfsi.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - START_FSIDD_ERRL_ID, // module id - } - }, - /** - * @brief FSI Device Driver - */ { - "libfsiscom.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - START_FSISCOM_ERRL_ID, // module id - } + "libfsi.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + START_FSIDD_ERRL_ID, // module id + } }, /** - * @brief targeting task, + * @brief FSI SCOM Device Driver */ { - "libtargeting.so" , // taskname - NULL, // no pointer to fn - { - START_TASK, // task type - EXT_IMAGE, // Extended Module - START_TARGETING_ERRL_ID, // module id - } + "libfsiscom.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + START_FSISCOM_ERRL_ID, // module id + } }, + + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // NOTE: libistepdisp.so needs to always be last in this list!! + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! /** * @brief IStep Dispatcher task, runs ISteps + * + * */ { - "libistepdisp.so" , // taskname - NULL, // no pointer to fn + "libistepdisp.so" , // taskname + NULL, // no pointer to fn { - START_TASK, // task type - EXT_IMAGE, // Extended Module - EXECUTE_ISTEPS_ERRL_ID, // module id + 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!! - + + // --------------------------------------------------------------- // ----- END OF LIST!!! --------------------------------------- // --------------------------------------------------------------- @@ -173,19 +181,20 @@ const TaskInfo g_exttaskinfolist[] = { * @brief last task in the list */ { - "end" , // dummy string - NULL, // pointer to fn + "end" , // dummy string + NULL, // pointer to fn { - END_TASK_LIST, // end of list - UNDEFINED_MT, // dummy module type - UNDEFINED_MODULE_ERRL_ID, // dummy errorlog + END_TASK_LIST, // end of list + UNDEFINED_MT, // dummy module type + UNDEFINED_MODULE_ERRL_ID, // dummy errorlog } }, }; - +// ------------------------------------------------------------------------- // ----- UNIT TESTS ------------------------------------------------- +// ------------------------------------------------------------------------- const TaskInfo CXXTEST_TASK = { "libcxxtest.so" , // taskname NULL, // no pointer to fn |