From 6a9282d9bb7dd6d7665adb858161edf4e1d0778a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 9 Dec 2016 10:49:49 +0100 Subject: Rename is_internal to always_set_to_false Update #2825. --- c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c | 2 +- c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c | 2 +- c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c | 2 +- c/src/lib/libbsp/m68k/mrm332/misc/interr.c | 2 +- c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c | 2 +- c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c | 2 +- c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c | 2 +- c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c | 2 +- c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c | 2 +- c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c | 2 +- c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c | 2 +- c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c | 2 +- c/src/lib/libbsp/shared/bspclean.c | 2 +- c/src/lib/libbsp/shared/include/default-initial-extension.h | 2 +- c/src/lib/libbsp/sparc/leon3/startup/bspclean.c | 2 +- c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c | 2 +- c/src/libchip/shmdr/fatal.c | 2 +- cpukit/libmisc/stackchk/check.c | 2 +- cpukit/libmisc/testsupport/test.h | 2 +- cpukit/libmisc/testsupport/testextension.c | 4 ++-- cpukit/score/include/rtems/score/userext.h | 6 +++--- testsuites/libtests/exit01/init.c | 4 ++-- testsuites/libtests/exit02/init.c | 4 ++-- testsuites/libtests/stackchk/init.c | 4 ++-- testsuites/libtests/stackchk/system.h | 2 +- testsuites/psxtests/psxfatal_support/init.c | 6 +++--- testsuites/psxtests/psxfatal_support/system.h | 2 +- testsuites/smptests/smpfatal01/init.c | 4 ++-- testsuites/smptests/smpfatal02/init.c | 4 ++-- testsuites/smptests/smpfatal03/init.c | 4 ++-- testsuites/smptests/smpfatal04/init.c | 4 ++-- testsuites/smptests/smpfatal05/init.c | 4 ++-- testsuites/smptests/smpfatal06/init.c | 4 ++-- testsuites/smptests/smpfatal08/init.c | 4 ++-- testsuites/sptests/sperror01/init.c | 4 ++-- testsuites/sptests/sperror02/init.c | 4 ++-- testsuites/sptests/sperror03/init.c | 4 ++-- testsuites/sptests/spextensions01/init.c | 8 ++++---- testsuites/sptests/spfatal26/init.c | 4 ++-- testsuites/sptests/spfatal_support/init.c | 6 +++--- testsuites/sptests/spfatal_support/system.h | 2 +- testsuites/sptests/spinternalerror01/init.c | 8 ++++++-- testsuites/sptests/spmutex01/init.c | 4 ++-- testsuites/sptests/spsyslock01/init.c | 4 ++-- 44 files changed, 75 insertions(+), 71 deletions(-) diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c index 5504ed65c3..8b95deb801 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c @@ -19,7 +19,7 @@ void bsp_fatal_extension( rtems_fatal_source src, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { diff --git a/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c b/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c index d4ff09b2e5..b010292d06 100644 --- a/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c +++ b/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c @@ -50,7 +50,7 @@ static void reconf(void) void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c index 562b19af72..5cd1aed1e9 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c @@ -19,7 +19,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/m68k/mrm332/misc/interr.c b/c/src/lib/libbsp/m68k/mrm332/misc/interr.c index c0a8650d47..b1eaf1371e 100644 --- a/c/src/lib/libbsp/m68k/mrm332/misc/interr.c +++ b/c/src/lib/libbsp/m68k/mrm332/misc/interr.c @@ -33,7 +33,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code the_error ) { diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c index 36c3317cfc..6606b9a249 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c @@ -37,7 +37,7 @@ static rtems_isr bsp_return_to_monitor_trap( void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c index 085f346309..dd91f96b1a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c @@ -38,7 +38,7 @@ static rtems_isr bsp_return_to_monitor_trap( void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c index 54b617e6a3..2dd980fdb4 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c @@ -61,7 +61,7 @@ static void bsp_return_to_monitor_trap( void ) */ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c index 0daeee0789..a344efd7bb 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c @@ -16,7 +16,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c b/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c index f4369b588c..0f4121d6d2 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c +++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c @@ -4,7 +4,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c index 0494696dec..bd332cc89c 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c @@ -10,7 +10,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c b/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c index 5486c6676d..bd5829e0b2 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c +++ b/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c @@ -41,7 +41,7 @@ __attribute__(( weak, alias("_noopfun") )); void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c b/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c index 5486c6676d..bd5829e0b2 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c +++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c @@ -41,7 +41,7 @@ __attribute__(( weak, alias("_noopfun") )); void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/c/src/lib/libbsp/shared/bspclean.c b/c/src/lib/libbsp/shared/bspclean.c index 4265f11fa4..e045512da0 100644 --- a/c/src/lib/libbsp/shared/bspclean.c +++ b/c/src/lib/libbsp/shared/bspclean.c @@ -13,7 +13,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { diff --git a/c/src/lib/libbsp/shared/include/default-initial-extension.h b/c/src/lib/libbsp/shared/include/default-initial-extension.h index c3e5ceace7..1c795b7278 100644 --- a/c/src/lib/libbsp/shared/include/default-initial-extension.h +++ b/c/src/lib/libbsp/shared/include/default-initial-extension.h @@ -39,7 +39,7 @@ extern "C" { void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ); diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspclean.c b/c/src/lib/libbsp/sparc/leon3/startup/bspclean.c index cfe049bf31..eff9c8635b 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/bspclean.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/bspclean.c @@ -26,7 +26,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { diff --git a/c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c b/c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c index 88750aaa9c..eacc264e5b 100644 --- a/c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c +++ b/c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c @@ -14,7 +14,7 @@ void bsp_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { diff --git a/c/src/libchip/shmdr/fatal.c b/c/src/libchip/shmdr/fatal.c index 914771c514..ad3f18a5a6 100644 --- a/c/src/libchip/shmdr/fatal.c +++ b/c/src/libchip/shmdr/fatal.c @@ -20,7 +20,7 @@ void MPCI_Fatal( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c index 4c48c5bde3..b054e78eee 100644 --- a/cpukit/libmisc/stackchk/check.c +++ b/cpukit/libmisc/stackchk/check.c @@ -436,7 +436,7 @@ static bool Stack_check_Dump_threads_usage( #ifndef DONT_USE_FATAL_EXTENSION void rtems_stack_checker_fatal_extension( Internal_errors_Source source, - bool is_internal, + bool always_set_to_false, uint32_t status ) { diff --git a/cpukit/libmisc/testsupport/test.h b/cpukit/libmisc/testsupport/test.h index b4adebfe9e..a32e2c42c1 100644 --- a/cpukit/libmisc/testsupport/test.h +++ b/cpukit/libmisc/testsupport/test.h @@ -47,7 +47,7 @@ extern rtems_printer rtems_test_printer; */ void rtems_test_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ); diff --git a/cpukit/libmisc/testsupport/testextension.c b/cpukit/libmisc/testsupport/testextension.c index 43f79bc114..afb87e95da 100644 --- a/cpukit/libmisc/testsupport/testextension.c +++ b/cpukit/libmisc/testsupport/testextension.c @@ -27,7 +27,7 @@ RTEMS_INTERRUPT_LOCK_DEFINE( static, report_lock, "test report" ) void rtems_test_fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -68,6 +68,6 @@ void rtems_test_fatal_extension( #endif (void) source; - (void) is_internal; + (void) always_set_to_false; (void) code; } diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h index 61de992f23..5af5824808 100644 --- a/cpukit/score/include/rtems/score/userext.h +++ b/cpukit/score/include/rtems/score/userext.h @@ -195,14 +195,14 @@ typedef void( *User_extensions_thread_exitted_extension )( * * @param[in] source The fatal source indicating the subsystem the fatal * condition originated in. - * @param[in] is_internal This parameter is always false and provide only for - * backward compatibility reasons. + * @param[in] always_set_to_false This parameter is always set to false and + * provided only for backward compatibility reasons. * @param[in] code The fatal error code. This value must be interpreted with * respect to the source. */ typedef void( *User_extensions_fatal_extension )( Internal_errors_Source source, - bool is_internal, + bool always_set_to_false, Internal_errors_t code ); diff --git a/testsuites/libtests/exit01/init.c b/testsuites/libtests/exit01/init.c index b677c3aab9..0fd8d356f0 100644 --- a/testsuites/libtests/exit01/init.c +++ b/testsuites/libtests/exit01/init.c @@ -52,13 +52,13 @@ static void atexit_2(void) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == RTEMS_FATAL_SOURCE_EXIT - && !is_internal + && !always_set_to_false && error == EXIT_STATUS && counter == 3 ) { diff --git a/testsuites/libtests/exit02/init.c b/testsuites/libtests/exit02/init.c index f185d0f72e..48248a569a 100644 --- a/testsuites/libtests/exit02/init.c +++ b/testsuites/libtests/exit02/init.c @@ -37,13 +37,13 @@ static void atexit_not_reached(void) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == RTEMS_FATAL_SOURCE_EXIT - && !is_internal + && !always_set_to_false && error == EXIT_STATUS ) { TEST_END(); diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c index 4e1e41cdfb..72e3c23731 100644 --- a/testsuites/libtests/stackchk/init.c +++ b/testsuites/libtests/stackchk/init.c @@ -90,13 +90,13 @@ rtems_task Init( void Fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source != RTEMS_FATAL_SOURCE_STACK_CHECKER ) { printk( "unexpected fatal source\n" ); - } else if ( is_internal ) { + } else if ( always_set_to_false ) { printk( "unexpected fatal is internal\n" ); } else if ( error != rtems_build_name( 'T', 'A', '1', ' ' ) ) { printk( "unexpected fatal error\n" ); diff --git a/testsuites/libtests/stackchk/system.h b/testsuites/libtests/stackchk/system.h index 96f56fb22d..225a5d3155 100644 --- a/testsuites/libtests/stackchk/system.h +++ b/testsuites/libtests/stackchk/system.h @@ -44,7 +44,7 @@ void blow_stack( void ); void Fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ); diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c index bc48b95cb0..d639d17d3d 100644 --- a/testsuites/psxtests/psxfatal_support/init.c +++ b/testsuites/psxtests/psxfatal_support/init.c @@ -62,7 +62,7 @@ void Put_Source( rtems_fatal_source source ) void Fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { @@ -77,7 +77,7 @@ void Fatal_extension( printk( ")\n" ); } - if ( is_internal ) + if ( always_set_to_false ) printk( "ERROR==> Fatal Extension is internal set to true expected false\n" ); if ( error != FATAL_ERROR_EXPECTED_ERROR ) { @@ -90,7 +90,7 @@ void Fatal_extension( if ( source == FATAL_ERROR_EXPECTED_SOURCE - && !is_internal + && !always_set_to_false && error == FATAL_ERROR_EXPECTED_ERROR ) { TEST_END(); diff --git a/testsuites/psxtests/psxfatal_support/system.h b/testsuites/psxtests/psxfatal_support/system.h index 4a6e5d9d9c..c825a4a252 100644 --- a/testsuites/psxtests/psxfatal_support/system.h +++ b/testsuites/psxtests/psxfatal_support/system.h @@ -36,7 +36,7 @@ void *POSIX_Init( void Fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ); diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c index e7f15973c5..457469f1b2 100644 --- a/testsuites/smptests/smpfatal01/init.c +++ b/testsuites/smptests/smpfatal01/init.c @@ -42,7 +42,7 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -51,7 +51,7 @@ static void fatal_extension( if (source == RTEMS_FATAL_SOURCE_SMP) { uint32_t self = rtems_get_current_processor(); - assert(!is_internal); + assert(!always_set_to_false); assert(code == SMP_FATAL_SHUTDOWN); if (self == main_cpu) { diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c index ae075ec694..3aa20e3dcf 100644 --- a/testsuites/smptests/smpfatal02/init.c +++ b/testsuites/smptests/smpfatal02/init.c @@ -42,14 +42,14 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { SMP_barrier_State barrier_state = SMP_BARRIER_STATE_INITIALIZER; uint32_t self = rtems_get_current_processor(); - assert(!is_internal); + assert(!always_set_to_false); if ( source == RTEMS_FATAL_SOURCE_APPLICATION ) { uint32_t cpu; diff --git a/testsuites/smptests/smpfatal03/init.c b/testsuites/smptests/smpfatal03/init.c index 9f7c6824ed..47f8598387 100644 --- a/testsuites/smptests/smpfatal03/init.c +++ b/testsuites/smptests/smpfatal03/init.c @@ -67,13 +67,13 @@ static void Init( rtems_task_argument arg ) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { if ( source == INTERNAL_ERROR_CORE - && !is_internal + && !always_set_to_false && code == INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE ) { TEST_END(); diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c index ebfa849dbd..e8b43d7d52 100644 --- a/testsuites/smptests/smpfatal04/init.c +++ b/testsuites/smptests/smpfatal04/init.c @@ -34,7 +34,7 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -42,7 +42,7 @@ static void fatal_extension( if ( source == RTEMS_FATAL_SOURCE_SMP - && !is_internal + && !always_set_to_false && code == SMP_FATAL_BOOT_PROCESSOR_NOT_ASSIGNED_TO_SCHEDULER ) { TEST_END(); diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c index 1e1e535863..506a62e99b 100644 --- a/testsuites/smptests/smpfatal05/init.c +++ b/testsuites/smptests/smpfatal05/init.c @@ -34,7 +34,7 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -42,7 +42,7 @@ static void fatal_extension( if ( source == RTEMS_FATAL_SOURCE_SMP - && !is_internal + && !always_set_to_false && code == SMP_FATAL_MANDATORY_PROCESSOR_NOT_PRESENT ) { TEST_END(); diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c index f871112b1a..0e363d1f5f 100644 --- a/testsuites/smptests/smpfatal06/init.c +++ b/testsuites/smptests/smpfatal06/init.c @@ -36,13 +36,13 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { if ( source == INTERNAL_ERROR_CORE - && !is_internal + && !always_set_to_false && code == INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT ) { TEST_END(); diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c index 4b7aaf5156..ee1f94c51e 100644 --- a/testsuites/smptests/smpfatal08/init.c +++ b/testsuites/smptests/smpfatal08/init.c @@ -91,7 +91,7 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -99,7 +99,7 @@ static void fatal_extension( if ( source == RTEMS_FATAL_SOURCE_SMP - && !is_internal + && !always_set_to_false && code == SMP_FATAL_START_OF_MANDATORY_PROCESSOR_FAILED ) { TEST_END(); diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c index a84eaf9293..fe3f304e1d 100644 --- a/testsuites/sptests/sperror01/init.c +++ b/testsuites/sptests/sperror01/init.c @@ -25,13 +25,13 @@ rtems_task Init(rtems_task_argument argument); static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == RTEMS_FATAL_SOURCE_EXIT - && !is_internal + && !always_set_to_false && error == ENOMEM ) { TEST_END(); diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c index 0bb7ceaf34..67fc56da40 100644 --- a/testsuites/sptests/sperror02/init.c +++ b/testsuites/sptests/sperror02/init.c @@ -25,13 +25,13 @@ rtems_task Init(rtems_task_argument argument); static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == RTEMS_FATAL_SOURCE_EXIT - && !is_internal + && !always_set_to_false && error == 1 ) { TEST_END(); diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c index aecdb79288..448848da08 100644 --- a/testsuites/sptests/sperror03/init.c +++ b/testsuites/sptests/sperror03/init.c @@ -22,13 +22,13 @@ rtems_task Init(rtems_task_argument argument); static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == RTEMS_FATAL_SOURCE_EXIT - && !is_internal + && !always_set_to_false && error == 0 ) { TEST_END(); diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c index 1d682557c7..ceb9f60527 100644 --- a/testsuites/sptests/spextensions01/init.c +++ b/testsuites/sptests/spextensions01/init.c @@ -142,7 +142,7 @@ static void zero_thread_exitted(rtems_tcb *a) static void zero_fatal( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -201,7 +201,7 @@ static void one_thread_exitted(rtems_tcb *a) static void one_fatal( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -260,7 +260,7 @@ static void two_thread_exitted(rtems_tcb *a) static void two_fatal( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { @@ -321,7 +321,7 @@ static void three_thread_exitted(rtems_tcb *a) static void three_fatal( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c index 4013b948fc..7d204389b8 100644 --- a/testsuites/sptests/spfatal26/init.c +++ b/testsuites/sptests/spfatal26/init.c @@ -61,12 +61,12 @@ static void Init( rtems_task_argument arg ) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code code ) { rtems_test_assert( source == RTEMS_FATAL_SOURCE_EXCEPTION ); - rtems_test_assert( !is_internal ); + rtems_test_assert( !always_set_to_false ); rtems_exception_frame_print( (const rtems_exception_frame *) code ); diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c index aa49a301ee..f9b2ed37c1 100644 --- a/testsuites/sptests/spfatal_support/init.c +++ b/testsuites/sptests/spfatal_support/init.c @@ -65,7 +65,7 @@ static bool is_expected_error( rtems_fatal_code error ) void Fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { @@ -80,7 +80,7 @@ void Fatal_extension( printk( ")\n" ); } - if ( is_internal ) + if ( always_set_to_false ) printk( "ERROR==> Fatal Extension is internal set to true expected false\n" ); @@ -97,7 +97,7 @@ void Fatal_extension( if ( source == FATAL_ERROR_EXPECTED_SOURCE - && !is_internal + && !always_set_to_false && is_expected_error( error ) ) { TEST_END(); diff --git a/testsuites/sptests/spfatal_support/system.h b/testsuites/sptests/spfatal_support/system.h index 0a01e21d70..ee32428352 100644 --- a/testsuites/sptests/spfatal_support/system.h +++ b/testsuites/sptests/spfatal_support/system.h @@ -28,7 +28,7 @@ rtems_task Init( void Fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ); diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c index 6201aff566..21e42e358b 100644 --- a/testsuites/sptests/spinternalerror01/init.c +++ b/testsuites/sptests/spinternalerror01/init.c @@ -35,13 +35,17 @@ void boot_card( const char *cmdline ) static void fatal_extension( Internal_errors_Source source, - bool is_internal, + bool always_set_to_false, Internal_errors_t error ) { TEST_BEGIN(); - if ( source == FATAL_SOURCE && !is_internal && error == FATAL_ERROR ) { + if ( + source == FATAL_SOURCE + && !always_set_to_false + && error == FATAL_ERROR + ) { TEST_END(); } } diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c index 72e458f167..0c216a3901 100644 --- a/testsuites/sptests/spmutex01/init.c +++ b/testsuites/sptests/spmutex01/init.c @@ -689,14 +689,14 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == INTERNAL_ERROR_CORE - && !is_internal + && !always_set_to_false && error == INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK ) { test_context *ctx = &test_instance; diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c index 1e0d481873..815579a0d9 100644 --- a/testsuites/sptests/spsyslock01/init.c +++ b/testsuites/sptests/spsyslock01/init.c @@ -686,14 +686,14 @@ static void Init(rtems_task_argument arg) static void fatal_extension( rtems_fatal_source source, - bool is_internal, + bool always_set_to_false, rtems_fatal_code error ) { if ( source == INTERNAL_ERROR_CORE - && !is_internal + && !always_set_to_false && error == INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK ) { test_context *ctx = &test_instance; -- cgit v1.2.3