diff options
author | Aun-Ali Zaidi <admin@kodeit.net> | 2015-12-23 14:44:02 -0600 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-12-24 16:52:34 -0600 |
commit | d5154d0f6a04f3b7ed59d9a09038576fe2640756 (patch) | |
tree | 4b6dcf6e9b116223903afbc1b1141d28fb751848 /testsuites/sptests | |
parent | score: Fix watchdog removal (diff) | |
download | rtems-d5154d0f6a04f3b7ed59d9a09038576fe2640756.tar.bz2 |
api: Remove deprecated Notepads
Notepads where a feature of RTEMS' tasks that simply functioned in
the same way as POSIX keys or threaded local storage (TLS). They were
introduced well before per task variables, which are also deprecated,
and were barely used in favor of their POSIX alternatives.
In addition to their scarce usage, Notepads took up unnecessary memory.
For each task:
- 16 32-bit integers were allocated.
- A total of 64 bytes per task per thread.
This is especially critical in low memory and safety-critical applications.
They are also defined as uint32_t, and therefore are not guaranteed to
hold a pointer.
Lastly, they are not portable solutions for SMP and uniprocessor systems,
like POSIX keys and TLS.
updates #2493.
Diffstat (limited to 'testsuites/sptests')
-rw-r--r-- | testsuites/sptests/Makefile.am | 2 | ||||
-rw-r--r-- | testsuites/sptests/configure.ac | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp07/init.c | 18 | ||||
-rw-r--r-- | testsuites/sptests/sp07/sp07.scn | 9 | ||||
-rw-r--r-- | testsuites/sptests/sp07/system.h | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp07/task1.c | 16 | ||||
-rw-r--r-- | testsuites/sptests/sp07/task2.c | 17 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad01/Makefile.am | 22 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad01/init.c | 70 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad01/spnotepad01.doc | 23 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad01/spnotepad01.scn | 4 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad02/Makefile.am | 22 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad02/init.c | 65 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad02/spnotepad02.doc | 0 | ||||
-rw-r--r-- | testsuites/sptests/spnotepad02/spnotepad02.scn | 0 | ||||
-rw-r--r-- | testsuites/sptests/sptask_err04/sptask_err04.doc | 4 | ||||
-rw-r--r-- | testsuites/sptests/sptask_err04/sptask_err04.scn | 6 | ||||
-rw-r--r-- | testsuites/sptests/sptask_err04/system.h | 2 | ||||
-rw-r--r-- | testsuites/sptests/sptask_err04/task1.c | 279 |
19 files changed, 95 insertions, 468 deletions
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index dac14e1408..c5210a5ab9 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -12,7 +12,7 @@ _SUBDIRS = \ sp60 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \ sp70 sp71 sp72 sp73 sp74 sp75 sp76 sp77 sp2038 \ spassoc01 spchain spclockget spcoverage spobjgetnext \ - spnotepad01 spnotepad02 spprintk spprivenv01 sprbtree01 spsize spstkalloc \ + spprintk spprivenv01 sprbtree01 spsize spstkalloc \ spstkalloc02 spthreadq01 spwatchdog spwkspace \ sperror01 sperror02 sperror03 \ spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \ diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 6448e037c4..e46f6fa5a5 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -222,8 +222,6 @@ spmkdir/Makefile spmountmgr01/Makefile spmsgq_err01/Makefile spmsgq_err02/Makefile -spnotepad01/Makefile -spnotepad02/Makefile spnsext01/Makefile spobjgetnext/Makefile sppagesize/Makefile diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c index 0211a94e3a..d5b606d12a 100644 --- a/testsuites/sptests/sp07/init.c +++ b/testsuites/sptests/sp07/init.c @@ -210,24 +210,6 @@ rtems_task Init( directive_failed( status, "rtems_task_restart of TA3" ); assert_extension_counts( &Task_restarted[ 0 ], 0x0 ); - /* - * We know this is deprecated and don't want a warning on every BSP built. - */ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - - status = rtems_task_set_note( Task_id[ 1 ], RTEMS_NOTEPAD_8, 4 ); - directive_failed( status, "task_set_node of TA1" ); - printf( "INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 " ); - puts ( "to TA1's priority: 04" ); - - status = rtems_task_set_note( Task_id[ 2 ], RTEMS_NOTEPAD_8, 4 ); - directive_failed( status, "task_set_node of TA2" ); - printf( "INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 " ); - puts ( "to TA2's priority: 04"); - - #pragma GCC diagnostic pop - status = rtems_task_delete( RTEMS_SELF ); directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); } diff --git a/testsuites/sptests/sp07/sp07.scn b/testsuites/sptests/sp07/sp07.scn index 77a9b24521..414b46754e 100644 --- a/testsuites/sptests/sp07/sp07.scn +++ b/testsuites/sptests/sp07/sp07.scn @@ -10,20 +10,11 @@ rtems_extension_ident -- OK rtems_extension_ident - bad name -- RTEMS_INVALID_NAME rtems_extension_ident - bad name -- RTEMS_INVALID_ADDRESS rtems_extension_create - harmless -- OK -INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 to TA1's priority: 04 -INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 to TA2's priority: 04 <pause> TA1 - rtems_task_set_priority - get initial priority of self: 04 -TA1 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 04 -TA1 - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8: 03 TA1 - rtems_task_set_priority - set TA2's priority: 03 -TA2 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 03 -TA2 - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8: 02 TA2 - rtems_task_set_priority - set TA1's priority: 02 -TA1 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 02 -TA1 - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8: 01 TA1 - rtems_task_set_priority - set TA2's priority: 01 -TA2 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 01 TA2 - rtems_task_suspend - suspend TA1 TA2 - rtems_task_set_priority - set priority of TA1 ( blocked ) TA4 - exitting task diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h index c5374553d5..8bea0fb7f5 100644 --- a/testsuites/sptests/sp07/system.h +++ b/testsuites/sptests/sp07/system.h @@ -64,8 +64,6 @@ void Task_exit_extension( #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS - #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 2 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/sptests/sp07/task1.c b/testsuites/sptests/sp07/task1.c index 18c6375473..c03bea24b4 100644 --- a/testsuites/sptests/sp07/task1.c +++ b/testsuites/sptests/sp07/task1.c @@ -44,14 +44,6 @@ rtems_task Task_1( ); while( FOREVER ) { - status = rtems_task_get_note( my_id, RTEMS_NOTEPAD_8, &the_priority ); - directive_failed( status, "rtems_task_get_note" ); - printf( - "TA1 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - " - "current priority: %02" PRIdrtems_task_priority "\n", - the_priority - ); - if ( --the_priority == 0 ) { puts( "TA1 - rtems_task_suspend - suspend TA2" ); status = rtems_task_suspend( Task_id[ 2 ] ); @@ -69,14 +61,6 @@ rtems_task Task_1( } printf( - "TA1 - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8: " - "%02" PRIdrtems_task_priority "\n", - the_priority - ); - status = rtems_task_set_note( Task_id[ 2 ], RTEMS_NOTEPAD_8, the_priority ); - directive_failed( status, "rtems_task_set_note" ); - - printf( "TA1 - rtems_task_set_priority - set TA2's priority: " "%02" PRIdrtems_task_priority "\n", the_priority diff --git a/testsuites/sptests/sp07/task2.c b/testsuites/sptests/sp07/task2.c index 11165ee73b..4254a94710 100644 --- a/testsuites/sptests/sp07/task2.c +++ b/testsuites/sptests/sp07/task2.c @@ -27,15 +27,6 @@ rtems_task Task_2( rtems_task_priority previous_priority; while( FOREVER ) { - - status = rtems_task_get_note( RTEMS_SELF, RTEMS_NOTEPAD_8, &the_priority ); - directive_failed( status, "rtems_task_get_note" ); - printf( - "TA2 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - " - "current priority: %02" PRIdrtems_task_priority "\n", - the_priority - ); - if ( --the_priority == 0 ) { puts( "TA2 - rtems_task_suspend - suspend TA1" ); status = rtems_task_suspend( Task_id[ 1 ] ); @@ -59,14 +50,6 @@ rtems_task Task_2( } else { printf( - "TA2 - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8: " - "%02" PRIdrtems_task_priority "\n", - the_priority - ); - status = rtems_task_set_note(Task_id[ 1 ], RTEMS_NOTEPAD_8, the_priority); - directive_failed( status, "rtems_task_set_note" ); - - printf( "TA2 - rtems_task_set_priority - set TA1's priority: " "%02" PRIdrtems_task_priority "\n", the_priority diff --git a/testsuites/sptests/spnotepad01/Makefile.am b/testsuites/sptests/spnotepad01/Makefile.am deleted file mode 100644 index e017ac1da2..0000000000 --- a/testsuites/sptests/spnotepad01/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ - -rtems_tests_PROGRAMS = spnotepad01 -spnotepad01_SOURCES = init.c - -dist_rtems_tests_DATA = spnotepad01.scn -dist_rtems_tests_DATA += spnotepad01.doc - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(spnotepad01_OBJECTS) -LINK_LIBS = $(spnotepad01_LDLIBS) - -spnotepad01$(EXEEXT): $(spnotepad01_OBJECTS) $(spnotepad01_DEPENDENCIES) - @rm -f spnotepad01$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spnotepad01/init.c b/testsuites/sptests/spnotepad01/init.c deleted file mode 100644 index 965d69dd2c..0000000000 --- a/testsuites/sptests/spnotepad01/init.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * COPYRIGHT (c) 1989-2009. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "tmacros.h" - -const char rtems_test_name[] = "SPNOTEPAD 1"; - -/* - * We know this is deprecated and don't want a warning on every BSP built. - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -/* forward declarations to avoid warnings */ -rtems_task Init(rtems_task_argument argument); - -rtems_task Init( - rtems_task_argument ignored -) -{ - rtems_status_code status; - uint32_t note; - - TEST_BEGIN(); - - puts( "Init - rtems_task_get_note - RTEMS_NOT_CONFIGURED" ); - status = rtems_task_get_note( rtems_task_self(), 0, ¬e ); - fatal_directive_status( - status, - RTEMS_NOT_CONFIGURED, - "rtems_task_get_note not configured" - ); - - puts( "Init - rtems_task_set_note - RTEMS_NOT_CONFIGURED" ); - status = rtems_task_set_note( rtems_task_self(), 0, 1 ); - fatal_directive_status( - status, - RTEMS_NOT_CONFIGURED, - "rtems_task_set_note not configured" - ); - - TEST_END(); - - rtems_test_exit(0); -} - -/* configuration information */ - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 1 -#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION - -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE - -#define CONFIGURE_INIT - -#include <rtems/confdefs.h> - -/* global variables */ diff --git a/testsuites/sptests/spnotepad01/spnotepad01.doc b/testsuites/sptests/spnotepad01/spnotepad01.doc deleted file mode 100644 index d90c4e197b..0000000000 --- a/testsuites/sptests/spnotepad01/spnotepad01.doc +++ /dev/null @@ -1,23 +0,0 @@ -# COPYRIGHT (c) 1989-2009. -# On-Line Applications Research Corporation (OAR). -# -# The license and distribution terms for this file may be -# found in the file LICENSE in this distribution or at -# http://www.rtems.org/license/LICENSE. -# - -This file describes the directives and concepts tested by this test set. - -test set name: spnotepad01 - -directives: - - rtems_task_get_note - rtems_task_set_note - -concepts: - -+ Ensure that the proper error code is returned by the notepad services - when notepads are not configured. - is less than the minimum. This is mainly to ensure that a branch is taken. - diff --git a/testsuites/sptests/spnotepad01/spnotepad01.scn b/testsuites/sptests/spnotepad01/spnotepad01.scn deleted file mode 100644 index ce1d3b235e..0000000000 --- a/testsuites/sptests/spnotepad01/spnotepad01.scn +++ /dev/null @@ -1,4 +0,0 @@ -*** TEST NOTEPADS DISABLED *** -Init - rtems_task_get_note - RTEMS_NOT_CONFIGURED -Init - rtems_task_set_note - RTEMS_NOT_CONFIGURED -*** END OF TEST NOTEPADS DISABLED *** diff --git a/testsuites/sptests/spnotepad02/Makefile.am b/testsuites/sptests/spnotepad02/Makefile.am deleted file mode 100644 index 943afceed9..0000000000 --- a/testsuites/sptests/spnotepad02/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ - -rtems_tests_PROGRAMS = spnotepad02 -spnotepad02_SOURCES = init.c - -dist_rtems_tests_DATA = spnotepad02.scn -dist_rtems_tests_DATA += spnotepad02.doc - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(spnotepad02_OBJECTS) -LINK_LIBS = $(spnotepad02_LDLIBS) - -spnotepad02$(EXEEXT): $(spnotepad02_OBJECTS) $(spnotepad02_DEPENDENCIES) - @rm -f spnotepad02$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spnotepad02/init.c b/testsuites/sptests/spnotepad02/init.c deleted file mode 100644 index 0c9ba6e3d3..0000000000 --- a/testsuites/sptests/spnotepad02/init.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * COPYRIGHT (c) 1989-2015. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "tmacros.h" - -const char rtems_test_name[] = "SPNOTEPAD 2"; - -/* - * We know this is deprecated and don't want a warning on every BSP built. - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -/* forward declarations to avoid warnings */ -rtems_task Init(rtems_task_argument argument); - -rtems_task Init( - rtems_task_argument ignored -) -{ - rtems_status_code status; - - TEST_BEGIN(); - - status = rtems_task_set_note( rtems_task_self(), RTEMS_NOTEPAD_4, 32 ); - directive_failed( status, "task_set_node of Self id" ); - printf( "INIT - rtems_task_set_note - set my (id) RTEMS_NOTEPAD_4 " ); - puts ( "to TA1's priority: 04" ); - - status = rtems_task_set_note( RTEMS_SELF, RTEMS_NOTEPAD_4, 32 ); - directive_failed( status, "task_set_node of Self 0" ); - printf( "INIT - rtems_task_set_note - set my (SELF) RTEMS_NOTEPAD_4 " ); - puts ( "to TA1's priority: 04" ); - - - TEST_END(); - - rtems_test_exit(0); -} - -/* configuration information */ - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 1 -#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION -#define CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS - -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE - -#define CONFIGURE_INIT - -#include <rtems/confdefs.h> - -/* global variables */ diff --git a/testsuites/sptests/spnotepad02/spnotepad02.doc b/testsuites/sptests/spnotepad02/spnotepad02.doc deleted file mode 100644 index e69de29bb2..0000000000 --- a/testsuites/sptests/spnotepad02/spnotepad02.doc +++ /dev/null diff --git a/testsuites/sptests/spnotepad02/spnotepad02.scn b/testsuites/sptests/spnotepad02/spnotepad02.scn deleted file mode 100644 index e69de29bb2..0000000000 --- a/testsuites/sptests/spnotepad02/spnotepad02.scn +++ /dev/null diff --git a/testsuites/sptests/sptask_err04/sptask_err04.doc b/testsuites/sptests/sptask_err04/sptask_err04.doc index 3773cb61ec..e64fd1d946 100644 --- a/testsuites/sptests/sptask_err04/sptask_err04.doc +++ b/testsuites/sptests/sptask_err04/sptask_err04.doc @@ -12,8 +12,8 @@ This file describes the directives and concepts tested by this test set. test set name: sptask_err04 directives: - t_delete, t_getnote, t_ident, t_restart, t_resume, t_setpriority, - t_mode, t_start, t_suspend, + t_delete, t_ident, t_restart, t_resume, t_setpriority, t_mode, + t_start, t_suspend, concepts: diff --git a/testsuites/sptests/sptask_err04/sptask_err04.scn b/testsuites/sptests/sptask_err04/sptask_err04.scn index c21cce3620..54bea059f0 100644 --- a/testsuites/sptests/sptask_err04/sptask_err04.scn +++ b/testsuites/sptests/sptask_err04/sptask_err04.scn @@ -1,10 +1,6 @@ *** TEST TASK ERROR 04 *** TA1 - rtems_task_is_suspended - RTEMS_INVALID_ID TA1 - rtems_task_delete - RTEMS_INVALID_ID -TA1 - rtems_task_get_note - RTEMS_INVALID_ADDRESS -TA1 - rtems_task_get_note - RTEMS_INVALID_NUMBER -TA1 - rtems_task_get_note - RTEMS_INVALID_ID -TA1 - rtems_task_get_note - RTEMS_INVALID_ID TA1 - rtems_task_ident - RTEMS_INVALID_ADDRESS TA1 - rtems_task_ident - global RTEMS_INVALID_NAME TA1 - rtems_task_ident - local RTEMS_INVALID_NAME @@ -15,8 +11,6 @@ TA1 - rtems_task_resume - RTEMS_INCORRECT_STATE TA1 - rtems_task_set_priority - RTEMS_INVALID_ADDRESS TA1 - rtems_task_set_priority - RTEMS_INVALID_PRIORITY TA1 - rtems_task_set_priority - RTEMS_INVALID_ID -TA1 - rtems_task_set_note - RTEMS_INVALID_NUMBER -TA1 - rtems_task_set_note - RTEMS_INVALID_ID TA1 - rtems_task_start - RTEMS_INVALID_ID TA1 - rtems_task_start - RTEMS_INCORRECT_STATE TA1 - rtems_task_suspend - RTEMS_INVALID_ID diff --git a/testsuites/sptests/sptask_err04/system.h b/testsuites/sptests/sptask_err04/system.h index a5cd32ac2f..60a7652444 100644 --- a/testsuites/sptests/sptask_err04/system.h +++ b/testsuites/sptests/sptask_err04/system.h @@ -29,8 +29,6 @@ rtems_task Task_1( #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS - #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/testsuites/sptests/sptask_err04/task1.c b/testsuites/sptests/sptask_err04/task1.c index f7bd98b979..c84ef826a2 100644 --- a/testsuites/sptests/sptask_err04/task1.c +++ b/testsuites/sptests/sptask_err04/task1.c @@ -27,7 +27,6 @@ rtems_task Task_1( rtems_task_argument argument ) { - uint32_t notepad_value; rtems_id self_id; rtems_task_priority previous_priority; rtems_status_code status; @@ -50,203 +49,109 @@ rtems_task Task_1( ); puts( "TA1 - rtems_task_delete - RTEMS_INVALID_ID" ); - /** START OF NOTEPAD TESTS **/ - - /* - * We know this is deprecated and don't want a warning on every BSP built. - */ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - - /* NULL return */ - status = rtems_task_get_note( RTEMS_SELF, RTEMS_NOTEPAD_FIRST, NULL ); - fatal_directive_status( - status, - RTEMS_INVALID_ADDRESS, - "rtems_task_get_note with NULL param" - ); - puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_ADDRESS" ); - - /* note too high */ - status = rtems_task_get_note( RTEMS_SELF, 100, ¬epad_value ); - fatal_directive_status( - status, - RTEMS_INVALID_NUMBER, - "rtems_task_get_note with illegal notepad" - ); - puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_NUMBER" ); - - /* bad Id */ - status = rtems_task_get_note( 100, RTEMS_NOTEPAD_LAST, ¬epad_value ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_get_note with illegal id" - ); - puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_ID" ); - - /* unused Id so invalid now */ - status = rtems_task_get_note( - Task_id[ 0 ], - RTEMS_NOTEPAD_LAST, - ¬epad_value - ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_get_note with illegal id" - ); - puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_ID" ); - - status = rtems_task_get_note( - _RTEMS_tasks_Information.Objects.minimum_id + (3L<<OBJECTS_API_START_BIT), - RTEMS_NOTEPAD_LAST, - ¬epad_value - ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_get_note with illegal id" - ); - - status = rtems_task_get_note( - rtems_build_id( OBJECTS_CLASSIC_API, 2, 1, 1 ), - RTEMS_NOTEPAD_LAST, - ¬epad_value - ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_get_note with non-task ID" - ); - - /* NULL param */ - status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, NULL ); - fatal_directive_status( - status, - RTEMS_INVALID_ADDRESS, - "rtems_task_ident NULL param" - ); - puts( "TA1 - rtems_task_ident - RTEMS_INVALID_ADDRESS" ); - - /* OK */ - status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &self_id ); - directive_failed( status, "rtems_task_ident of self" ); - if ( self_id != Task_id[ 1 ] ) { - puts( "ERROR - rtems_task_ident - incorrect ID returned!" ); - } - puts( "TA1 - rtems_task_ident - current task RTEMS_SUCCESSFUL" ); - - status = rtems_task_ident( 100, RTEMS_SEARCH_ALL_NODES, &Junk_id ); - fatal_directive_status( - status, - RTEMS_INVALID_NAME, - "rtems_task_ident with illegal name (local)" - ); - puts( "TA1 - rtems_task_ident - global RTEMS_INVALID_NAME" ); - - status = rtems_task_ident( 100, 1, &Junk_id ); - fatal_directive_status( - status, - RTEMS_INVALID_NAME, - "rtems_task_ident with illegal name (global)" - ); - puts( "TA1 - rtems_task_ident - local RTEMS_INVALID_NAME" ); - - /* - * This one case is different if MP is enabled/disabled. - */ + /* NULL param */ + status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, NULL ); + fatal_directive_status( + status, + RTEMS_INVALID_ADDRESS, + "rtems_task_ident NULL param" + ); + puts( "TA1 - rtems_task_ident - RTEMS_INVALID_ADDRESS" ); - status = rtems_task_ident( 100, 2, &Junk_id ); - #if defined(RTEMS_MULTIPROCESSING) - fatal_directive_status( - status, - RTEMS_INVALID_NODE, - "rtems_task_ident with illegal node" - ); - #else - fatal_directive_status( - status, - RTEMS_INVALID_NAME, - "rtems_task_ident with illegal node" - ); - #endif - puts( "TA1 - rtems_task_ident - RTEMS_INVALID_NODE" ); + /* OK */ + status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &self_id ); + directive_failed( status, "rtems_task_ident of self" ); + if ( self_id != Task_id[ 1 ] ) { + puts( "ERROR - rtems_task_ident - incorrect ID returned!" ); + } + puts( "TA1 - rtems_task_ident - current task RTEMS_SUCCESSFUL" ); - status = rtems_task_restart( 100, 0 ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_restart with illegal id" - ); - puts( "TA1 - rtems_task_restart - RTEMS_INVALID_ID" ); + status = rtems_task_ident( 100, RTEMS_SEARCH_ALL_NODES, &Junk_id ); + fatal_directive_status( + status, + RTEMS_INVALID_NAME, + "rtems_task_ident with illegal name (local)" + ); + puts( "TA1 - rtems_task_ident - global RTEMS_INVALID_NAME" ); - status = rtems_task_resume( 100 ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_resume with illegal id" - ); - puts( "TA1 - rtems_task_resume - RTEMS_INVALID_ID" ); + status = rtems_task_ident( 100, 1, &Junk_id ); + fatal_directive_status( + status, + RTEMS_INVALID_NAME, + "rtems_task_ident with illegal name (global)" + ); + puts( "TA1 - rtems_task_ident - local RTEMS_INVALID_NAME" ); - status = rtems_task_resume( RTEMS_SELF ); - fatal_directive_status( - status, - RTEMS_INCORRECT_STATE, - "rtems_task_resume of ready task" - ); - puts( "TA1 - rtems_task_resume - RTEMS_INCORRECT_STATE" ); + /* + * This one case is different if MP is enabled/disabled. + */ - /* NULL param */ - status = rtems_task_set_priority( RTEMS_SELF, RTEMS_CURRENT_PRIORITY, NULL ); - fatal_directive_status( - status, - RTEMS_INVALID_ADDRESS, - "rtems_task_set_priority with NULL param" - ); - puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_ADDRESS" ); + status = rtems_task_ident( 100, 2, &Junk_id ); +#if defined(RTEMS_MULTIPROCESSING) + fatal_directive_status( + status, + RTEMS_INVALID_NODE, + "rtems_task_ident with illegal node" + ); +#else + fatal_directive_status( + status, + RTEMS_INVALID_NAME, + "rtems_task_ident with illegal node" + ); +#endif + puts( "TA1 - rtems_task_ident - RTEMS_INVALID_NODE" ); - /* bad priority */ - status = rtems_task_set_priority( RTEMS_SELF, 512, &previous_priority ); - fatal_directive_status( - status, - RTEMS_INVALID_PRIORITY, - "rtems_task_set_priority with illegal priority" - ); - puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_PRIORITY" ); + status = rtems_task_restart( 100, 0 ); + fatal_directive_status( + status, + RTEMS_INVALID_ID, + "rtems_task_restart with illegal id" + ); + puts( "TA1 - rtems_task_restart - RTEMS_INVALID_ID" ); - /* bad Id */ - status = rtems_task_set_priority( 100, 8, &previous_priority ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_set_priority with illegal id" - ); - puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_ID" ); + status = rtems_task_resume( 100 ); + fatal_directive_status( + status, + RTEMS_INVALID_ID, + "rtems_task_resume with illegal id" + ); + puts( "TA1 - rtems_task_resume - RTEMS_INVALID_ID" ); - status = rtems_task_set_note( - RTEMS_SELF, - RTEMS_NOTEPAD_LAST+10, - notepad_value - ); - fatal_directive_status( - status, - RTEMS_INVALID_NUMBER, - "rtems_task_set_note with illegal notepad" - ); - puts( "TA1 - rtems_task_set_note - RTEMS_INVALID_NUMBER" ); + status = rtems_task_resume( RTEMS_SELF ); + fatal_directive_status( + status, + RTEMS_INCORRECT_STATE, + "rtems_task_resume of ready task" + ); + puts( "TA1 - rtems_task_resume - RTEMS_INCORRECT_STATE" ); - status = rtems_task_set_note( 100, RTEMS_NOTEPAD_LAST, notepad_value ); - fatal_directive_status( - status, - RTEMS_INVALID_ID, - "rtems_task_set_note with illegal id" - ); - puts( "TA1 - rtems_task_set_note - RTEMS_INVALID_ID" ); + /* NULL param */ + status = rtems_task_set_priority( RTEMS_SELF, RTEMS_CURRENT_PRIORITY, NULL ); + fatal_directive_status( + status, + RTEMS_INVALID_ADDRESS, + "rtems_task_set_priority with NULL param" + ); + puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_ADDRESS" ); - #pragma GCC diagnostic pop + /* bad priority */ + status = rtems_task_set_priority( RTEMS_SELF, 512, &previous_priority ); + fatal_directive_status( + status, + RTEMS_INVALID_PRIORITY, + "rtems_task_set_priority with illegal priority" + ); + puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_PRIORITY" ); - /** END OF NOTEPAD TESTS **/ + /* bad Id */ + status = rtems_task_set_priority( 100, 8, &previous_priority ); + fatal_directive_status( + status, + RTEMS_INVALID_ID, + "rtems_task_set_priority with illegal id" + ); + puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_ID" ); status = rtems_task_start( 100, Task_1, 0 ); fatal_directive_status( |