diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2012-10-10 10:36:29 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-10-12 16:29:17 -0500 |
| commit | b201169eeae76a7697f4f207dd583d40a2f07f66 (patch) | |
| tree | a05fa3da99dddab0491623aebc1110e73d430bf7 /src | |
| parent | 3536e96bd3a1d490cec900617fab6703fb7798ea (diff) | |
| download | blackbird-hostboot-b201169eeae76a7697f4f207dd583d40a2f07f66.tar.gz blackbird-hostboot-b201169eeae76a7697f4f207dd583d40a2f07f66.zip | |
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>
Diffstat (limited to 'src')
84 files changed, 1199 insertions, 1184 deletions
diff --git a/src/build/tools/genIStep.pl b/src/build/tools/genIStep.pl index 9a3e7bc99..9e1c362b0 100755 --- a/src/build/tools/genIStep.pl +++ b/src/build/tools/genIStep.pl @@ -359,7 +359,7 @@ my $templateCFileSubStep = // Wrapper function to call \@istepnum.\@substepnum : // \@substepname // -void call_\@substepname( void *io_pArgs ) +void* call_\@substepname( void *io_pArgs ) { errlHndl_t l_errl = NULL; @@ -404,7 +404,7 @@ void call_\@substepname( void *io_pArgs ) \"call_\@substepname exit\" ); // end task, returning any errorlogs to IStepDisp - task_end2( l_errl ); + return l_errl ; } "; ##### end templateCFileSubStep ################################# diff --git a/src/include/kernel/idebug.H b/src/include/kernel/idebug.H index 584dacf80..f6ee69837 100644 --- a/src/include/kernel/idebug.H +++ b/src/include/kernel/idebug.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/kernel/idebug.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/kernel/idebug.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __KERNEL_IDEBUG_H #define __KERNEL_IDEBUG_H @@ -79,7 +79,7 @@ class InteractiveDebug /** @brief Entry point for 'task_create' of debug task. * @param[in] idebug - Pointer to this interactive-debug structure. */ - static void debugEntryPoint(void* idebug); + static void* debugEntryPoint(void* idebug); }; #endif diff --git a/src/include/kernel/taskmgr.H b/src/include/kernel/taskmgr.H index b38618d22..5af28efe5 100644 --- a/src/include/kernel/taskmgr.H +++ b/src/include/kernel/taskmgr.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/kernel/taskmgr.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2010 - 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/kernel/taskmgr.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __KERNEL_TASKMGR_H #define __KERNEL_TASKMGR_H @@ -108,7 +108,7 @@ class TaskManager static void setCurrentTask(task_t* t); /** Typedef for task entry points. */ - typedef void(*task_fn_t)(void*); + typedef void* (*task_fn_t)(void*); /** @brief Create a new task object. * @@ -158,7 +158,7 @@ class TaskManager tid_t getNextTid() { return iv_nextTid.next(); }; /** Run the idle task loop */ - static void idleTaskLoop(void*); + static void* idleTaskLoop(void*); // Internal implementations of non-static / non-_ functions. task_t* _createIdleTask(); diff --git a/src/include/sys/task.h b/src/include/sys/task.h index b86b6f4ec..0fbec617b 100644 --- a/src/include/sys/task.h +++ b/src/include/sys/task.h @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/sys/task.h $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2010 - 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/sys/task.h $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** @file task.h * @brief Contains the prototypes for system calls related to tasking. */ @@ -52,23 +52,27 @@ void task_yield(); * * See POSIX pthread_create. */ -tid_t task_create(void(*start_routine)(void*), void* arg); +tid_t task_create(void*(*start_routine)(void*), void* arg); /** @fn task_end * @brief End the calling task. * * See POSIX pthread_exit. * - * @note A task must call task_end when it wishes to exit. If a task were - * to simply return from its entry point function, the kernel sets up + * @note A task could call task_end when it wishes to exit. But it will likely + * cause a memory leak. It is better for a task to + * simply return from its entry point function, the kernel sets up * the initial task structure with the link-register pointing to this - * function. Therefore, returning from the entry point function will - * also cause the task to end cleanly using this function. + * function. The "NO_RETURN" does not call the destructors to clean up. + * Might be used in case of task needing to be terminated due to + * unknown cause. */ void task_end() NO_RETURN; /** @fn task_end2 * @brief End the calling task with a return value. + * Will likely cause a memory leak. Better to return the value on the + * return to the entry point. See comments on task_end. * * See POSIX pthread_exit. * diff --git a/src/include/usr/hwas/hostbootIstep.H b/src/include/usr/hwas/hostbootIstep.H index f770a0bfd..324eb4820 100644 --- a/src/include/usr/hwas/hostbootIstep.H +++ b/src/include/usr/hwas/hostbootIstep.H @@ -45,9 +45,9 @@ namespace HWAS * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any error logs to istep */ -void host_init_fsi( void *io_pArgs ); +void* host_init_fsi( void *io_pArgs ); /** * @brief host_set_ipl_parms Build ipl parameters @@ -56,9 +56,9 @@ void host_init_fsi( 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 host_set_ipl_parms( void *io_pArgs ); +void* host_set_ipl_parms( void *io_pArgs ); /** * @brief host_discover_targets Builds targeting @@ -73,9 +73,9 @@ void host_set_ipl_parms( 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 host_discover_targets( void *io_pArgs ); +void* host_discover_targets( void *io_pArgs ); /** * @brief host_gard Do Gard @@ -84,9 +84,9 @@ void host_discover_targets( 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 host_gard( void *io_pArgs ); +void* host_gard( void *io_pArgs ); /** * @brief host_cancontinue_clear Clear deconfigured status @@ -95,9 +95,9 @@ void host_gard( 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 host_cancontinue_clear( void *io_pArgs ); +void* host_cancontinue_clear( void *io_pArgs ); /** * @brief proc_check_slave_sbe_seeprom_complete Check Slave SBE Complete @@ -106,9 +106,9 @@ void host_cancontinue_clear( 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 proc_check_slave_sbe_seeprom_complete( void *io_pArgs ); +void* proc_check_slave_sbe_seeprom_complete( void *io_pArgs ); /** * @brief proc_xmit_sbe vSBE Init of Slave Chips @@ -117,9 +117,9 @@ void proc_check_slave_sbe_seeprom_complete( 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 proc_xmit_sbe( void *io_pArgs ); +void* proc_xmit_sbe( void *io_pArgs ); } // namespace HWAS #endif // HOSTBOOTISTEP_H_ diff --git a/src/include/usr/initservice/initsvcstructs.H b/src/include/usr/initservice/initsvcstructs.H index 7daaec28b..58038bc22 100644 --- a/src/include/usr/initservice/initsvcstructs.H +++ b/src/include/usr/initservice/initsvcstructs.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/initservice/common/initsvcstructs.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/initservice/initsvcstructs.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __COMMON_INITSVCSTRUCTS_H #define __COMMON_INITSVCSTRUCTS_H /** @@ -137,7 +137,7 @@ struct TaskFlags struct TaskInfo { const char taskname[VFS_MODULE_NAME_MAX]; - void (*taskfn)(void *ptr); + void* (*taskfn)(void *ptr); const TaskFlags taskflags; }; diff --git a/src/include/usr/initservice/taskargs.H b/src/include/usr/initservice/taskargs.H index 0108d8021..580a7a203 100644 --- a/src/include/usr/initservice/taskargs.H +++ b/src/include/usr/initservice/taskargs.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/initservice/taskargs.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/initservice/taskargs.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __TASKARGS_TASKARGS_H #define __TASKARGS_TASKARGS_H @@ -59,15 +59,11 @@ * * This is not as flexible as the old TaskArgs setup but much simpler. * - * Alternatively you can call task_end2() directly from the MyInitFn: - * - * task_end2( l_errl ); - * */ #define TASK_ENTRY_MACRO( MyInitFn ) \ extern "C" \ - void _start( void *io_pArgs ) \ + void * _start( void *io_pArgs ) \ { \ errlHndl_t io_rtaskRetErrl = NULL; \ void *ret = NULL; \ @@ -75,8 +71,7 @@ MyInitFn( io_rtaskRetErrl ); \ \ ret = reinterpret_cast<void *>(io_rtaskRetErrl); \ - \ - task_end2( ret ); \ + return ret; \ } #endif diff --git a/src/include/usr/targeting/attrrp.H b/src/include/usr/targeting/attrrp.H index ffa615580..82046b337 100644 --- a/src/include/usr/targeting/attrrp.H +++ b/src/include/usr/targeting/attrrp.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/include/usr/targeting/attrrp.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/targeting/attrrp.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __TARGETING_ATTRRP_H #define __TARGETING_ATTRRP_H @@ -232,7 +231,7 @@ class AttrRP * @param[in] i_pInstance * The AttrRP to call msgServiceTask on. */ - static void startMsgServiceTask(void* i_pInstance); + static void* startMsgServiceTask(void* i_pInstance); // Message Queue for VMM requests msg_q_t iv_msgQ; diff --git a/src/include/usr/util/impl/threadpool.H b/src/include/usr/util/impl/threadpool.H index 8490bb5d6..fad1b8edc 100644 --- a/src/include/usr/util/impl/threadpool.H +++ b/src/include/usr/util/impl/threadpool.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/util/impl/threadpool.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/util/impl/threadpool.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __UTIL_IMPL_THREADPOOL_H #define __UTIL_IMPL_THREADPOOL_H @@ -75,7 +75,7 @@ namespace __Util_ThreadPool_Impl worklist_itr_t; /** Typedef of function pointer passed to "start". */ - typedef void(*start_fn_t)(void*); + typedef void*(*start_fn_t)(void*); /** Typedef of function poitner passed to "remove". */ typedef worklist_itr_t(*order_fn_t)(worklist_itr_t, worklist_itr_t); diff --git a/src/include/usr/util/threadpool.H b/src/include/usr/util/threadpool.H index 4d28800fb..c04b7bede 100644 --- a/src/include/usr/util/threadpool.H +++ b/src/include/usr/util/threadpool.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/util/threadpool.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/util/threadpool.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __UTIL_THREADPOOL_H #define __UTIL_THREADPOOL_H @@ -116,7 +116,7 @@ class ThreadPool : public Util::__Util_ThreadPool_Impl::ThreadPoolImpl private: /** Entry point for worker thread. */ - static void run(ThreadPool*); + static void* run(ThreadPool*); /** Useful constant to determine FIFO vs non-FIFO behavior. */ static const bool has_comparison = Util::Traits::has_lessthan<WorkItem>::value; @@ -145,7 +145,7 @@ class ThreadPoolManager // Implementation of the worker-thread run function. template <typename WorkItem> -void ThreadPool<WorkItem>::run( +void* ThreadPool<WorkItem>::run( ThreadPool<WorkItem>* self) { while(1) @@ -168,9 +168,10 @@ void ThreadPool<WorkItem>::run( } else // No work item was given, we must be done. { - return; // task_end() called automatically by returning. + return NULL; // task_end() called automatically by returning. } } + return NULL; } }; diff --git a/src/kernel/idebug.C b/src/kernel/idebug.C index 673ecb149..77f88170f 100644 --- a/src/kernel/idebug.C +++ b/src/kernel/idebug.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/kernel/idebug.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/kernel/idebug.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <kernel/idebug.H> #include <kernel/console.H> #include <kernel/cpumgr.H> @@ -44,7 +44,7 @@ void InteractiveDebug::startDebugTask() return; } -void InteractiveDebug::debugEntryPoint(void* i_idObject) +void* InteractiveDebug::debugEntryPoint(void* i_idObject) { // Detach task so it is cleaned up properly once it exits. task_detach(); @@ -84,6 +84,6 @@ void InteractiveDebug::debugEntryPoint(void* i_idObject) __sync_lock_test_and_set(&interactiveDebug->state_value, IDEBUG_COMPLETE_STATE); - task_end(); + return NULL; } diff --git a/src/kernel/kernel.C b/src/kernel/kernel.C index e29af240e..1ba209613 100644 --- a/src/kernel/kernel.C +++ b/src/kernel/kernel.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/kernel/kernel.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2010-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/kernel/kernel.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <stdint.h> #include <kernel/console.H> #include <kernel/pagemgr.H> @@ -39,7 +38,7 @@ #include <stdlib.h> extern "C" void kernel_dispatch_task(); -extern void init_main(void* unused); +extern void* init_main(void* unused); extern uint64_t kernel_other_thread_spinlock; class Kernel diff --git a/src/kernel/start.S b/src/kernel/start.S index 252014e6a..41a35735c 100644 --- a/src/kernel/start.S +++ b/src/kernel/start.S @@ -768,8 +768,8 @@ userspace_task_entry: ;// inserts garbage code into the task_end C function. .global task_end_stub task_end_stub: + mr r4, r3 ;// Move current rc (r3) to status value (r4) li r3, 2 ;// TASK_END -> r3 (syscall number) - li r4, 0 ;// NULL -> r4 (status value) sc diff --git a/src/lib/syscall_task.C b/src/lib/syscall_task.C index d40136a21..846163c8b 100644 --- a/src/lib/syscall_task.C +++ b/src/lib/syscall_task.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/lib/syscall_task.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2010 - 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/lib/syscall_task.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <sys/task.h> #include <sys/syscall.h> #include <kernel/task.H> @@ -37,7 +37,7 @@ void task_yield() return; } -tid_t task_create(void(*fn)(void*), void* ptr) +tid_t task_create(void*(*fn)(void*), void* ptr) { // Verify we have (memory) permissions to load the function pointer so // we don't load bad memory from kernel space. @@ -105,7 +105,7 @@ tid_t task_exec(const char* file, void* ptr) } else { - child = task_create(reinterpret_cast<void(*)(void*)>(msg->data[0]), + child = task_create(reinterpret_cast<void*(*)(void*)>(msg->data[0]), ptr); } } diff --git a/src/sys/init/init_main.C b/src/sys/init/init_main.C index 96fea57a8..58f2daef1 100644 --- a/src/sys/init/init_main.C +++ b/src/sys/init/init_main.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/sys/init/init_main.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2010 - 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/sys/init/init_main.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <kernel/console.H> // TODO : Remove this. #include <kernel/syscalls.H> @@ -32,9 +32,9 @@ #include <assert.h> -void vfs_main(void*); +void* vfs_main(void*); -void init_main(void* unused) +void* init_main(void* unused) { tid_t tidrc = 0; barrier_t l_barrier; @@ -57,10 +57,5 @@ void init_main(void* unused) crit_assert( 0 ); // stop here. } - // should never reach this point... - task_end(); - - - while(1) - task_yield(); + return NULL; } diff --git a/src/sys/prof/idletask.C b/src/sys/prof/idletask.C index 8f79b94f7..b25a5fc17 100644 --- a/src/sys/prof/idletask.C +++ b/src/sys/prof/idletask.C @@ -35,7 +35,7 @@ using namespace Systemcalls; -void TaskManager::idleTaskLoop(void* unused) +void* TaskManager::idleTaskLoop(void* unused) { while(1) { @@ -48,4 +48,5 @@ void TaskManager::idleTaskLoop(void* unused) // Execute nap. nap(); } + return NULL; } diff --git a/src/sys/vfs/vfs_main.C b/src/sys/vfs/vfs_main.C index 032a35c3f..5b389a4df 100644 --- a/src/sys/vfs/vfs_main.C +++ b/src/sys/vfs/vfs_main.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/sys/vfs/vfs_main.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2010-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/sys/vfs/vfs_main.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <string.h> #include <errno.h> @@ -58,7 +57,7 @@ struct VfsEntry VfsEntry* prev; }; -void vfs_main(void* i_barrier) +void* vfs_main(void* i_barrier) { barrier_t * barrier = (barrier_t *)i_barrier; // Create message queue, register with kernel. @@ -175,6 +174,7 @@ void vfs_main(void* i_barrier) break; } } // end while(1) + return NULL; } // ---------------------------------------------------------------------------- diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C index 664d0ec0f..7e0de1bbf 100644 --- a/src/usr/cxxtest/cxxtestexec.C +++ b/src/usr/cxxtest/cxxtestexec.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/cxxtest/cxxtestexec.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/cxxtest/cxxtestexec.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <vfs/vfs.H> #include <sys/task.h> @@ -150,5 +150,5 @@ void cxxinit( errlHndl_t &io_taskRetErrl ) // @todo dump out an informational errorlog?? // should always return NULL - task_end2( l_errl ); + io_taskRetErrl = l_errl; } diff --git a/src/usr/cxxtest/cxxtestgen.pl b/src/usr/cxxtest/cxxtestgen.pl index 48b89c0c6..e0fa45098 100755 --- a/src/usr/cxxtest/cxxtestgen.pl +++ b/src/usr/cxxtest/cxxtestgen.pl @@ -1,26 +1,26 @@ #!/usr/bin/perl -w -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. # -# $Source: src/usr/cxxtest/cxxtestgen.pl $ +# $Source: src/usr/cxxtest/cxxtestgen.pl $ # -# IBM CONFIDENTIAL +# IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011 +# COPYRIGHT International Business Machines Corp. 2011,2012 # -# p1 +# p1 # -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code +# Object Code Only (OCO) source materials +# Licensed Internal Code Source Materials +# IBM HostBoot Licensed Internal Code # -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. +# The source code for this program is not published or otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. # -# Origin: 30 +# Origin: 30 # -# IBM_PROLOG_END +# IBM_PROLOG_END_TAG # # Change History: @@ -734,7 +734,7 @@ sub write_start() { print "\n\n"; print "extern \"C\"\n"; - print "void _start(void *ptr) "; + print "void* _start(void *ptr) "; print "{\n"; @@ -744,7 +744,7 @@ sub write_start() { print "\n"; print "\t__sync_add_and_fetch(&CxxTest::g_ModulesCompleted, 1);\n"; print "\n"; - print "\ttask_end2( NULL );\n"; + print "\treturn NULL;\n"; print "}\n"; } diff --git a/src/usr/diag/attn/attnsvc.C b/src/usr/diag/attn/attnsvc.C index 383b21a5f..52386362f 100644 --- a/src/usr/diag/attn/attnsvc.C +++ b/src/usr/diag/attn/attnsvc.C @@ -44,7 +44,7 @@ using namespace ERRORLOG; namespace ATTN { -void Service::intrTask(void * i_svc) +void* Service::intrTask(void * i_svc) { // interrupt task loop @@ -67,6 +67,7 @@ void Service::intrTask(void * i_svc) svc.processIntrQMsg(*msg); } + return NULL; } bool Service::intrTaskWait(msg_t * & o_msg) @@ -206,7 +207,7 @@ void Service::processIntrQMsg(msg_t & i_msg) } } -void Service::prdTask(void * i_svc) +void* Service::prdTask(void * i_svc) { // prd task loop @@ -232,6 +233,7 @@ void Service::prdTask(void * i_svc) svc.processAttentions(attentions); } + return NULL; } bool Service::prdTaskWait(AttentionList & o_attentions) diff --git a/src/usr/diag/attn/attnsvc.H b/src/usr/diag/attn/attnsvc.H index c31074742..ebfa414fe 100644 --- a/src/usr/diag/attn/attnsvc.H +++ b/src/usr/diag/attn/attnsvc.H @@ -92,7 +92,7 @@ class Service * * @param[in] i_svc service object associated with task */ - static void intrTask(void * i_svc); + static void* intrTask(void * i_svc); /** * @brief prdTask infinite wait-for-attention loop @@ -101,7 +101,7 @@ class Service * * @param[in] i_svc service object associated with task */ - static void prdTask(void * i_svc); + static void* prdTask(void * i_svc); /** * @brief startIntrTask start task helper function diff --git a/src/usr/diag/attn/test/attnfakepresenter.C b/src/usr/diag/attn/test/attnfakepresenter.C index db0d84dc9..81a7ea2f8 100644 --- a/src/usr/diag/attn/test/attnfakepresenter.C +++ b/src/usr/diag/attn/test/attnfakepresenter.C @@ -188,7 +188,7 @@ bool FakePresenter::wait(msg_q_t i_q) return shutdown; } -void FakePresenter::main(void * i_properties) +void* FakePresenter::main(void * i_properties) { PresenterProperties * properties = static_cast<PresenterProperties *>(i_properties); @@ -204,6 +204,7 @@ void FakePresenter::main(void * i_properties) } delete properties; + return NULL; } FakePresenter::FakePresenter() diff --git a/src/usr/diag/attn/test/attnfakepresenter.H b/src/usr/diag/attn/test/attnfakepresenter.H index 4fe250ba7..280a1f666 100644 --- a/src/usr/diag/attn/test/attnfakepresenter.H +++ b/src/usr/diag/attn/test/attnfakepresenter.H @@ -116,7 +116,7 @@ class FakePresenter * * @param[in] i_properties The presenter on which to call wait. */ - static void main(void * i_properties); + static void* main(void * i_properties); /** * @brief iv_mutex Shared data access serialization. diff --git a/src/usr/diag/attn/test/attnrandsource.C b/src/usr/diag/attn/test/attnrandsource.C index daa09a4a8..b6d71d18d 100644 --- a/src/usr/diag/attn/test/attnrandsource.C +++ b/src/usr/diag/attn/test/attnrandsource.C @@ -73,11 +73,12 @@ bool RandSource::wait() return true; } -void RandSource::main(void * i_source) +void* RandSource::main(void * i_source) { RandSource * src = static_cast<RandSource *>(i_source); src->run(); + return NULL; } void RandSource::run() diff --git a/src/usr/diag/attn/test/attnrandsource.H b/src/usr/diag/attn/test/attnrandsource.H index 50634fc9e..396690505 100644 --- a/src/usr/diag/attn/test/attnrandsource.H +++ b/src/usr/diag/attn/test/attnrandsource.H @@ -94,7 +94,7 @@ class RandSource * * @param[in] i_source The source on which to call run. */ - static void main(void * i_source); + static void* main(void * i_source); /** * @brief run Execute the testcase. diff --git a/src/usr/diag/mdia/mdiamonitor.C b/src/usr/diag/mdia/mdiamonitor.C index 3d0a15fdb..dc715aa51 100755 --- a/src/usr/diag/mdia/mdiamonitor.C +++ b/src/usr/diag/mdia/mdiamonitor.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/diag/mdia/mdiamonitor.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/mdia/mdiamonitor.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <sys/time.h> #include <targeting/common/util.H> #include <targeting/common/target.H> @@ -250,7 +250,7 @@ void CommandMonitor::shutdown() task_wait_tid(tid, 0, 0); } -void CommandMonitor::staticMain(void * i_args) +void* CommandMonitor::staticMain(void * i_args) { using namespace CommandMonitorImpl; @@ -263,6 +263,7 @@ void CommandMonitor::staticMain(void * i_args) delete args; args = NULL; } + return NULL; } CommandMonitor::CommandMonitor() : diff --git a/src/usr/diag/mdia/mdiamonitor.H b/src/usr/diag/mdia/mdiamonitor.H index 7ba686b8f..fa785933b 100755 --- a/src/usr/diag/mdia/mdiamonitor.H +++ b/src/usr/diag/mdia/mdiamonitor.H @@ -122,7 +122,7 @@ class CommandMonitor /** * @brief main thread function */ - static void staticMain(void *); + static void* staticMain(void *); /** * @brief main thread function diff --git a/src/usr/diag/mdia/test/mdiatestsm.H b/src/usr/diag/mdia/test/mdiatestsm.H index a11da7501..3874c2f57 100644 --- a/src/usr/diag/mdia/test/mdiatestsm.H +++ b/src/usr/diag/mdia/test/mdiatestsm.H @@ -58,9 +58,10 @@ class MdiaSmTest : public CxxTest::TestSuite } } - static void startSm(void * i_sm) + static void* startSm(void * i_sm) { static_cast<MDIA::StateMachine *>(i_sm)->start(); + return NULL; } public: diff --git a/src/usr/example/example.C b/src/usr/example/example.C index 962ea1be8..bb8cef2a3 100644 --- a/src/usr/example/example.C +++ b/src/usr/example/example.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/example/example.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2010 - 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/example/example.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2010,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <kernel/console.H> #include <sys/sync.h> #include <sys/vfs.h> @@ -36,14 +36,14 @@ TRAC_INIT(&g_trac_test, "EXAMPLE", 4096); #endif extern "C" -void _start(void *ptr) +void* _start(void *ptr) { /** * @todo fix printk to accept (NULL) */ printk( "Executing Example module, arg=%s\n", ( (ptr==NULL) ? "(NULL)" : (char*)ptr ) ); - task_end(); + return NULL; } uint64_t example1_function() diff --git a/src/usr/hwas/hostbootIstep.C b/src/usr/hwas/hostbootIstep.C index 99b4d9ff2..0a012643c 100644 --- a/src/usr/hwas/hostbootIstep.C +++ b/src/usr/hwas/hostbootIstep.C @@ -45,20 +45,21 @@ namespace HWAS //****************************************************************************** // host_init_fsi function //****************************************************************************** -void host_init_fsi( void *io_pArgs ) +void* host_init_fsi( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_init_fsi entry" ); errlHndl_t errl = FSI::initializeHardware( ); TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_init_fsi exit" ); - task_end2(errl); + + return errl; } //****************************************************************************** // host_set_ipl_parms function //****************************************************************************** -void host_set_ipl_parms( void *io_pArgs ) +void* host_set_ipl_parms( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms entry" ); errlHndl_t errl = NULL; @@ -66,13 +67,14 @@ void host_set_ipl_parms( void *io_pArgs ) // stub -- nothing here currently TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms exit" ); - task_end2(errl); + + return errl; } //****************************************************************************** // host_discover_targets function //****************************************************************************** -void host_discover_targets( void *io_pArgs ) +void* host_discover_targets( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_discover_targets entry" ); @@ -81,26 +83,28 @@ void host_discover_targets( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_discover_targets exit" ); - task_end2(errl); + + return errl; } //****************************************************************************** // host_gard function //****************************************************************************** -void host_gard( void *io_pArgs ) +void* host_gard( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_gard entry" ); errlHndl_t errl = collectGard(); TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_gard exit" ); - task_end2(errl); + + return errl; } //****************************************************************************** // host_cancontinue_clear function //****************************************************************************** -void host_cancontinue_clear( void *io_pArgs ) +void* host_cancontinue_clear( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_cancontinue_clear entry" ); @@ -110,13 +114,14 @@ void host_cancontinue_clear( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_cancontinue_clear exit" ); - task_end2(errl); + + return errl; } //****************************************************************************** // proc_check_slave_sbe_seeprom_complete function //****************************************************************************** -void proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) +void* proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "proc_check_slave_sbe_seeprom_complete entry" ); @@ -126,13 +131,14 @@ void proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "proc_check_slave_sbe_seeprom_complete exit" ); - task_end2(errl); + + return errl; } //****************************************************************************** // proc_xmit_sbe function //****************************************************************************** -void proc_xmit_sbe( void *io_pArgs ) +void* proc_xmit_sbe( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "proc_xmit_sbe entry" ); errlHndl_t errl = NULL; @@ -140,7 +146,8 @@ void proc_xmit_sbe( void *io_pArgs ) // stub -- nothing here currently TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "proc_xmit_sbe exit" ); - task_end2(errl); + + return errl; } } // namespace HWAS diff --git a/src/usr/hwas/testHWP.C b/src/usr/hwas/testHWP.C index 05d928762..82bef6230 100644 --- a/src/usr/hwas/testHWP.C +++ b/src/usr/hwas/testHWP.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwas/testHWP.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/hwas/testHWP.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file testHWP.C @@ -67,7 +67,7 @@ namespace HWAS extern HWAS_TD_t g_trac_imp_hwas; -void testHWP( void * io_pArgs ) +void* testHWP( void * io_pArgs ) { errlHndl_t l_err = NULL; std::vector<fapi::Target> l_target; @@ -140,7 +140,7 @@ void testHWP( void * io_pArgs ) TRACFCOMP( g_trac_hwas, "testHWP failed. "); } - task_end2( l_err ); + return l_err ; } 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 diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index c5c802c9b..7f7cba895 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/initservice/baseinitsvc/initservice.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/initservice/baseinitsvc/initservice.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file initservice.C @@ -74,7 +74,7 @@ TRAC_INIT(&g_trac_initsvc, "INITSVC", 2048 ); * This one is "special" since we do not return anything to the kernel/vfs */ extern "C" -void _start(void *ptr) +void* _start(void *ptr) { TRACFCOMP( g_trac_initsvc, "Executing Initialization Service module." ); @@ -85,7 +85,7 @@ void _start(void *ptr) TRACFCOMP( g_trac_initsvc, "return from Initialization Service module." ); - task_end(); + return NULL; } @@ -236,7 +236,7 @@ errlHndl_t InitService::startTask( // wait here for the task to end. // status of the task ( OK or Crashed ) is returned in l_childsts // if the task returns an errorlog, it will be returned - // (via task_end2) in l_childerrl + // in l_childerrl l_tidretrc = task_wait_tid( l_tidlnchrc, &l_childsts, @@ -354,7 +354,7 @@ errlHndl_t InitService::executeFn( // wait here for the task to end. // status of the task ( OK or Crashed ) is returned in l_childsts // if the task returns an errorlog, it will be returned - // (via task_end2) in l_childerrl + // in l_childerrl l_tidretrc = task_wait_tid( l_tidlnchrc, &l_childsts, diff --git a/src/usr/initservice/extinitsvc/extinitsvc.C b/src/usr/initservice/extinitsvc/extinitsvc.C index 10eacd2e4..c6a48fa28 100644 --- a/src/usr/initservice/extinitsvc/extinitsvc.C +++ b/src/usr/initservice/extinitsvc/extinitsvc.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/initservice/extinitsvc/extinitsvc.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/initservice/extinitsvc/extinitsvc.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file extinitsvc.C * @@ -108,7 +107,7 @@ void ExtInitSvc::init( errlHndl_t &io_rtaskRetErrl ) { #if 0 - // @todo detach this task and just do task_end() + // @todo detach this task and just terminate task // Commit the errorlog here. TRACFCOMP( g_trac_initsvc, "ExtInitSvc ERROR: Committing errorlog %p & shutdown", @@ -121,7 +120,8 @@ void ExtInitSvc::init( errlHndl_t &io_rtaskRetErrl ) SHUTDOWN_STATUS_EXTINITSVC_FAILED); // end the task. - end_task(); + io_rtaskRetErrl=NULL; + return; #endif // end the task and pass the errorlog to initservice to be committed. @@ -130,7 +130,8 @@ void ExtInitSvc::init( errlHndl_t &io_rtaskRetErrl ) "ExtInitSvc: ERROR: return to initsvc with errlog %p", l_errl ); - task_end2( l_errl ); + io_rtaskRetErrl=l_errl; + return; } // finish things up, return to initservice with goodness. @@ -139,7 +140,7 @@ void ExtInitSvc::init( errlHndl_t &io_rtaskRetErrl ) printk( "ExtInitSvc exit.\n" ); - task_end2( NULL ); + io_rtaskRetErrl=NULL; } diff --git a/src/usr/initservice/initsvctesttask/tasktest2.C b/src/usr/initservice/initsvctesttask/tasktest2.C index c8c52a386..ec87280aa 100644 --- a/src/usr/initservice/initsvctesttask/tasktest2.C +++ b/src/usr/initservice/initsvctesttask/tasktest2.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/initservice/initsvcunittesttask2/tasktest2.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/initservice/initsvctesttask/tasktest2.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file tasktest2.H @@ -59,8 +59,7 @@ void InitSvcTaskTest2::init( errlHndl_t &io_taskRetErrl ) { errlHndl_t l_errl = NULL; - - task_end2( l_errl ); + io_taskRetErrl=l_errl; }; } // namespace diff --git a/src/usr/initservice/istepdispatcher/istepWorker.C b/src/usr/initservice/istepdispatcher/istepWorker.C index f67235d1b..fc625c694 100644 --- a/src/usr/initservice/istepdispatcher/istepWorker.C +++ b/src/usr/initservice/istepdispatcher/istepWorker.C @@ -60,7 +60,7 @@ extern trace_desc_t *g_trac_initsvc; // ---------------------------------------------------------------------------- // startIStepWorkerThread // ---------------------------------------------------------------------------- -void startIStepWorkerThread ( void * io_args ) +void* startIStepWorkerThread ( void * io_args ) { TRACFCOMP( g_trac_initsvc, ENTER_MRK"startIStepWorkerThread()" ); @@ -75,7 +75,7 @@ void startIStepWorkerThread ( void * io_args ) EXIT_MRK"startIStepWorkerThread()" ); // Shutdown. - task_end(); + return NULL; } diff --git a/src/usr/initservice/istepdispatcher/istepWorker.H b/src/usr/initservice/istepdispatcher/istepWorker.H index f9ed47e24..87f8c8468 100644 --- a/src/usr/initservice/istepdispatcher/istepWorker.H +++ b/src/usr/initservice/istepdispatcher/istepWorker.H @@ -46,9 +46,9 @@ namespace INITSERVICE * @param[in/out] io_args - This is a void pointer, but the code expects that * this will be the msg queue to communicate with the main thread. * -* @return NONE. +* @return NULL */ -void startIStepWorkerThread ( void * io_args ); +void* startIStepWorkerThread ( void * io_args ); /** * @brief This function is the main loop for the Istep dispatcher worker @@ -56,7 +56,7 @@ void startIStepWorkerThread ( void * io_args ); * * @param[in] i_msgQ - The message queue to talk to the main thread. * -* @return NONE. +* @return any errlogs */ void iStepWorkerThread ( void * i_msgQ ); diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index ddd3aeeda..5dc4b7547 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -217,7 +217,7 @@ void IStepDispatcher::init ( errlHndl_t &io_rtaskRetErrl ) TRACFCOMP( g_trac_initsvc, "IStepDispatcher finished."); printk( "IStepDispatcher exit.\n" ); - task_end2( err ); + io_rtaskRetErrl= err; } diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.H b/src/usr/initservice/istepdispatcher/istepdispatcher.H index ddbec0ffb..b3eba4c67 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.H +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/initservice/istepdispatcher/istepdispatcher.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/initservice/istepdispatcher/istepdispatcher.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __ISTEPDISPATCHER_ISTEPDISPATCHER_H #define __ISTEPDISPATCHER_ISTEPDISPATCHER_H /** @@ -70,9 +69,9 @@ namespace INITSERVICE * * param[in,out] - pointer to any args * - * @return nothing + * @return NULL */ -void spTask ( void *io_pArgs ); +void* spTask ( void *io_pArgs ); /** * @brief enums for whether the messages IStepdispatcher sends are synchronus diff --git a/src/usr/initservice/istepdispatcher/sptask.C b/src/usr/initservice/istepdispatcher/sptask.C index 280d894aa..c07f0d87e 100644 --- a/src/usr/initservice/istepdispatcher/sptask.C +++ b/src/usr/initservice/istepdispatcher/sptask.C @@ -269,7 +269,7 @@ void userConsoleComm( void * io_msgQ ) // return to main to end task } -void spTask( void *io_pArgs ) +void* spTask( void *io_pArgs ) { TRACFCOMP( g_trac_initsvc, @@ -286,7 +286,7 @@ void spTask( void *io_pArgs ) "spTask exit." ); // End the task. - task_end(); + return NULL; } diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index 26104ab6c..3fb75d6ac 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/intr/intrrp.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/intr/intrrp.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file intrrp.C * @brief Interrupt Resource Provider @@ -64,7 +63,7 @@ void IntrRp::init( errlHndl_t &io_errlHndl_t ) err = Singleton<IntrRp>::instance()._init(); // pass task error back to parent - task_end2( err ); + io_errlHndl_t = err ; } @@ -199,9 +198,10 @@ errlHndl_t IntrRp::disableInterrupts() /** * Helper function to start the messge handler */ -void IntrRp::msg_handler(void * unused) +void* IntrRp::msg_handler(void * unused) { Singleton<IntrRp>::instance().msgHandler(); + return NULL; } diff --git a/src/usr/intr/intrrp.H b/src/usr/intr/intrrp.H index 98c8ab85b..c2ed0d30b 100644 --- a/src/usr/intr/intrrp.H +++ b/src/usr/intr/intrrp.H @@ -75,7 +75,7 @@ namespace INTR /** * Start message handler */ - static void msg_handler(void * unused); + static void* msg_handler(void * unused); private: //Data diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C index 414c68173..0538d086a 100644 --- a/src/usr/mbox/mailboxsp.C +++ b/src/usr/mbox/mailboxsp.C @@ -84,9 +84,10 @@ void MailboxSp::init(errlHndl_t& o_errl) } // helper function to start mailbox message handler -void MailboxSp::msg_handler(void * unused) +void* MailboxSp::msg_handler(void * unused) { Singleton<MailboxSp>::instance().msgHandler(); + return NULL; } diff --git a/src/usr/mbox/mailboxsp.H b/src/usr/mbox/mailboxsp.H index fd191402b..37278593a 100644 --- a/src/usr/mbox/mailboxsp.H +++ b/src/usr/mbox/mailboxsp.H @@ -95,7 +95,7 @@ namespace MBOX /** * Start message handler */ - static void msg_handler(void * unused); + static void* msg_handler(void * unused); private: diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index c2287a4a8..e3831e2b4 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/pnor/pnorrp.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/pnor/pnorrp.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include "pnorrp.H" #include <pnor/pnor_reasoncodes.H> #include <initservice/taskargs.H> @@ -119,7 +118,7 @@ void PnorRP::init( errlHndl_t &io_rtaskRetErrl ) 0 ); } - task_end2( l_errl ); + io_rtaskRetErrl=l_errl; } @@ -130,10 +129,11 @@ void PnorRP::init( errlHndl_t &io_rtaskRetErrl ) /** * @brief Static function wrapper to pass into task_create */ -void wait_for_message( void* unused ) +void* wait_for_message( void* unused ) { TRACUCOMP(g_trac_pnor, "wait_for_message> " ); Singleton<PnorRP>::instance().waitForMessage(); + return NULL; } diff --git a/src/usr/pnor/pnorrp.H b/src/usr/pnor/pnorrp.H index 7224fbc79..bc15249d6 100644 --- a/src/usr/pnor/pnorrp.H +++ b/src/usr/pnor/pnorrp.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/pnor/pnorrp.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/pnor/pnorrp.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __PNOR_PNORRP_H #define __PNOR_PNORRP_H @@ -245,7 +244,7 @@ class PnorRP // allow local helper function to call private methods - friend void wait_for_message( void* unused ); + friend void* wait_for_message( void* unused ); // allow testcase to see inside friend class PnorRpTest; diff --git a/src/usr/targeting/attrrp.C b/src/usr/targeting/attrrp.C index 5daf7de10..db6535106 100644 --- a/src/usr/targeting/attrrp.C +++ b/src/usr/targeting/attrrp.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/targeting/attrrp.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/targeting/attrrp.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file targeting/attrrp.C * @@ -79,11 +78,12 @@ namespace TARGETING return reinterpret_cast<void*>(VMM_VADDR_ATTR_RP); } - void AttrRP::startMsgServiceTask(void* i_pInstance) + void* AttrRP::startMsgServiceTask(void* i_pInstance) { // Call msgServiceTask loop on instance. TARG_ASSERT(i_pInstance); static_cast<AttrRP*>(i_pInstance)->msgServiceTask(); + return NULL; } AttrRP::~AttrRP() diff --git a/src/usr/targeting/test/testtargeting.H b/src/usr/targeting/test/testtargeting.H index a112275fc..f12f8127e 100644 --- a/src/usr/targeting/test/testtargeting.H +++ b/src/usr/targeting/test/testtargeting.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/targeting/test/testtargeting.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/targeting/test/testtargeting.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __TARGETING_TESTTARGETING_H #define __TARGETING_TESTTARGETING_H @@ -77,9 +77,9 @@ struct MutexTestData_t * * @param[in] i_pData Pointer to mutex pointer/value pointer structure * - * @return N/A + * @return NULL */ -void funcTestMutex(void* i_pData) +void* funcTestMutex(void* i_pData) { MutexTestData_t* l_pData = static_cast<MutexTestData_t*>(i_pData); barrier_wait(l_pData->pBarrier); @@ -87,7 +87,7 @@ void funcTestMutex(void* i_pData) *(l_pData->pVar) = 1; mutex_unlock(l_pData->pMutex); barrier_wait(l_pData->pBarrier); - task_end(); + return NULL; } class TargetingTestSuite : public CxxTest::TestSuite diff --git a/src/usr/testcore/kernel/msgtest.H b/src/usr/testcore/kernel/msgtest.H index 995baace3..6f3415e6c 100644 --- a/src/usr/testcore/kernel/msgtest.H +++ b/src/usr/testcore/kernel/msgtest.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/testcore/kernel/msgtest.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/testcore/kernel/msgtest.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** @file msgtest.H * @brief Testcases for the messaging subsystem of the kernel. @@ -96,7 +96,7 @@ class MessagingTest : public CxxTest::TestSuite enum msg_types { SHUTDOWN, ECHO }; - static void processMsg(void* _msgQ) + static void* processMsg(void* _msgQ) { msg_q_t msgQ = static_cast<msg_q_t>(_msgQ); @@ -106,8 +106,7 @@ class MessagingTest : public CxxTest::TestSuite { case SHUTDOWN: // Shutdown. msg_free(msg); - task_end(); - break; + return NULL; case ECHO: if (msg->data[1]) @@ -120,5 +119,6 @@ class MessagingTest : public CxxTest::TestSuite break; } } + return NULL; } }; diff --git a/src/usr/testcore/kernel/taskwaittest.H b/src/usr/testcore/kernel/taskwaittest.H index 0595d2961..03719008c 100644 --- a/src/usr/testcore/kernel/taskwaittest.H +++ b/src/usr/testcore/kernel/taskwaittest.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/testcore/kernel/tasktest.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/testcore/kernel/taskwaittest.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** @file tasktest.H * @brief Test cases for task interfaces. */ @@ -148,27 +148,28 @@ class TaskWaitTest : public CxxTest::TestSuite } } - static void WaitSomeTime(void* retval) + static void* WaitSomeTime(void* retval) { nanosleep(0,TEN_CTX_SWITCHES_NS); - if (retval) task_end2(retval); + return retval; } - static void WaitSomeLongerTime(void* retval) + static void* WaitSomeLongerTime(void* retval) { nanosleep(0, 2*TEN_CTX_SWITCHES_NS); - if (retval) task_end2(retval); + return retval; } - static void TaskWithChild(void* unused) + static void* TaskWithChild(void* unused) { tid_t child = task_create(&WaitSomeTime, NULL); - task_end2(reinterpret_cast<void*>(child)); + return reinterpret_cast<void*>(child); } - static void TaskThatCrashes(void* unused) + static void* TaskThatCrashes(void* unused) { printk("Test case: Expect to see uncaught exception! "); *(int64_t*)(0) = 0xDEADC0DE; + return NULL; } }; diff --git a/src/usr/testcore/kernel/vmmbasetest.H b/src/usr/testcore/kernel/vmmbasetest.H index 2df580e1c..ce5fd990b 100644 --- a/src/usr/testcore/kernel/vmmbasetest.H +++ b/src/usr/testcore/kernel/vmmbasetest.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/testcore/kernel/vmmbasetest.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/testcore/kernel/vmmbasetest.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** @file vmmbasetest.H * @brief Test cases for permission settings on the base block of the VMM. */ @@ -132,25 +131,25 @@ class VmmBaseTest : public CxxTest::TestSuite private: - static void readFromNULL(void* unused) + static void* readFromNULL(void* unused) { printk("%lx", (*(uint64_t*)NULL)); - task_end(); + return NULL; } - static void writeToNULL(void* unused) + static void* writeToNULL(void* unused) { (*(uint64_t*)NULL) = 0x12345678; - task_end(); + return NULL; } - static void writeToKernelCode(void* unused) + static void* writeToKernelCode(void* unused) { (*(*(uint64_t**)&printk)) = 0x12345678; - task_end(); + return NULL; } - static void msgDaemon(void* unused) + static void* msgDaemon(void* unused) { msg_t* message = NULL; uint64_t ea = 0; @@ -166,6 +165,7 @@ class VmmBaseTest : public CxxTest::TestSuite msg_respond(iv_mq, message); } } + return NULL; } }; diff --git a/src/usr/testcore/kernel/vmmpagetest.H b/src/usr/testcore/kernel/vmmpagetest.H index a6679cc81..51b40731e 100644 --- a/src/usr/testcore/kernel/vmmpagetest.H +++ b/src/usr/testcore/kernel/vmmpagetest.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/testcore/kernel/vmmpagetest.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/testcore/kernel/vmmpagetest.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __VMMPAGETEST_H #define __VMMPAGETEST_H /** @@ -211,7 +211,7 @@ class vmmpagetest: public CxxTest::TestSuite private: - static void testDaemon(void* unused) + static void* testDaemon(void* unused) { msg_t* message = NULL; uint64_t ea = 0; @@ -227,19 +227,20 @@ class vmmpagetest: public CxxTest::TestSuite rc = msg_respond(iv_mq, message); } } + return NULL; } - static void writeAddrWithNoPerm(void* unused) + static void* writeAddrWithNoPerm(void* unused) { (*(volatile uint64_t *)(iv_va+4*PAGESIZE)) = 0x11111111; sync(); - task_end(); + return NULL; } - static void writeAddrWithNoPerm2(void* unused) + static void* writeAddrWithNoPerm2(void* unused) { (*(volatile uint64_t *)(iv_va+4*PAGESIZE+2*PAGESIZE)) = 0x22222222; sync(); - task_end(); + return NULL; } diff --git a/src/usr/testcore/lib/synctest.H b/src/usr/testcore/lib/synctest.H index 3f6f6e248..b7fc669b0 100644 --- a/src/usr/testcore/lib/synctest.H +++ b/src/usr/testcore/lib/synctest.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/testcore/lib/synctest.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/testcore/lib/synctest.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __SYNCTEST_H #define __SYNCTEST_H /** @@ -163,7 +163,7 @@ class SyncTest: public CxxTest::TestSuite size_t counter; - static void func1(void * i_p) + static void* func1(void * i_p) { SyncTest * my = (SyncTest *) i_p; mutex_t * mutex = &(my->mutex); @@ -174,10 +174,10 @@ class SyncTest: public CxxTest::TestSuite TS_TRACE("ME FIRST"); mutex_unlock(mutex); barrier_wait(barrier); - task_end(); + return NULL; } - static void func2(void * i_p) + static void* func2(void * i_p) { SyncTest * my = (SyncTest *) i_p; mutex_t * mutex = &(my->mutex); @@ -187,25 +187,25 @@ class SyncTest: public CxxTest::TestSuite TS_TRACE("ME NEXT"); mutex_unlock(mutex); barrier_wait(barrier); - task_end(); + return NULL; } - static void func3(void * i_p) + static void* func3(void * i_p) { barrier_t * barrier = (barrier_t *) i_p; barrier_wait(barrier); TS_TRACE("B1"); - task_end(); + return NULL; } - static void func4(void * i_p) + static void* func4(void * i_p) { barrier_t * barrier = (barrier_t *) i_p; barrier_wait(barrier); TS_TRACE("B2"); - task_end(); + return NULL; } - static void watch_counter(void * i_p) + static void* watch_counter(void * i_p) { TASK_INFO * info = (TASK_INFO *) i_p; SyncTest * my = info->testobj; @@ -222,10 +222,11 @@ class SyncTest: public CxxTest::TestSuite } mutex_unlock(&(my->mutex)); barrier_wait(&(my->barrier)); + return NULL; } - static void increment(void * i_p) + static void* increment(void * i_p) { TASK_INFO * info = (TASK_INFO *) i_p; SyncTest * my = info->testobj; @@ -247,9 +248,10 @@ class SyncTest: public CxxTest::TestSuite nanosleep(0,TEN_CTX_SWITCHES_NS); } barrier_wait(&(my->barrier)); + return NULL; } - static void increment1(void * i_p) + static void* increment1(void * i_p) { TASK_INFO * info = (TASK_INFO *) i_p; SyncTest * my = info->testobj; @@ -271,6 +273,7 @@ class SyncTest: public CxxTest::TestSuite nanosleep(0,TEN_CTX_SWITCHES_NS); } barrier_wait(&(my->barrier)); + return NULL; } }; diff --git a/src/usr/trace/tracedaemon.C b/src/usr/trace/tracedaemon.C index c4bd4e56c..cbbb73e85 100644 --- a/src/usr/trace/tracedaemon.C +++ b/src/usr/trace/tracedaemon.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/trace/tracedaemon.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/trace/tracedaemon.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include "tracedaemon.H" #include <sys/task.h> #include <targeting/common/commontargeting.H> @@ -50,9 +50,10 @@ TraceDaemon::~TraceDaemon() msg_q_destroy(iv_msgQ); } -void TraceDaemon::start(void* i_self) +void* TraceDaemon::start(void* i_self) { reinterpret_cast<TraceDaemon *>(i_self)->run(); + return NULL; }; void TraceDaemon::run() @@ -80,8 +81,7 @@ void TraceDaemon::run() case DAEMON_SHUTDOWN: // Respond to message and exit. msg_respond(iv_msgQ, l_msg); - task_end(); - break; + return; }; if (msg_is_async(l_msg)) diff --git a/src/usr/trace/tracedaemon.H b/src/usr/trace/tracedaemon.H index 6c4006701..1dbc0935a 100644 --- a/src/usr/trace/tracedaemon.H +++ b/src/usr/trace/tracedaemon.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/trace/tracedaemon.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/trace/tracedaemon.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __TRACE_DAEMON_H #define __TRACE_DAEMON_H @@ -77,7 +77,7 @@ namespace TRACE /** @brief Function to start daemon thread (using task_create). * @param[in] Pointer to self. */ - static void start(void*); + static void* start(void*); /** @brief Main daemon loop. */ void run(); diff --git a/src/usr/vfs/vfsrp.C b/src/usr/vfs/vfsrp.C index b7a897f96..0f34782b6 100644 --- a/src/usr/vfs/vfsrp.C +++ b/src/usr/vfs/vfsrp.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/vfs/vfsrp.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/vfs/vfsrp.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file vfsrp.C * @brief Virtual File system Extended image support @@ -72,34 +71,35 @@ void VfsRp::init( errlHndl_t &io_taskRetErrl ) err = Singleton<VfsRp>::instance()._init(); - task_end2( err ); + io_taskRetErrl= err ; } // ---------------------------------------------------------------------------- /** * Helper function to start vfs messge handler */ -void VfsRp::msg_handler(void * unused) +void* VfsRp::msg_handler(void * unused) { Singleton<VfsRp>::instance().msgHandler(); + return NULL; } // ---------------------------------------------------------------------------- -void VfsRp::load_unload(void * i_msg) +void* VfsRp::load_unload(void * i_msg) { task_detach(); Singleton<VfsRp>::instance()._load_unload((msg_t*)i_msg); - task_end(); + return NULL; } // ---------------------------------------------------------------------------- -void VfsRp::exec(void * i_msg) +void* VfsRp::exec(void * i_msg) { task_detach(); Singleton<VfsRp>::instance()._exec((msg_t*)i_msg); - task_end(); + return NULL; } // ---------------------------------------------------------------------------- diff --git a/src/usr/vfs/vfsrp.H b/src/usr/vfs/vfsrp.H index 36e9ed1c8..014aad815 100644 --- a/src/usr/vfs/vfsrp.H +++ b/src/usr/vfs/vfsrp.H @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/vfs/vfsrp.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/vfs/vfsrp.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef VFSRP_H #define VFSRP_H @@ -101,21 +101,21 @@ namespace VFS /** * Start message handler */ - static void msg_handler(void * unused); + static void* msg_handler(void * unused); /** * Load or Unload a module * @param[in] i_msg the message - * @note Does not return. calls task_end() + * @note Does not return. */ - static void load_unload(void * i_msg); + static void* load_unload(void * i_msg); /** * Call _start on module * @param[in] i_msg the message - * @note Does not return. calls task_end() + * @note Does not return. */ - static void exec(void * i_msg); + static void* exec(void * i_msg); private: // functions |
