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 | |
| 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.
128 files changed, 118 insertions, 2594 deletions
diff --git a/c/src/ada-tests/ada_mvscn b/c/src/ada-tests/ada_mvscn index 940aff8dce..8c6a5b0a5b 100644 --- a/c/src/ada-tests/ada_mvscn +++ b/c/src/ada-tests/ada_mvscn @@ -11,7 +11,6 @@ done <<EOF ./sptests/sp17/sp17.scn ./sptests/sp19/sp19.scn ./sptests/sp09/sp09.scn -./sptests/sp07/sp07.scn ./sptests/sp12/sp12.scn ./sptests/sp14/sp14.scn ./sptests/sp03/sp03.scn diff --git a/c/src/ada-tests/configure.ac b/c/src/ada-tests/configure.ac index 4a2a39d6d1..a94dbd747a 100644 --- a/c/src/ada-tests/configure.ac +++ b/c/src/ada-tests/configure.ac @@ -117,9 +117,6 @@ mptests/Makefile mptests/mp01/Makefile mptests/mp01/node1/Makefile mptests/mp01/node2/Makefile -mptests/mp02/Makefile -mptests/mp02/node1/Makefile -mptests/mp02/node2/Makefile mptests/mp03/Makefile mptests/mp03/node1/Makefile mptests/mp03/node2/Makefile diff --git a/c/src/ada-tests/mptests/Makefile.am b/c/src/ada-tests/mptests/Makefile.am index c99687e283..970f732881 100644 --- a/c/src/ada-tests/mptests/Makefile.am +++ b/c/src/ada-tests/mptests/Makefile.am @@ -1,6 +1,5 @@ SUBDIRS = SUBDIRS += mp01 -SUBDIRS += mp02 SUBDIRS += mp03 SUBDIRS += mp04 SUBDIRS += mp05 diff --git a/c/src/ada-tests/mptests/mp02/Makefile.am b/c/src/ada-tests/mptests/mp02/Makefile.am deleted file mode 100644 index 0ad1000d4d..0000000000 --- a/c/src/ada-tests/mptests/mp02/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = node1 node2 - -include $(top_srcdir)/../../../testsuites/automake/subdirs.am -include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp02/config_base.h b/c/src/ada-tests/mptests/mp02/config_base.h deleted file mode 100644 index 2f9df40e53..0000000000 --- a/c/src/ada-tests/mptests/mp02/config_base.h +++ /dev/null @@ -1,30 +0,0 @@ -/* config_base.h - * - * This include file defines all of the Configuration Table for this test - * EXCEPT the NODE NUMBER. - * - * COPYRIGHT (c) 1989-2007. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - - - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_POSIX_INIT_THREAD_TABLE - -#define CONFIGURE_MAXIMUM_TASKS 2 - -#define CONFIGURE_MAXIMUM_POSIX_THREADS 10 -#define CONFIGURE_MAXIMUM_POSIX_KEYS 10 -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20 -#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10 - -#include <rtems/confdefs.h> - -/* end of include file */ diff --git a/c/src/ada-tests/mptests/mp02/mptest.adb b/c/src/ada-tests/mptests/mp02/mptest.adb deleted file mode 100644 index 4bdd0cf587..0000000000 --- a/c/src/ada-tests/mptests/mp02/mptest.adb +++ /dev/null @@ -1,207 +0,0 @@ --- --- MPTEST / BODY --- --- DESCRIPTION: --- --- This package is the implementation for Test 2 of the RTEMS --- Multiprocessor Test Suite. --- --- DEPENDENCIES: --- --- --- --- COPYRIGHT (c) 1989-2011. --- On-Line Applications Research Corporation (OAR). --- --- The license and distribution terms for this file may in --- the file LICENSE in this distribution or at --- http://www.rtems.org/license/LICENSE. --- - -with INTERFACES; use INTERFACES; -with RTEMS; -with RTEMS.TASKS; -with TEST_SUPPORT; -with TEXT_IO; -with UNSIGNED32_IO; - -package body MPTEST is - --- --- INIT --- - - procedure INIT ( - ARGUMENT : in RTEMS.TASKS.ARGUMENT - ) is - STATUS : RTEMS.STATUS_CODES; - begin - - TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 2 -- NODE " ); - UNSIGNED32_IO.PUT( - TEST_SUPPORT.NODE, - WIDTH => 1 - ); - TEXT_IO.PUT_LINE( " ***" ); - - MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( '1', '1', '1', ' ' ); - MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( '2', '2', '2', ' ' ); - - TEXT_IO.PUT_LINE( "Creating test task (Global)" ); - - RTEMS.TASKS.CREATE( - MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), - 1, - 2048, - RTEMS.NO_PREEMPT, - RTEMS.GLOBAL, - MPTEST.TASK_ID( 1 ), - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" ); - - RTEMS.TASKS.START( - MPTEST.TASK_ID( 1 ), - MPTEST.TEST_TASK'ACCESS, - 0, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" ); - - RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); - - end INIT; - --- --- TEST_TASK --- - - procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASKS.ARGUMENT - ) is - TID : RTEMS.ID; - TEST_TID : RTEMS.ID; - REMOTE_TID : RTEMS.ID; - REMOTE_NODE : RTEMS.UNSIGNED32; - NOTE : RTEMS.UNSIGNED32; - STATUS : RTEMS.STATUS_CODES; - begin - - RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" ); - - if TEST_SUPPORT.NODE = 1 then - REMOTE_NODE := 2; - else - REMOTE_NODE := 1; - end if; - - TEXT_IO.PUT_LINE( "Getting TID of remote task (all nodes)" ); - - loop - - RTEMS.TASKS.IDENT( - MPTEST.TASK_NAME( REMOTE_NODE ), - RTEMS.SEARCH_ALL_NODES, - REMOTE_TID, - STATUS - ); - - exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS ); - - end loop; - - -- - -- We just got this ID above so looping is not necessary. - -- - - TEXT_IO.PUT_LINE( "Getting TID of remote task (1 node)" ); - RTEMS.TASKS.IDENT( - MPTEST.TASK_NAME( REMOTE_NODE ), - REMOTE_NODE, - TEST_TID, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT" ); - - if TEST_TID /= REMOTE_TID then - TEXT_IO.PUT_LINE( "task_ident tid's do not match!!" ); - RTEMS.SHUTDOWN_EXECUTIVE( 0 ); - end if; - - RTEMS.TASKS.DELETE( REMOTE_TID, STATUS ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.ILLEGAL_ON_REMOTE_OBJECT, - "task_delete of remote task" - ); - TEXT_IO.PUT_LINE( - "task_delete of remote task returned the correct error" - ); - - RTEMS.TASKS.START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.ILLEGAL_ON_REMOTE_OBJECT, - "task_start of remote task" - ); - TEXT_IO.PUT_LINE( - "task_start of remote task returned the correct error" - ); - - RTEMS.TASKS.RESTART( REMOTE_TID, 0, STATUS ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.ILLEGAL_ON_REMOTE_OBJECT, - "task_restart of remote task" - ); - TEXT_IO.PUT_LINE( - "task_restart of remote task returned the correct error" - ); - - - TEXT_IO.PUT( "Setting notepad " ); - UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 ); - TEXT_IO.PUT( " of the remote task to " ); - UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 ); - TEXT_IO.NEW_LINE; - RTEMS.TASKS.SET_NOTE( - REMOTE_TID, - RTEMS.GET_NODE( TID ), - RTEMS.GET_NODE( TID ), - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" ); - - TEXT_IO.PUT_LINE( "Getting a notepad of the remote task" ); - RTEMS.TASKS.GET_NOTE( - REMOTE_TID, - RTEMS.GET_NODE( TID ), - NOTE, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" ); - - if NOTE = RTEMS.GET_NODE( TID ) then - TEXT_IO.PUT_LINE( "Remote notepad set and read correctly" ); - else - TEXT_IO.PUT( - "FAILURE!!! Remote notepad was not set and read correctly (" - ); - UNSIGNED32_IO.PUT( NOTE ); - TEXT_IO.PUT( ", " ); - UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ) ); - TEXT_IO.PUT_LINE( ")" ); - - end if; - - RTEMS.TASKS.DELETE( REMOTE_TID, STATUS ); - TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" ); - - RTEMS.SHUTDOWN_EXECUTIVE( 0 ); - - end TEST_TASK; - -end MPTEST; diff --git a/c/src/ada-tests/mptests/mp02/mptest.ads b/c/src/ada-tests/mptests/mp02/mptest.ads deleted file mode 100644 index 14a3eb43bf..0000000000 --- a/c/src/ada-tests/mptests/mp02/mptest.ads +++ /dev/null @@ -1,60 +0,0 @@ --- --- MPTEST / SPECIFICATION --- --- DESCRIPTION: --- --- This package is the specification for Test 2 of the RTEMS --- Multiprocessor Test Suite. --- --- DEPENDENCIES: --- --- --- --- COPYRIGHT (c) 1989-2011. --- On-Line Applications Research Corporation (OAR). --- --- The license and distribution terms for this file may in --- the file LICENSE in this distribution or at --- http://www.rtems.org/license/LICENSE. --- - -with RTEMS; -with RTEMS.TASKS; - -package MPTEST is - --- --- These arrays contain the IDs and NAMEs of all RTEMS tasks created --- by this test. --- - - TASK_ID : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID; - TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME; - --- --- INIT --- --- DESCRIPTION: --- --- This RTEMS task initializes the application. --- - - procedure INIT ( - ARGUMENT : in RTEMS.TASKS.ARGUMENT - ); - pragma Convention (C, INIT); - --- --- TEST_TASK --- --- DESCRIPTION: --- --- This is the body of the RTEMS tasks which constitute this test. --- - - procedure TEST_TASK ( - ARGUMENT : in RTEMS.TASKS.ARGUMENT - ); - pragma Convention (C, TEST_TASK); - -end MPTEST; diff --git a/c/src/ada-tests/mptests/mp02/node1/Makefile.am b/c/src/ada-tests/mptests/mp02/node1/Makefile.am deleted file mode 100644 index 3d25f17684..0000000000 --- a/c/src/ada-tests/mptests/mp02/node1/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../testsuites/automake/compile.am - -include $(top_srcdir)/ada.am - -AM_ADAFLAGS += -I$(srcdir)/.. - -noinst_PROGRAMS = mp02_ada_mp02_node1 -mp02_ada_mp02_node1_SOURCES = mp02_node1.adb ../mptest.adb config.h -mp02_ada_mp02_node1_SOURCES += ../mptest.ads -mp02_ada_mp02_node1_SOURCES += ../../../support/init.c - -mp02_ada_mp02_node1$(EXEEXT): mp02_node1.adb ../mptest.adb init.$(OBJEXT) - $(GNATCOMPILE) -margs -a $< -o $@ - -scndir = $(rtems_ada_testsdir) -dist_scn_DATA = ada_mp02-node1.scn - -include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp02/node1/ada_mp02-node1.scn b/c/src/ada-tests/mptests/mp02/node1/ada_mp02-node1.scn deleted file mode 100644 index 91b57321f7..0000000000 --- a/c/src/ada-tests/mptests/mp02/node1/ada_mp02-node1.scn +++ /dev/null @@ -1,11 +0,0 @@ -*** TEST 2 -- NODE 1 *** -Creating test task (Global) -Getting TID of remote task (all nodes) -Getting TID of remote task (1 node) -task_delete of remote task returned the correct error -task_start of remote task returned the correct error -task_restart of remote task returned the correct error -Setting notepad 1 of the remote task to 1 -Getting a notepad of the remote task -Remote notepad set and read correctly -*** END OF TEST 2 *** diff --git a/c/src/ada-tests/mptests/mp02/node1/config.h b/c/src/ada-tests/mptests/mp02/node1/config.h deleted file mode 100644 index 36c9d133e8..0000000000 --- a/c/src/ada-tests/mptests/mp02/node1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* config.h - * - * This include file defines the Configuration Table for this test. - * - * COPYRIGHT (c) 1989-2007. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - - -/* configuration information */ - -#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_MP_NODE_NUMBER 1 - -#include "../config_base.h" - -/* end of include file */ diff --git a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb b/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb deleted file mode 100644 index 739e56d26e..0000000000 --- a/c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb +++ /dev/null @@ -1,56 +0,0 @@ --- --- MAIN / BODY --- --- DESCRIPTION: --- --- This is the entry point for Test MP02_NODE1 of the Multiprocessor --- Test Suite. --- --- DEPENDENCIES: --- --- --- --- COPYRIGHT (c) 1989-2011. --- On-Line Applications Research Corporation (OAR). --- --- The license and distribution terms for this file may in --- the file LICENSE in this distribution or at --- http://www.rtems.org/license/LICENSE. --- - -with RTEMS; -with RTEMS.TASKS; -with MPTEST; -with TEST_SUPPORT; - -procedure MP02_NODE1 is - INIT_ID : RTEMS.ID; - STATUS : RTEMS.STATUS_CODES; -begin - - RTEMS.TASKS.CREATE( - RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), - 1, - RTEMS.MINIMUM_STACK_SIZE, - RTEMS.NO_PREEMPT, - RTEMS.DEFAULT_ATTRIBUTES, - INIT_ID, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - - - RTEMS.TASKS.START( - INIT_ID, - MPTEST.INIT'ACCESS, - 0, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" ); - - loop - delay 120.0; - end loop; - -end MP02_NODE1; - diff --git a/c/src/ada-tests/mptests/mp02/node2/Makefile.am b/c/src/ada-tests/mptests/mp02/node2/Makefile.am deleted file mode 100644 index 877cb51869..0000000000 --- a/c/src/ada-tests/mptests/mp02/node2/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../testsuites/automake/compile.am - -include $(top_srcdir)/ada.am - -AM_ADAFLAGS += -I$(srcdir)/.. - -noinst_PROGRAMS = mp02_ada_mp02_node2 -mp02_ada_mp02_node2_SOURCES = mp02_node2.adb ../mptest.adb config.h -mp02_ada_mp02_node2_SOURCES += ../mptest.ads -mp02_ada_mp02_node2_SOURCES += ../../../support/init.c - -mp02_ada_mp02_node2$(EXEEXT): mp02_node2.adb ../mptest.adb init.$(OBJEXT) - $(GNATCOMPILE) -margs -a $< -o $@ - -scndir = $(rtems_ada_testsdir) -dist_scn_DATA = ada_mp02-node2.scn - -include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp02/node2/ada_mp02-node2.scn b/c/src/ada-tests/mptests/mp02/node2/ada_mp02-node2.scn deleted file mode 100644 index 14239a546d..0000000000 --- a/c/src/ada-tests/mptests/mp02/node2/ada_mp02-node2.scn +++ /dev/null @@ -1,11 +0,0 @@ -*** TEST 2 -- NODE 2 *** -Creating test task (Global) -Getting TID of remote task (all nodes) -Getting TID of remote task (1 node) -task_delete of remote task returned the correct error -task_start of remote task returned the correct error -task_restart of remote task returned the correct error -Setting notepad 2 of the remote task to 2 -Getting a notepad of the remote task -Remote notepad set and read correctly -*** END OF TEST 2 *** diff --git a/c/src/ada-tests/mptests/mp02/node2/config.h b/c/src/ada-tests/mptests/mp02/node2/config.h deleted file mode 100644 index 47edf66149..0000000000 --- a/c/src/ada-tests/mptests/mp02/node2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* config.h - * - * This include file defines the Configuration Table for this test. - * - * COPYRIGHT (c) 1989-2007. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - - -/* configuration information */ - -#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_MP_NODE_NUMBER 2 - -#include "../config_base.h" - -/* end of include file */ diff --git a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb b/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb deleted file mode 100644 index 0e6b5fd698..0000000000 --- a/c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb +++ /dev/null @@ -1,56 +0,0 @@ --- --- MAIN / BODY --- --- DESCRIPTION: --- --- This is the entry point for Test MP02_NODE2 of the Multiprocessor --- Test Suite. --- --- DEPENDENCIES: --- --- --- --- COPYRIGHT (c) 1989-2011. --- On-Line Applications Research Corporation (OAR). --- --- The license and distribution terms for this file may in --- the file LICENSE in this distribution or at --- http://www.rtems.org/license/LICENSE. --- - -with RTEMS; -with RTEMS.TASKS; -with MPTEST; -with TEST_SUPPORT; - -procedure MP02_NODE2 is - INIT_ID : RTEMS.ID; - STATUS : RTEMS.STATUS_CODES; -begin - - RTEMS.TASKS.CREATE( - RTEMS.BUILD_NAME( 'I', 'N', 'I', 'T' ), - 1, - RTEMS.MINIMUM_STACK_SIZE, - RTEMS.NO_PREEMPT, - RTEMS.DEFAULT_ATTRIBUTES, - INIT_ID, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" ); - - - RTEMS.TASKS.START( - INIT_ID, - MPTEST.INIT'ACCESS, - 0, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" ); - - loop - delay 120.0; - end loop; - -end MP02_NODE2; - diff --git a/c/src/ada-tests/sptests/sp07/ada_sp07.scn b/c/src/ada-tests/sptests/sp07/ada_sp07.scn index b048411960..9748dda74c 100644 --- a/c/src/ada-tests/sptests/sp07/ada_sp07.scn +++ b/c/src/ada-tests/sptests/sp07/ada_sp07.scn @@ -8,20 +8,11 @@ TASKS_START - TA2 - started. TASKS_START - TA3 - started. TASKS_START - TA4 - started. TASKS_RESTART - TA3 - restarted. -INIT - task_set_note - set TA1's NOTEPAD_8 to TA1's initial priority: 4 -INIT - task_set_note - set TA2's NOTEPAD_8 to TA2's initial priority: 4 <pause> TA1 - task_set_priority - get initial priority of self: 4 -TA1 - task_get_note - get NOTEPAD_8 - current priority: 4 -TA1 - task_set_note - set TA2's NOTEPAD_8: 3 TA1 - task_set_priority - set TA2's priority: 3 -TA2 - task_get_note - get NOTEPAD_8 - current priority: 3 -TA2 - task_set_note - set TA1's NOTEPAD_8: 2 TA2 - task_set_priority - set TA1's priority: 2 -TA1 - task_get_note - get NOTEPAD_8 - current priority: 2 -TA1 - task_set_note - set TA2's NOTEPAD_8: 1 TA1 - task_set_priority - set TA2's priority: 1 -TA2 - task_get_note - get NOTEPAD_8 - current priority: 1 TA2 - task_suspend - suspend TA1 TA2 - task_set_priority - set priority of TA1 ( blocked ) TASKS_DELETE - TA2 deleting TA1 diff --git a/c/src/ada-tests/sptests/sp07/sptest.adb b/c/src/ada-tests/sptests/sp07/sptest.adb index 300ad90d50..d55aa73bf8 100644 --- a/c/src/ada-tests/sptests/sp07/sptest.adb +++ b/c/src/ada-tests/sptests/sp07/sptest.adb @@ -229,16 +229,6 @@ package body SPTEST is Flush_Task_Event_Log; - RTEMS.TASKS.SET_NOTE( SPTEST.TASK_ID( 1 ), 8, 4, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE OF TA1" ); - TEXT_IO.PUT( "INIT - task_set_note - set TA1's NOTEPAD_8" ); - TEXT_IO.PUT_LINE( " to TA1's initial priority: 4" ); - - RTEMS.TASKS.SET_NOTE( SPTEST.TASK_ID( 2 ), 8, 4, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE OF TA2" ); - TEXT_IO.PUT( "INIT - task_set_note - set TA2's NOTEPAD_8" ); - TEXT_IO.PUT_LINE( " to TA2's initial priority: 4" ); - RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); @@ -273,13 +263,6 @@ package body SPTEST is loop - RTEMS.TASKS.GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" ); - TEXT_IO.PUT( "TA1 - task_get_note - "); - TEXT_IO.PUT( "get NOTEPAD_8 - current priority: " ); - UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); - TEXT_IO.NEW_LINE; - THE_PRIORITY := THE_PRIORITY - 1; if THE_PRIORITY = 0 then @@ -305,17 +288,6 @@ package body SPTEST is end if; - TEXT_IO.PUT( "TA1 - task_set_note - set TA2's NOTEPAD_8: " ); - UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); - TEXT_IO.NEW_LINE; - RTEMS.TASKS.SET_NOTE( - SPTEST.TASK_ID( 2 ), - 8, - THE_PRIORITY, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" ); - TEXT_IO.PUT("TA1 - task_set_priority - set TA2's priority: "); UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); TEXT_IO.NEW_LINE; @@ -346,13 +318,6 @@ package body SPTEST is loop - RTEMS.TASKS.GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" ); - TEXT_IO.PUT( "TA2 - task_get_note - "); - TEXT_IO.PUT( "get NOTEPAD_8 - current priority: " ); - UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); - TEXT_IO.NEW_LINE; - THE_PRIORITY := THE_PRIORITY - 1; if THE_PRIORITY = 0 then @@ -387,17 +352,6 @@ package body SPTEST is else - TEXT_IO.PUT( "TA2 - task_set_note - set TA1's NOTEPAD_8: " ); - UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 ); - TEXT_IO.NEW_LINE; - RTEMS.TASKS.SET_NOTE( - SPTEST.TASK_ID( 1 ), - 8, - THE_PRIORITY, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" ); - TEXT_IO.PUT( "TA2 - task_set_priority - "); TEXT_IO.PUT( "set TA1's priority: "); UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2); diff --git a/c/src/ada-tests/sptests/sp09/ada_sp09.scn b/c/src/ada-tests/sptests/sp09/ada_sp09.scn index 8fb09cd35a..de199d7dd5 100644 --- a/c/src/ada-tests/sptests/sp09/ada_sp09.scn +++ b/c/src/ada-tests/sptests/sp09/ada_sp09.scn @@ -2,8 +2,6 @@ INIT - task_create - INVALID_PRIORITY INIT - task_restart - INCORRECT_STATE TA1 - task_delete - INVALID_ID -TA1 - task_get_note - INVALID_NUMBER -TA1 - task_get_note - INVALID_ID TA1 - task_ident - current task SUCCESSFUL TA1 - task_ident - global INVALID_NAME TA1 - task_ident - local INVALID_NAME @@ -13,8 +11,6 @@ TA1 - task_resume - INVALID_ID TA1 - task_resume - INCORRECT_STATE TA1 - task_set_priority - INVALID_PRIORITY TA1 - task_set_priority - INVALID_ID -TA1 - task_set_note - INVALID_NUMBER -TA1 - task_set_note - INVALID_ID TA1 - task_start - INVALID_ID TA1 - task_start - INCORRECT_STATE TA1 - task_suspend - INVALID_ID diff --git a/c/src/ada-tests/sptests/sp09/sptest.adb b/c/src/ada-tests/sptests/sp09/sptest.adb index 5b3de76fd8..0eb96e8e3e 100644 --- a/c/src/ada-tests/sptests/sp09/sptest.adb +++ b/c/src/ada-tests/sptests/sp09/sptest.adb @@ -148,7 +148,6 @@ package body SPTEST is procedure SCREEN_1 is - NOTEPAD_VALUE : RTEMS.UNSIGNED32 := 0; SELF_ID : RTEMS.ID; PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; @@ -162,38 +161,6 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_delete - INVALID_ID" ); - begin - RTEMS.TASKS.GET_NOTE( RTEMS.SELF, - RTEMS.NOTEPAD_INDEX'LAST + 10, - NOTEPAD_VALUE, - STATUS - ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.INVALID_NUMBER, - "TASK_GET_NOTE WITH ILLEGAL NOTEPAD" - ); - TEXT_IO.PUT_LINE( "TA1 - task_get_note - INVALID_NUMBER" ); - exception - when others => - TEXT_IO.PUT_LINE( - "TA1 - task_get_note - INVALID_NUMBER -- constraint error" - ); - end; - - RTEMS.TASKS.GET_NOTE( - 100, - RTEMS.NOTEPAD_INDEX'LAST, - NOTEPAD_VALUE, - STATUS - ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.INVALID_ID, - "TASK_GET_NOTE WITH ILLEGAL ID" - ); - TEXT_IO.PUT_LINE( "TA1 - task_get_note - INVALID_ID" ); - RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, @@ -295,38 +262,6 @@ package body SPTEST is ); TEXT_IO.PUT_LINE( "TA1 - task_set_priority - INVALID_ID" ); - begin - RTEMS.TASKS.SET_NOTE( RTEMS.SELF, - RTEMS.NOTEPAD_INDEX'LAST + 10, - NOTEPAD_VALUE, - STATUS - ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.INVALID_NUMBER, - "TASK_SET_NOTE WITH ILLEGAL NOTEPAD" - ); - TEXT_IO.PUT_LINE( "TA1 - task_set_note - INVALID_NUMBER" ); - exception - when others => - TEXT_IO.PUT_LINE( - "TA1 - task_set_note - INVALID_NUMBER -- constraint error" - ); - end; - - RTEMS.TASKS.SET_NOTE( - 100, - RTEMS.NOTEPAD_INDEX'LAST, - NOTEPAD_VALUE, - STATUS - ); - TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( - STATUS, - RTEMS.INVALID_ID, - "TASK_SET_NOTE WITH ILLEGAL ID" - ); - TEXT_IO.PUT_LINE( "TA1 - task_set_note - INVALID_ID" ); - RTEMS.TASKS.START( 100, SPTEST.TASK_1'ACCESS, 0, STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( STATUS, diff --git a/c/src/ada-tests/support/init.c b/c/src/ada-tests/support/init.c index 1b20e409d4..968b17b3a4 100644 --- a/c/src/ada-tests/support/init.c +++ b/c/src/ada-tests/support/init.c @@ -47,7 +47,7 @@ rtems_id tcb_to_id( Thread_Control *tcb ) { - return tcb->Object.id; /* Only for sp04 and sp07 */ + return tcb->Object.id; /* Only for sp04 */ } uint32_t milliseconds_per_tick(void) diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb b/c/src/ada-tests/tmtests/tm08/tmtest.adb index 8efa50ce2f..e4c9d90991 100644 --- a/c/src/ada-tests/tmtests/tm08/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm08/tmtest.adb @@ -99,7 +99,6 @@ package body TMTEST is OVERHEAD : RTEMS.UNSIGNED32; OLD_PRIORITY : RTEMS.TASKS.PRIORITY; OLD_MODE : RTEMS.MODE; - OLD_NOTE : RTEMS.NOTEPAD_INDEX; TIME : RTEMS.TIME_OF_DAY; STATUS : RTEMS.STATUS_CODES; begin @@ -233,44 +232,6 @@ package body TMTEST is STATUS ); - TIMER_DRIVER.INITIALIZE; - for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT - loop - RTEMS.TASKS.SET_NOTE( - TMTEST.TASK_ID, - 8, - 10, - STATUS - ); - end loop; - TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; - TIME_TEST_SUPPORT.PUT_TIME( - "TASK_SET_NOTE ", - TMTEST.END_TIME, - TIME_TEST_SUPPORT.OPERATION_COUNT, - OVERHEAD, - RTEMS_CALLING_OVERHEAD.TASK_SET_NOTE - ); - - TIMER_DRIVER.INITIALIZE; - for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT - loop - RTEMS.TASKS.GET_NOTE( - TMTEST.TASK_ID, - 8, - OLD_NOTE, - STATUS - ); - end loop; - TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; - TIME_TEST_SUPPORT.PUT_TIME( - "TASK_GET_NOTE ", - TMTEST.END_TIME, - TIME_TEST_SUPPORT.OPERATION_COUNT, - OVERHEAD, - RTEMS_CALLING_OVERHEAD.TASK_GET_NOTE - ); - TIME := (1988, 1, 1, 0, 0, 0, 0 ); TIMER_DRIVER.INITIALIZE; diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads b/c/src/ada-tests/tmtests/tm08/tmtest.ads index a2f3e8eabd..062e810181 100644 --- a/c/src/ada-tests/tmtests/tm08/tmtest.ads +++ b/c/src/ada-tests/tmtests/tm08/tmtest.ads @@ -69,8 +69,6 @@ package TMTEST is -- + TASK_MODE which does not require a reschedule -- + TASK_MODE which does require a reschedule -- + TASK_MODE which causes a preemption *** TEST_TASK1 executes --- + TASK_SET_NOTE --- + TASK_GET_NOTE -- + CLOCK_SET -- + CLOCK_GET -- diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb index 559cbd5630..5b4260a2bc 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb @@ -150,36 +150,6 @@ package body DUMMY_RTEMS is end TASK_MODE; - procedure TASK_GET_NOTE ( - ID : in RTEMS.ID; - NOTEPAD : in RTEMS.NOTEPAD_INDEX; - NOTE : out RTEMS.UNSIGNED32; - RESULT : out RTEMS.STATUS_CODES - ) is - pragma Unreferenced(ID); - pragma Unreferenced(NOTEPAD); - begin - - NOTE := 0; - RESULT := RTEMS.SUCCESSFUL; - - end TASK_GET_NOTE; - - procedure TASK_SET_NOTE ( - ID : in RTEMS.ID; - NOTEPAD : in RTEMS.NOTEPAD_INDEX; - NOTE : in RTEMS.UNSIGNED32; - RESULT : out RTEMS.STATUS_CODES - ) is - pragma Unreferenced(ID); - pragma Unreferenced(NOTEPAD); - pragma Unreferenced(NOTE); - begin - - RESULT := RTEMS.SUCCESSFUL; - - end TASK_SET_NOTE; - procedure TASK_WAKE_WHEN ( TIME_BUFFER : in RTEMS.TIME_OF_DAY; RESULT : out RTEMS.STATUS_CODES diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads index acd59ac708..d560c4a5a1 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads +++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads @@ -87,20 +87,6 @@ package DUMMY_RTEMS is RESULT : out RTEMS.STATUS_CODES ); - procedure TASK_GET_NOTE ( - ID : in RTEMS.ID; - NOTEPAD : in RTEMS.NOTEPAD_INDEX; - NOTE : out RTEMS.UNSIGNED32; - RESULT : out RTEMS.STATUS_CODES - ); - - procedure TASK_SET_NOTE ( - ID : in RTEMS.ID; - NOTEPAD : in RTEMS.NOTEPAD_INDEX; - NOTE : in RTEMS.UNSIGNED32; - RESULT : out RTEMS.STATUS_CODES - ); - procedure TASK_WAKE_WHEN ( TIME_BUFFER : in RTEMS.TIME_OF_DAY; RESULT : out RTEMS.STATUS_CODES diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb index ed21f7e434..a6050ea6c5 100644 --- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb +++ b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb @@ -130,7 +130,6 @@ package body TMTEST is IN_MODE : RTEMS.MODE; MASK : RTEMS.MODE; OUT_MODE : RTEMS.MODE; - NOTE : RTEMS.UNSIGNED32; TIME : RTEMS.TIME_OF_DAY; TIMEOUT : RTEMS.INTERVAL; SIGNALS : RTEMS.SIGNAL_SET; @@ -331,40 +330,6 @@ package body TMTEST is 0 ); --- TASK_GET_NOTE - - TIMER_DRIVER.INITIALIZE; - for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT - loop - DUMMY_RTEMS.TASK_GET_NOTE( ID, 1, NOTE, STATUS ); - end loop; - TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; - - TIME_TEST_SUPPORT.PUT_TIME( - "TASK_GET_NOTE", - TMTEST.END_TIME, - TIME_TEST_SUPPORT.OPERATION_COUNT, - OVERHEAD, - 0 - ); - --- TASK_SET_NOTE - - TIMER_DRIVER.INITIALIZE; - for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT - loop - DUMMY_RTEMS.TASK_SET_NOTE( ID, 1, NOTE, STATUS ); - end loop; - TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; - - TIME_TEST_SUPPORT.PUT_TIME( - "TASK_SET_NOTE", - TMTEST.END_TIME, - TIME_TEST_SUPPORT.OPERATION_COUNT, - OVERHEAD, - 0 - ); - -- TASK_WAKE_WHEN TIME.YEAR := 2000; diff --git a/c/src/ada/rtems-tasks.adb b/c/src/ada/rtems-tasks.adb index 1a5706f8e4..b809fcf98e 100644 --- a/c/src/ada/rtems-tasks.adb +++ b/c/src/ada/rtems-tasks.adb @@ -203,44 +203,6 @@ package body RTEMS.Tasks is end Mode; - procedure Get_Note - (ID : in RTEMS.ID; - Notepad : in RTEMS.Notepad_Index; - Note : out RTEMS.Unsigned32; - Result : out RTEMS.Status_Codes) - is - function Get_Note_Base - (ID : RTEMS.ID; - Notepad : RTEMS.Notepad_Index; - Note : access RTEMS.Unsigned32) - return RTEMS.Status_Codes; - pragma Import (C, Get_Note_Base, "rtems_task_get_note"); - Note_Base : aliased RTEMS.Unsigned32; - begin - - Result := Get_Note_Base (ID, Notepad, Note_Base'Access); - Note := Note_Base; - - end Get_Note; - - procedure Set_Note - (ID : in RTEMS.ID; - Notepad : in RTEMS.Notepad_Index; - Note : in RTEMS.Unsigned32; - Result : out RTEMS.Status_Codes) - is - function Set_Note_Base - (ID : RTEMS.ID; - Notepad : RTEMS.Notepad_Index; - Note : RTEMS.Unsigned32) - return RTEMS.Status_Codes; - pragma Import (C, Set_Note_Base, "rtems_task_set_note"); - begin - - Result := Set_Note_Base (ID, Notepad, Note); - - end Set_Note; - procedure Variable_Add (ID : in RTEMS.ID; Task_Variable : in RTEMS.Address; diff --git a/c/src/lib/libbsp/arm/csb336/times b/c/src/lib/libbsp/arm/csb336/times index 5ef513c936..602cee69f7 100644 --- a/c/src/lib/libbsp/arm/csb336/times +++ b/c/src/lib/libbsp/arm/csb336/times @@ -55,8 +55,6 @@ Both instruction and data caches are enabled. 8 rtems_task_mode: no reschedule 0 8 rtems_task_mode: reschedule -- returns to caller 3 8 rtems_task_mode: reschedule -- preempts caller 13 - 8 rtems_task_set_note 1 - 8 rtems_task_get_note 1 8 rtems_clock_set 4 8 rtems_clock_get 0 diff --git a/c/src/lib/libbsp/arm/csb337/times b/c/src/lib/libbsp/arm/csb337/times index 29421b0ed8..be051976b2 100644 --- a/c/src/lib/libbsp/arm/csb337/times +++ b/c/src/lib/libbsp/arm/csb337/times @@ -54,8 +54,6 @@ All tests were compiled with VARIANT=DEBUG 8 rtems_task_mode: no reschedule 5998 5995 2645 8 rtems_task_mode: reschedule -- returns to caller 12110 11764 6055 8 rtems_task_mode: reschedule -- preempts caller 33043 34773 18338 - 8 rtems_task_set_note 11869 11871 4356 - 8 rtems_task_get_note 12092 12087 4397 8 rtems_clock_set 33141 33145 10160 8 rtems_clock_get 2920 2921 811 diff --git a/c/src/lib/libbsp/arm/edb7312/times b/c/src/lib/libbsp/arm/edb7312/times index ffc660b1a1..9738338e5a 100644 --- a/c/src/lib/libbsp/arm/edb7312/times +++ b/c/src/lib/libbsp/arm/edb7312/times @@ -54,8 +54,6 @@ Timer Source: Timer 2, 512KHz timer rate rtems_task_mode: no reschedule 2 rtems_task_mode: reschedule -- returns to caller 15 rtems_task_mode: reschedule -- preempts caller 52 - rtems_task_set_note 4 - rtems_task_get_note 4 rtems_clock_set 14 rtems_clock_get 1 @@ -186,4 +184,3 @@ Timer Source: Timer 2, 512KHz timer rate rtems_rate_monotonic_delete: inactive 25 rtems_rate_monotonic_delete: active 21 rtems_rate_monotonic_period: conclude periods -- caller blocks 23 -
\ No newline at end of file diff --git a/c/src/lib/libbsp/bfin/TLL6527M/times b/c/src/lib/libbsp/bfin/TLL6527M/times index 00393cf288..978aa79cd6 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/times +++ b/c/src/lib/libbsp/bfin/TLL6527M/times @@ -35,22 +35,8 @@ rtems_task_resume: task readied -- returns to caller 1 rtems_task_delete: ready task 15 *** END OF TEST 6 *** -*** TIME TEST 7 *** - - -*** TIME TEST 8 *** -rtems_task_set_priority: obtain current priorityrtems_task_mode: reschedule -- preempts caller 0 -rtems_task_set_priority: returns to caller 2 -rtems_task_mode: obtain current mode101 0 -rtems_task_mode: no reschedule 0 -rtems_task_mode: reschedule -- returns to caller - 2 -rtems_task_set_note 1 -rtems_task_get_note 0 -rtems_clock_set 2 -rtems_clock_get_tod 12 -*** END OF TEST 8 *** +*** TIME TEST 7 *** *** TIME TEST 9 *** rtems_message_queue_create 43 @@ -173,4 +159,3 @@ rtems_rate_monotonic_delete: active 3 rtems_rate_monotonic_period: conclude periods -- caller blocks 9 *** END OF TEST 29 *** -
\ No newline at end of file diff --git a/c/src/lib/libbsp/bfin/eZKit533/times b/c/src/lib/libbsp/bfin/eZKit533/times index 4663da6faa..1bfddd46d8 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/times +++ b/c/src/lib/libbsp/bfin/eZKit533/times @@ -54,8 +54,6 @@ Column C: -o4 optimization rtems_task_mode: no reschedule NC 6 6 rtems_task_mode: reschedule -- returns to caller NC 8 8 rtems_task_mode: reschedule -- preempts caller NC 31 30 - rtems_task_set_note NC 8 8 - rtems_task_get_note NC 9 8 rtems_clock_set NC 25 25 rtems_clock_get NC 2 2 diff --git a/c/src/lib/libbsp/i386/pc386/times_i486dx b/c/src/lib/libbsp/i386/pc386/times_i486dx index 20a72680c3..24e1c47c78 100644 --- a/c/src/lib/libbsp/i386/pc386/times_i486dx +++ b/c/src/lib/libbsp/i386/pc386/times_i486dx @@ -53,8 +53,6 @@ Column B: 3.5.17 pre-release rtems_task_mode: no reschedule 4 4 rtems_task_mode: reschedule -- returns to caller 20 17 rtems_task_mode: reschedule -- preempts caller 39 37 - rtems_task_set_note 7 5 - rtems_task_get_note 7 5 rtems_clock_set 17 16 rtems_clock_get 2 1 diff --git a/c/src/lib/libbsp/i386/pc386/times_p5 b/c/src/lib/libbsp/i386/pc386/times_p5 index fdaf7e9d2d..dddaca49a2 100644 --- a/c/src/lib/libbsp/i386/pc386/times_p5 +++ b/c/src/lib/libbsp/i386/pc386/times_p5 @@ -58,8 +58,6 @@ Column Y: unused rtems_task_mode: no reschedule 114 rtems_task_mode: reschedule -- returns to caller 264 rtems_task_mode: reschedule -- preempts caller 836 - rtems_task_set_note 236 - rtems_task_get_note 232 rtems_clock_set 569 rtems_clock_get 107 diff --git a/c/src/lib/libbsp/m68k/av5282/README b/c/src/lib/libbsp/m68k/av5282/README index 3f13b35f5b..af59e36c65 100644 --- a/c/src/lib/libbsp/m68k/av5282/README +++ b/c/src/lib/libbsp/m68k/av5282/README @@ -176,19 +176,6 @@ rtems_task_delete: ready task 106 rtems_task_restart: suspended task -- preempts caller 68 *** END OF TEST 7 *** -*** TIME TEST 8 *** -rtems_task_set_priority: obtain current priority 9 -rtems_task_set_priority: returns to caller 21 -rtems_task_mode: obtain current mode 4 -rtems_task_mode: no reschedule 4 -rtems_task_mode: reschedule -- returns to caller 13 -rtems_task_mode: reschedule -- preempts caller 35 -rtems_task_set_note 7 -rtems_task_get_note 9 -rtems_clock_set 30 -rtems_clock_get 0 -*** END OF TEST 8 *** - *** TIME TEST 9 *** rtems_message_queue_create 81 rtems_message_queue_send: no waiting tasks 30 @@ -386,8 +373,6 @@ rtems_task_suspend 0 rtems_task_resume 0 rtems_task_set_priority 0 rtems_task_mode 0 -rtems_task_get_note 0 -rtems_task_set_note 0 rtems_task_wake_when 1 rtems_task_wake_after 0 rtems_interrupt_catch 0 diff --git a/c/src/lib/libbsp/m68k/csb360/times b/c/src/lib/libbsp/m68k/csb360/times index 67d202b82f..6275ab7445 100644 --- a/c/src/lib/libbsp/m68k/csb360/times +++ b/c/src/lib/libbsp/m68k/csb360/times @@ -51,8 +51,6 @@ Instruction cache is enabled. 8 rtems_task_mode: no reschedule 6 8 rtems_task_mode: reschedule -- returns to caller 13 8 rtems_task_mode: reschedule -- preempts caller 35 - 8 rtems_task_set_note 12 - 8 rtems_task_get_note 13 8 rtems_clock_set 32 8 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/m68k/gen68302/times b/c/src/lib/libbsp/m68k/gen68302/times index a27ab166a2..4d8399217c 100644 --- a/c/src/lib/libbsp/m68k/gen68302/times +++ b/c/src/lib/libbsp/m68k/gen68302/times @@ -55,8 +55,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/m68k/gen68360/README b/c/src/lib/libbsp/m68k/gen68360/README index bd07d92700..0c595deb77 100644 --- a/c/src/lib/libbsp/m68k/gen68360/README +++ b/c/src/lib/libbsp/m68k/gen68360/README @@ -135,8 +135,6 @@ Timing tests: rtems_task_mode: no reschedule 15 rtems_task_mode: reschedule -- returns to caller 20 rtems_task_mode: reschedule -- preempts caller 67 - rtems_task_get_note 28 - rtems_task_set_note 27 rtems_task_wake_after: yield -- returns to caller 16 rtems_task_wake_after: yields -- preempts caller 65 rtems_task_wake_when 116 diff --git a/c/src/lib/libbsp/m68k/idp/times b/c/src/lib/libbsp/m68k/idp/times index c457bd3fec..be66bce601 100644 --- a/c/src/lib/libbsp/m68k/idp/times +++ b/c/src/lib/libbsp/m68k/idp/times @@ -55,8 +55,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/times b/c/src/lib/libbsp/m68k/mcf5206elite/times index 8be4f0e0fc..35c5b3bf21 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/times +++ b/c/src/lib/libbsp/m68k/mcf5206elite/times @@ -30,8 +30,6 @@ rtems_task_mode: obtain current mode 4 rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 11 rtems_task_mode: reschedule -- preempts caller 27 -rtems_task_set_note 9 -rtems_task_get_note 10 rtems_task_set_priority: preempts caller 36 rtems_task_delete: calling task 92 rtems_task_ident 115 diff --git a/c/src/lib/libbsp/m68k/mcf52235/README b/c/src/lib/libbsp/m68k/mcf52235/README index 28a85a1c1f..a5da02f8c6 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/README +++ b/c/src/lib/libbsp/m68k/mcf52235/README @@ -26,7 +26,6 @@ you need for this BSP! In you project before you include confdefs.h, define some or all of the following: -#define CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS #define CONFIGURE_INIT_TASK_STACK_SIZE x #define CONFIGURE_MINIMUM_TASK_STACK_SIZE x #define CONFIGURE_INTERRUPT_STACK_SIZE x @@ -88,8 +87,6 @@ rtems_task_suspend 0 rtems_task_resume 0 rtems_task_set_priority 0 rtems_task_mode 0 -rtems_task_get_note 0 -rtems_task_set_note 0 rtems_task_wake_when 0 rtems_task_wake_after 0 rtems_interrupt_catch 0 diff --git a/c/src/lib/libbsp/m68k/mcf5225x/README b/c/src/lib/libbsp/m68k/mcf5225x/README index a61b19ec6e..883ff74974 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/README +++ b/c/src/lib/libbsp/m68k/mcf5225x/README @@ -29,8 +29,6 @@ you need for this BSP! In you project before you include confdefs.h, define some or all of the following: -#define CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS -#define CONFIGURE_DISABLE_CLASSIC_NOTEPADS #define CONFIGURE_INIT_TASK_STACK_SIZE x #define CONFIGURE_MINIMUM_TASK_STACK_SIZE x #define CONFIGURE_INTERRUPT_STACK_SIZE x @@ -92,8 +90,6 @@ rtems_task_suspend 0 rtems_task_resume 0 rtems_task_set_priority 0 rtems_task_mode 0 -rtems_task_get_note 0 -rtems_task_set_note 0 rtems_task_wake_when 0 rtems_task_wake_after 0 rtems_interrupt_catch 0 diff --git a/c/src/lib/libbsp/m68k/mcf5235/README b/c/src/lib/libbsp/m68k/mcf5235/README index 5fef7276ba..04fa19574a 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/README +++ b/c/src/lib/libbsp/m68k/mcf5235/README @@ -182,19 +182,6 @@ rtems_task_delete: ready task 34 rtems_task_restart: suspended task -- preempts caller 22 *** END OF TEST 7 *** -*** TIME TEST 8 *** -rtems_task_set_priority: obtain current priority 4 -rtems_task_set_priority: returns to caller 9 -rtems_task_mode: obtain current mode 1 -rtems_task_mode: no reschedule 1 -rtems_task_mode: reschedule -- returns to caller 3 -rtems_task_mode: reschedule -- preempts caller 11 -rtems_task_set_note 3 -rtems_task_get_note 3 -rtems_clock_set 9 -rtems_clock_get 0 -*** END OF TEST 8 *** - *** TIME TEST 9 *** rtems_message_queue_create 37 rtems_message_queue_send: no waiting tasks 11 @@ -392,8 +379,6 @@ rtems_task_suspend 0 rtems_task_resume 0 rtems_task_set_priority 0 rtems_task_mode 0 -rtems_task_get_note 0 -rtems_task_set_note 0 rtems_task_wake_when 0 rtems_task_wake_after 0 rtems_interrupt_catch 0 diff --git a/c/src/lib/libbsp/m68k/mcf5329/README b/c/src/lib/libbsp/m68k/mcf5329/README index 1ba8ac917d..5b4a942af8 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/README +++ b/c/src/lib/libbsp/m68k/mcf5329/README @@ -92,19 +92,6 @@ rtems_task_delete: ready task 19 rtems_task_restart: suspended task -- preempts caller 15 *** END OF TEST 7 *** -*** TIME TEST 8 *** -rtems_task_set_priority: obtain current priority 1 -rtems_task_set_priority: returns to caller 2 -rtems_task_mode: obtain current mode 0 -rtems_task_mode: no reschedule 0 -rtems_task_mode: reschedule -- returns to caller 1 -rtems_task_mode: reschedule -- preempts caller 13 -rtems_task_set_note 1 -rtems_task_get_note 1 -rtems_clock_set 1 -rtems_clock_get 4 -*** END OF TEST 8 *** - *** TIME TEST 9 *** rtems_message_queue_create 45 rtems_message_queue_send: no waiting tasks 2 @@ -289,8 +276,6 @@ rtems_task_suspend 0 rtems_task_resume 0 rtems_task_set_priority 0 rtems_task_mode 0 -rtems_task_get_note 0 -rtems_task_set_note 0 rtems_task_wake_when 0 rtems_task_wake_after 0 rtems_interrupt_catch 0 diff --git a/c/src/lib/libbsp/m68k/mrm332/times b/c/src/lib/libbsp/m68k/mrm332/times index ddece974b3..f6033d6960 100644 --- a/c/src/lib/libbsp/m68k/mrm332/times +++ b/c/src/lib/libbsp/m68k/mrm332/times @@ -57,8 +57,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/m68k/mvme162/times b/c/src/lib/libbsp/m68k/mvme162/times index ced4068875..0ca7e55616 100644 --- a/c/src/lib/libbsp/m68k/mvme162/times +++ b/c/src/lib/libbsp/m68k/mvme162/times @@ -55,8 +55,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/m68k/mvme167/times b/c/src/lib/libbsp/m68k/mvme167/times index ae5a662811..969df8622f 100644 --- a/c/src/lib/libbsp/m68k/mvme167/times +++ b/c/src/lib/libbsp/m68k/mvme167/times @@ -63,19 +63,6 @@ rtems_task_delete: ready task 61 rtems_task_restart: suspended task -- preempts caller 44 *** END OF TEST 7 *** -*** TIME TEST 8 *** -rtems_task_set_priority: obtain current priority 7 -rtems_task_set_priority: returns to caller 16 -rtems_task_mode: obtain current mode 4 -rtems_task_mode: no reschedule 5 -rtems_task_mode: reschedule -- returns to caller 11 -rtems_task_mode: reschedule -- preempts caller 29 -rtems_task_set_note 7 -rtems_task_get_note 7 -rtems_clock_set 21 -rtems_clock_get 0 -*** END OF TEST 8 *** - *** TIME TEST 9 *** rtems_message_queue_create 89 @@ -299,8 +286,6 @@ rtems_task_suspend 0 rtems_task_resume 0 rtems_task_set_priority 0 rtems_task_mode 0 -rtems_task_get_note 0 -rtems_task_set_note 0 rtems_task_wake_when 1 rtems_task_wake_after 0 rtems_interrupt_catch 0 diff --git a/c/src/lib/libbsp/m68k/uC5282/TIMES b/c/src/lib/libbsp/m68k/uC5282/TIMES index 1ab0b99d69..b2cdecd28a 100644 --- a/c/src/lib/libbsp/m68k/uC5282/TIMES +++ b/c/src/lib/libbsp/m68k/uC5282/TIMES @@ -46,19 +46,6 @@ rtems_task_delete: ready task 69 rtems_task_restart: suspended task -- preempts caller 44 *** END OF TEST 7 *** -*** TIME TEST 8 *** -rtems_task_set_priority: obtain current priority 6 -rtems_task_set_priority: returns to caller 17 -rtems_task_mode: obtain current mode 3 -rtems_task_mode: no reschedule 3 -rtems_task_mode: reschedule -- returns to caller 8 -rtems_task_mode: reschedule -- preempts caller 22 -rtems_task_set_note 6 -rtems_task_get_note 6 -rtems_clock_set 22 -rtems_clock_get 1 -*** END OF TEST 8 *** - *** TIME TEST 9 *** rtems_message_queue_create 55 rtems_message_queue_send: no waiting tasks 20 diff --git a/c/src/lib/libbsp/mips/csb350/times b/c/src/lib/libbsp/mips/csb350/times index a677a7d660..d4331ba661 100644 --- a/c/src/lib/libbsp/mips/csb350/times +++ b/c/src/lib/libbsp/mips/csb350/times @@ -54,8 +54,6 @@ All tests were compiled with VARIANT=DEBUG 8 rtems_task_mode: no reschedule 847 8 rtems_task_mode: reschedule -- returns to caller 7803 8 rtems_task_mode: reschedule -- preempts caller 18542 - 8 rtems_task_set_note 1044 - 8 rtems_task_get_note 1046 8 rtems_clock_set 2777 8 rtems_clock_get 161 diff --git a/c/src/lib/libbsp/mips/hurricane/times b/c/src/lib/libbsp/mips/hurricane/times index ac027e20d8..974fbf797e 100644 --- a/c/src/lib/libbsp/mips/hurricane/times +++ b/c/src/lib/libbsp/mips/hurricane/times @@ -60,8 +60,6 @@ Column B:RTEMS compiled with 32 bit pointers and 32 bit unsigned32 types rtems_task_mode: no reschedule 0 49 rtems_task_mode: reschedule -- returns to caller 0 232 rtems_task_mode: reschedule -- preempts caller 0 687 - rtems_task_set_note 0 101 - rtems_task_get_note 0 103 rtems_clock_set 0 237 rtems_clock_get 0 16 diff --git a/c/src/lib/libbsp/nios2/nios2_iss/times b/c/src/lib/libbsp/nios2/nios2_iss/times index d5615e4191..0d8d388d06 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/times +++ b/c/src/lib/libbsp/nios2/nios2_iss/times @@ -55,8 +55,6 @@ Column Y: rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/times b/c/src/lib/libbsp/no_cpu/no_bsp/times index d5615e4191..0d8d388d06 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/times +++ b/c/src/lib/libbsp/no_cpu/no_bsp/times @@ -55,8 +55,6 @@ Column Y: rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx821 b/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx821 index 54e7951f7d..36c5e82066 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx821 +++ b/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx821 @@ -53,8 +53,6 @@ Column B: Data & instruction caches enabled (UPM/A: new burst r/w values) (2000- rtems_task_mode: no reschedule 70 8 rtems_task_mode: reschedule -- returns to caller 75 32 rtems_task_mode: reschedule -- preempts caller 292 97 - rtems_task_set_note 112 11 - rtems_task_get_note 113 11 rtems_clock_set 250 25 rtems_clock_get 6 1 diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx860 b/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx860 index 55d2b5b2c3..6bcb69d370 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx860 +++ b/c/src/lib/libbsp/powerpc/mbx8xx/times-mbx860 @@ -53,8 +53,6 @@ Column B: Data & instruction caches enabled (UPM/A: new burst r/w values) (2000- rtems_task_mode: no reschedule 62 9 rtems_task_mode: reschedule -- returns to caller 66 25 rtems_task_mode: reschedule -- preempts caller 246 69 - rtems_task_set_note 99 11 - rtems_task_get_note 100 23 rtems_clock_set 222 35 rtems_clock_get 6 1 diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mcp750 b/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mcp750 index 2099edfd86..e99df570d9 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mcp750 +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mcp750 @@ -48,8 +48,6 @@ rtems_task_mode: obtain current mode_______________________________0.233 rtems_task_mode: no reschedule_____________________________________0.231 rtems_task_mode: reschedule -- returns to caller___________________1.711 rtems_task_mode: reschedule -- preempts caller_____________________3.304 -rtems_task_get_note________________________________________________0.549 -rtems_task_set_note________________________________________________0.548 rtems_task_wake_after: yield -- returns to caller__________________3.063 rtems_task_wake_after: yields -- preempts caller___________________3.063 rtems_task_wake_when_______________________________________________3.906 diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mvme2307 b/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mvme2307 index 6e4677de8a..900ed19f8c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mvme2307 +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/times.mvme2307 @@ -57,8 +57,6 @@ Column Y: rtems_task_mode: no reschedule 3.766 rtems_task_mode: reschedule -- returns to caller 5.933 rtems_task_mode: reschedule -- preempts caller 22.613 - rtems_task_set_note 10.115 - rtems_task_get_note 10.236 rtems_clock_set 21.466 rtems_clock_get 2.286 diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/README b/c/src/lib/libbsp/powerpc/mpc8260ads/README index e430a04247..43cb2d9846 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/README +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/README @@ -184,8 +184,6 @@ Timing tests: rtems_task_mode: no reschedule 6 rtems_task_mode: reschedule -- returns to caller 15 rtems_task_mode: reschedule -- preempts caller 43 - rtems_task_get_note 13 - rtems_task_set_note 12 rtems_task_wake_after: yield -- returns to caller 8 rtems_task_wake_after: yields -- preempts caller 30 rtems_task_wake_when: 49 diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/times b/c/src/lib/libbsp/powerpc/mpc8260ads/times index a789de8822..ebc5ae8120 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/times +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/times @@ -56,8 +56,6 @@ Column Y: rtems_task_mode: no reschedule 7 rtems_task_mode: reschedule -- returns to caller 14 rtems_task_mode: reschedule -- preempts caller 43 - rtems_task_set_note 13 - rtems_task_get_note 12 rtems_clock_set 28 rtems_clock_get 0 diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c index 67cd07f01b..bb3cbf604f 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c @@ -101,6 +101,7 @@ int quiet=0; } else { /* retrieve the notepad which possibly holds an extention pointer */ if (RTEMS_SUCCESSFUL==rtems_task_ident(RTEMS_SELF,RTEMS_LOCAL,&id) && +// FIXME: Deprecated use of Notepads. #2503. #if 0 /* Must not use a notepad due to unknown initial value (notepad memory is allocated from the * workspace)! diff --git a/c/src/lib/libbsp/powerpc/ss555/times b/c/src/lib/libbsp/powerpc/ss555/times index 3052df9295..00f7c91f7a 100644 --- a/c/src/lib/libbsp/powerpc/ss555/times +++ b/c/src/lib/libbsp/powerpc/ss555/times @@ -51,8 +51,6 @@ Timer Source: Timebase register (TMBCLK = (4 MHz crystal / 4) = 1.0 Mhz) rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 7 rtems_task_mode: reschedule -- preempts caller 37 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 27 rtems_clock_get 1 diff --git a/c/src/lib/libbsp/sh/gensh1/times b/c/src/lib/libbsp/sh/gensh1/times index 1ab4e43335..a241f6200b 100644 --- a/c/src/lib/libbsp/sh/gensh1/times +++ b/c/src/lib/libbsp/sh/gensh1/times @@ -57,8 +57,6 @@ Column B: rtems_task_mode: no reschedule X rtems_task_mode: reschedule -- returns to caller X rtems_task_mode: reschedule -- preempts caller X - rtems_task_set_note X - rtems_task_get_note X rtems_clock_set X rtems_clock_get X diff --git a/c/src/lib/libbsp/sparc/erc32/times b/c/src/lib/libbsp/sparc/erc32/times index 07e1ab41fc..c37bbbeee2 100644 --- a/c/src/lib/libbsp/sparc/erc32/times +++ b/c/src/lib/libbsp/sparc/erc32/times @@ -54,8 +54,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/sparc/leon2/times b/c/src/lib/libbsp/sparc/leon2/times index 07e1ab41fc..c37bbbeee2 100644 --- a/c/src/lib/libbsp/sparc/leon2/times +++ b/c/src/lib/libbsp/sparc/leon2/times @@ -54,8 +54,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/lib/libbsp/sparc/leon3/times b/c/src/lib/libbsp/sparc/leon3/times index 07e1ab41fc..c37bbbeee2 100644 --- a/c/src/lib/libbsp/sparc/leon3/times +++ b/c/src/lib/libbsp/sparc/leon3/times @@ -54,8 +54,6 @@ Column B: unused rtems_task_mode: no reschedule 5 rtems_task_mode: reschedule -- returns to caller 8 rtems_task_mode: reschedule -- preempts caller 39 - rtems_task_set_note 13 - rtems_task_get_note 13 rtems_clock_set 33 rtems_clock_get 3 diff --git a/c/src/librtems++/include/rtems++/rtemsTask.h b/c/src/librtems++/include/rtems++/rtemsTask.h index 3aac25d13c..7d151c2f50 100644 --- a/c/src/librtems++/include/rtems++/rtemsTask.h +++ b/c/src/librtems++/include/rtems++/rtemsTask.h @@ -47,8 +47,6 @@ Mode control is through the rtemsTaskMode class. - The rtemsTask class reserved notepad register 31. - ------------------------------------------------------------------------ */ #if !defined(_rtemsTask_h_) @@ -125,12 +123,6 @@ public: const rtems_status_code set_priority(const rtems_task_priority priority, rtems_task_priority& old_priority); - // notepad control - const rtems_status_code get_note(const uint32_t notepad, - uint32_t& note) RTEMS_DEPRECATED; - const rtems_status_code set_note(const uint32_t notepad, - const uint32_t note) RTEMS_DEPRECATED; - // object id, and name const rtems_id id_is() const { return id; } const rtems_name name_is() const { return name; } diff --git a/c/src/librtems++/src/rtemsTask.cc b/c/src/librtems++/src/rtemsTask.cc index 3bd9c992d4..c8607d2fd9 100644 --- a/c/src/librtems++/src/rtemsTask.cc +++ b/c/src/librtems++/src/rtemsTask.cc @@ -262,18 +262,6 @@ const rtems_status_code rtemsTask::set_priority(const rtems_task_priority priori priority, &old_priority)); } - -const rtems_status_code rtemsTask::get_note(const uint32_t notepad, - uint32_t& note) -{ - return set_status_code(rtems_task_get_note(id, notepad, ¬e)); -} - -const rtems_status_code rtemsTask::set_note(const uint32_t notepad, - const uint32_t note) -{ - return set_status_code(rtems_task_set_note(id, notepad, note)); -} void rtemsTask::body(rtems_task_argument ) { diff --git a/cpukit/libcsupport/src/README b/cpukit/libcsupport/src/README index 7a9383c524..43fe818b18 100644 --- a/cpukit/libcsupport/src/README +++ b/cpukit/libcsupport/src/README @@ -10,7 +10,7 @@ Overview of newlib support (newlib is from CYGNUS) This is implemented by a reentrancy data structure for each task. When a task is "started" (in RTEMS sense) the reentrancy structure - is allocated. Its address is stored in notepad[NOTEPAD_LAST]. + is allocated. When task is switched to, the value of global variable _impure_ptr is changed to the value of the new tasks reentrancy structure. diff --git a/cpukit/libmisc/monitor/README b/cpukit/libmisc/monitor/README index 02c3bcbe88..4e466cf455 100644 --- a/cpukit/libmisc/monitor/README +++ b/cpukit/libmisc/monitor/README @@ -88,6 +88,5 @@ Sample output from 'task' command no ASRS It has no events. - It has a notepad value for notepad 15 which is 0x40606348 (this is the libc thread state) diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index f38990d2a7..1659d92030 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -90,7 +90,6 @@ librtems_a_SOURCES += src/tasks.c librtems_a_SOURCES += src/taskcreate.c librtems_a_SOURCES += src/taskdelete.c librtems_a_SOURCES += src/taskgetaffinity.c -librtems_a_SOURCES += src/taskgetnote.c librtems_a_SOURCES += src/taskgetscheduler.c librtems_a_SOURCES += src/taskident.c librtems_a_SOURCES += src/taskinitusers.c @@ -100,7 +99,6 @@ librtems_a_SOURCES += src/taskrestart.c librtems_a_SOURCES += src/taskresume.c librtems_a_SOURCES += src/taskself.c librtems_a_SOURCES += src/tasksetaffinity.c -librtems_a_SOURCES += src/tasksetnote.c librtems_a_SOURCES += src/tasksetpriority.c librtems_a_SOURCES += src/tasksetscheduler.c librtems_a_SOURCES += src/taskstart.c diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/cpukit/rtems/include/rtems/rtems/config.h index 4b2c54eb5c..77ee798d74 100644 --- a/cpukit/rtems/include/rtems/rtems/config.h +++ b/cpukit/rtems/include/rtems/rtems/config.h @@ -54,12 +54,6 @@ typedef struct { uint32_t maximum_tasks; /** - * This field indicates whether Classic API notepads are - * enabled or disabled. - */ - bool notepads_enabled; - - /** * This field contains the maximum number of Classic API * Timers which are configured for this application. */ @@ -133,13 +127,6 @@ extern rtems_api_configuration_table Configuration_RTEMS_API; /**@}*/ /** - * This macro returns the value of the notepads enabled field - * in the Classic API configuration table. - */ -#define rtems_configuration_get_notepads_enabled() \ - rtems_configuration_get_rtems_api_configuration()->notepads_enabled - -/** * This macro returns the number of Classic API semaphores configured. */ #define rtems_configuration_get_maximum_semaphores() \ diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/rtems/include/rtems/rtems/taskmp.h index 30a9a6a066..fb986ea5d3 100644 --- a/cpukit/rtems/include/rtems/rtems/taskmp.h +++ b/cpukit/rtems/include/rtems/rtems/taskmp.h @@ -54,10 +54,6 @@ typedef enum { RTEMS_TASKS_MP_RESUME_RESPONSE = 5, RTEMS_TASKS_MP_SET_PRIORITY_REQUEST = 6, RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE = 7, - RTEMS_TASKS_MP_GET_NOTE_REQUEST = 8, - RTEMS_TASKS_MP_GET_NOTE_RESPONSE = 9, - RTEMS_TASKS_MP_SET_NOTE_REQUEST = 10, - RTEMS_TASKS_MP_SET_NOTE_RESPONSE = 11 } RTEMS_tasks_MP_Remote_operations; /** @@ -69,8 +65,6 @@ typedef struct { RTEMS_tasks_MP_Remote_operations operation; rtems_name name; rtems_task_priority the_priority; - uint32_t notepad; - uint32_t note; } RTEMS_tasks_MP_Packet; /** @@ -96,9 +90,7 @@ void _RTEMS_tasks_MP_Send_process_packet ( rtems_status_code _RTEMS_tasks_MP_Send_request_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - rtems_task_priority the_priority, - uint32_t notepad, - uint32_t note + rtems_task_priority the_priority ); /** diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h index 1ad537d3c7..45c01c4a4d 100644 --- a/cpukit/rtems/include/rtems/rtems/tasks.h +++ b/cpukit/rtems/include/rtems/rtems/tasks.h @@ -21,8 +21,6 @@ * - resume a task * - set a task's priority * - change the current task's mode - * - get a task notepad entry - * - set a task notepad entry * - wake up after interval * - wake up when specified */ @@ -110,46 +108,6 @@ typedef Priority_Control rtems_task_priority; */ #define RTEMS_CURRENT_PRIORITY PRIORITY_MINIMUM -/** This is used to indicate the lowest numbered notepad */ -#define RTEMS_NOTEPAD_FIRST 0 -/** This is used to indicate the notepad location 0. */ -#define RTEMS_NOTEPAD_0 0 -/** This is used to indicate the notepad location 1. */ -#define RTEMS_NOTEPAD_1 1 -/** This is used to indicate the notepad location 2. */ -#define RTEMS_NOTEPAD_2 2 -/** This is used to indicate the notepad location 3. */ -#define RTEMS_NOTEPAD_3 3 -/** This is used to indicate the notepad location 4. */ -#define RTEMS_NOTEPAD_4 4 -/** This is used to indicate the notepad location 5. */ -#define RTEMS_NOTEPAD_5 5 -/** This is used to indicate the notepad location 6. */ -#define RTEMS_NOTEPAD_6 6 -/** This is used to indicate the notepad location 7. */ -#define RTEMS_NOTEPAD_7 7 -/** This is used to indicate the notepad location 8. */ -#define RTEMS_NOTEPAD_8 8 -/** This is used to indicate the notepad location 9. */ -#define RTEMS_NOTEPAD_9 9 -/** This is used to indicate the notepad location 10. */ -#define RTEMS_NOTEPAD_10 10 -/** This is used to indicate the notepad location 11. */ -#define RTEMS_NOTEPAD_11 11 -/** This is used to indicate the notepad location 12. */ -#define RTEMS_NOTEPAD_12 12 -/** This is used to indicate the notepad location 13. */ -#define RTEMS_NOTEPAD_13 13 -/** This is used to indicate the notepad location 14. */ -#define RTEMS_NOTEPAD_14 14 -/** This is used to indicate the notepad location 15. */ -#define RTEMS_NOTEPAD_15 15 -/** This is used to indicate the highest numbered notepad. */ -#define RTEMS_NOTEPAD_LAST RTEMS_NOTEPAD_15 - -/** This is used to indicate the number of notepads available. */ -#define RTEMS_NUMBER_NOTEPADS (RTEMS_NOTEPAD_LAST+1) - /** * External API name for Thread_Control */ @@ -269,50 +227,6 @@ rtems_status_code rtems_task_delete( ); /** - * @brief RTEMS Get Task Node - * - * @deprecated Notepads are deprecated and will be removed. - * - * This routine implements the rtems_task_get_note directive. The - * value of the indicated notepad for the task associated with ID - * is returned in note. - * - * @param[in] id is the thread id - * @param[in] notepad is the notepad number - * @param[out] note is the pointer to note - * - * @retval RTEMS_SUCCESSFUL if successful or error code if unsuccessful - */ -rtems_status_code rtems_task_get_note( - rtems_id id, - uint32_t notepad, - uint32_t *note -) RTEMS_DEPRECATED; - -/** - * @brief RTEMS Set Task Note - * - * @deprecated Notepads are deprecated and will be removed. - * - * This routine implements the rtems_task_set_note directive. The - * value of the indicated notepad for the task associated with ID - * is returned in note. - * - * @param[in] id is the thread id - * @param[in] notepad is the notepad number - * @param[in] note is the note value - * - * @return This method returns RTEMS_SUCCESSFUL if there was not an - * error. Otherwise, a status code is returned indicating the - * source of the error. - */ -rtems_status_code rtems_task_set_note( - rtems_id id, - uint32_t notepad, - uint32_t note -) RTEMS_DEPRECATED; - -/** * @brief RTEMS Task Mode * * This routine implements the rtems_task_mode directive. The current @@ -654,9 +568,6 @@ rtems_status_code rtems_scheduler_get_processor_set( * This is the API specific information required by each thread for * the RTEMS API to function correctly. * - * @note Notepads must be the last entry in the structure and memory - * will be taken away from this structure when allocated if - * notespads are disabled by the application configuration. */ typedef struct { /** This field contains the event control for this task. */ @@ -670,15 +581,6 @@ typedef struct { * @brief Signal post-switch action in case signals are pending. */ Thread_Action Signal_action; - - /** - * This field contains the notepads for this task. - * - * @deprecated Notepads are deprecated and will be removed. - * - * @note MUST BE LAST ENTRY. - */ - uint32_t Notepads[ RTEMS_ZERO_LENGTH_ARRAY ] RTEMS_DEPRECATED; } RTEMS_API_Control; /** diff --git a/cpukit/rtems/mainpage.h b/cpukit/rtems/mainpage.h index 819e049be5..9801bfb915 100644 --- a/cpukit/rtems/mainpage.h +++ b/cpukit/rtems/mainpage.h @@ -685,9 +685,9 @@ * application in response to external and internal stimuli. TCBs are the only * RTEMS internal data structure that can be accessed by an application via * user extension routines. The TCB contains a task's name, ID, current - * priority, current and starting states, execution mode, set of notepad - * locations, TCB user extension pointer, scheduling control structures, as - * well as data required by a blocked task. + * priority, current and starting states, execution mode, TCB user extension + * pointer, scheduling control structures, as well as data required by a + * blocked task. * * A task's context is stored in the TCB when a task switch occurs. When the * task regains control of the processor, its context is restored from the TCB. diff --git a/cpukit/rtems/src/taskgetnote.c b/cpukit/rtems/src/taskgetnote.c deleted file mode 100644 index c097d9cfd7..0000000000 --- a/cpukit/rtems/src/taskgetnote.c +++ /dev/null @@ -1,94 +0,0 @@ -/** - * @file - * - * @brief RTEMS Get Task Node - * @ingroup ClassicRTEMS - */ - -/* - * COPYRIGHT (c) 1989-2014. - * 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. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include <rtems/rtems/tasksimpl.h> -#include <rtems/score/threadimpl.h> -#include <rtems/config.h> - -/* - * We know this is deprecated and don't want a warning on every BSP built. - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -rtems_status_code rtems_task_get_note( - rtems_id id, - uint32_t notepad, - uint32_t *note -) -{ - Thread_Control *the_thread; - Objects_Locations location; - RTEMS_API_Control *api; - Thread_Control *executing; - - if ( !rtems_configuration_get_notepads_enabled() ) - return RTEMS_NOT_CONFIGURED; - - if ( !note ) - return RTEMS_INVALID_ADDRESS; - - /* - * NOTE: There is no check for < RTEMS_NOTEPAD_FIRST because that would - * be checking an unsigned number for being negative. - */ - - if ( notepad > RTEMS_NOTEPAD_LAST ) - return RTEMS_INVALID_NUMBER; - - /* - * Optimize the most likely case to avoid the Thread_Dispatch. - */ - - executing = _Thread_Get_executing(); - if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) || - _Objects_Are_ids_equal( id, executing->Object.id ) ) { - api = executing->API_Extensions[ THREAD_API_RTEMS ]; - *note = api->Notepads[ notepad ]; - return RTEMS_SUCCESSFUL; - } - - the_thread = _Thread_Get( id, &location ); - switch ( location ) { - - case OBJECTS_LOCAL: - api = the_thread->API_Extensions[ THREAD_API_RTEMS ]; - *note = api->Notepads[ notepad ]; - _Objects_Put( &the_thread->Object ); - return RTEMS_SUCCESSFUL; - -#if defined(RTEMS_MULTIPROCESSING) - case OBJECTS_REMOTE: - executing->Wait.return_argument = note; - - return _RTEMS_tasks_MP_Send_request_packet( - RTEMS_TASKS_MP_GET_NOTE_REQUEST, - id, - 0, /* Not used */ - notepad, - 0 /* Not used */ - ); -#endif - - case OBJECTS_ERROR: - break; - } - - return RTEMS_INVALID_ID; -} diff --git a/cpukit/rtems/src/taskmp.c b/cpukit/rtems/src/taskmp.c index a1386d9bbb..ef76e1f7c4 100644 --- a/cpukit/rtems/src/taskmp.c +++ b/cpukit/rtems/src/taskmp.c @@ -64,10 +64,6 @@ void _RTEMS_tasks_MP_Send_process_packet ( case RTEMS_TASKS_MP_RESUME_RESPONSE: case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST: case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE: - case RTEMS_TASKS_MP_GET_NOTE_REQUEST: - case RTEMS_TASKS_MP_GET_NOTE_RESPONSE: - case RTEMS_TASKS_MP_SET_NOTE_REQUEST: - case RTEMS_TASKS_MP_SET_NOTE_RESPONSE: break; } } @@ -80,9 +76,7 @@ void _RTEMS_tasks_MP_Send_process_packet ( rtems_status_code _RTEMS_tasks_MP_Send_request_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - rtems_task_priority new_priority, - uint32_t notepad, - uint32_t note + rtems_task_priority new_priority ) { RTEMS_tasks_MP_Packet *the_packet; @@ -92,8 +86,6 @@ rtems_status_code _RTEMS_tasks_MP_Send_request_packet ( case RTEMS_TASKS_MP_SUSPEND_REQUEST: case RTEMS_TASKS_MP_RESUME_REQUEST: case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST: - case RTEMS_TASKS_MP_GET_NOTE_REQUEST: - case RTEMS_TASKS_MP_SET_NOTE_REQUEST: the_packet = _RTEMS_tasks_MP_Get_packet(); the_packet->Prefix.the_class = MP_PACKET_TASKS; @@ -102,8 +94,6 @@ rtems_status_code _RTEMS_tasks_MP_Send_request_packet ( the_packet->operation = operation; the_packet->Prefix.id = task_id; the_packet->the_priority = new_priority; - the_packet->notepad = notepad; - the_packet->note = note; return _MPCI_Send_request_packet( _Objects_Get_node( task_id ), @@ -118,8 +108,6 @@ rtems_status_code _RTEMS_tasks_MP_Send_request_packet ( case RTEMS_TASKS_MP_SUSPEND_RESPONSE: case RTEMS_TASKS_MP_RESUME_RESPONSE: case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE: - case RTEMS_TASKS_MP_GET_NOTE_RESPONSE: - case RTEMS_TASKS_MP_SET_NOTE_RESPONSE: break; } @@ -147,8 +135,6 @@ void _RTEMS_tasks_MP_Send_response_packet ( case RTEMS_TASKS_MP_SUSPEND_RESPONSE: case RTEMS_TASKS_MP_RESUME_RESPONSE: case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE: - case RTEMS_TASKS_MP_GET_NOTE_RESPONSE: - case RTEMS_TASKS_MP_SET_NOTE_RESPONSE: the_packet = (RTEMS_tasks_MP_Packet *) the_thread->receive_packet; @@ -170,8 +156,6 @@ void _RTEMS_tasks_MP_Send_response_packet ( case RTEMS_TASKS_MP_SUSPEND_REQUEST: case RTEMS_TASKS_MP_RESUME_REQUEST: case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST: - case RTEMS_TASKS_MP_GET_NOTE_REQUEST: - case RTEMS_TASKS_MP_SET_NOTE_REQUEST: break; } @@ -231,7 +215,6 @@ void _RTEMS_tasks_MP_Process_packet ( case RTEMS_TASKS_MP_SUSPEND_RESPONSE: case RTEMS_TASKS_MP_RESUME_RESPONSE: - case RTEMS_TASKS_MP_SET_NOTE_RESPONSE: the_thread = _MPCI_Process_response( the_packet_prefix ); @@ -273,43 +256,6 @@ void _RTEMS_tasks_MP_Process_packet ( _MPCI_Return_packet( the_packet_prefix ); break; - - case RTEMS_TASKS_MP_GET_NOTE_REQUEST: - - the_packet->Prefix.return_code = rtems_task_get_note( - the_packet->Prefix.id, - the_packet->notepad, - &the_packet->note - ); - - _RTEMS_tasks_MP_Send_response_packet( - RTEMS_TASKS_MP_GET_NOTE_RESPONSE, - _Thread_Executing - ); - break; - - case RTEMS_TASKS_MP_GET_NOTE_RESPONSE: - - the_thread = _MPCI_Process_response( the_packet_prefix ); - - *(uint32_t *)the_thread->Wait.return_argument = the_packet->note; - - _MPCI_Return_packet( the_packet_prefix ); - break; - - case RTEMS_TASKS_MP_SET_NOTE_REQUEST: - - the_packet->Prefix.return_code = rtems_task_set_note( - the_packet->Prefix.id, - the_packet->notepad, - the_packet->note - ); - - _RTEMS_tasks_MP_Send_response_packet( - RTEMS_TASKS_MP_SET_NOTE_RESPONSE, - _Thread_Executing - ); - break; } } diff --git a/cpukit/rtems/src/taskresume.c b/cpukit/rtems/src/taskresume.c index ed06a22e4a..fba605fd5e 100644 --- a/cpukit/rtems/src/taskresume.c +++ b/cpukit/rtems/src/taskresume.c @@ -44,9 +44,7 @@ rtems_status_code rtems_task_resume( return _RTEMS_tasks_MP_Send_request_packet( RTEMS_TASKS_MP_RESUME_REQUEST, id, - 0, /* Not used */ - 0, /* Not used */ - 0 /* Not used */ + 0 /* Not used */ ); #endif diff --git a/cpukit/rtems/src/tasksetnote.c b/cpukit/rtems/src/tasksetnote.c deleted file mode 100644 index 42cd4e718d..0000000000 --- a/cpukit/rtems/src/tasksetnote.c +++ /dev/null @@ -1,89 +0,0 @@ -/** - * @file - * - * @brief RTEMS Set Task Note - * @ingroup ClassicTasks - */ - -/* - * COPYRIGHT (c) 1989-2014. - * 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. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include <rtems/rtems/tasksimpl.h> -#include <rtems/score/threadimpl.h> -#include <rtems/config.h> - -/* - * We know this is deprecated and don't want a warning on every BSP built. - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -rtems_status_code rtems_task_set_note( - rtems_id id, - uint32_t notepad, - uint32_t note -) -{ - Thread_Control *the_thread; - Objects_Locations location; - RTEMS_API_Control *api; - Thread_Control *executing; - - if ( !rtems_configuration_get_notepads_enabled() ) - return RTEMS_NOT_CONFIGURED; - - /* - * NOTE: There is no check for < RTEMS_NOTEPAD_FIRST because that would - * be checking an unsigned number for being negative. - */ - - if ( notepad > RTEMS_NOTEPAD_LAST ) - return RTEMS_INVALID_NUMBER; - - /* - * Optimize the most likely case to avoid the Thread_Dispatch. - */ - - executing = _Thread_Get_executing(); - if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) || - _Objects_Are_ids_equal( id, executing->Object.id ) ) { - api = executing->API_Extensions[ THREAD_API_RTEMS ]; - api->Notepads[ notepad ] = note; - return RTEMS_SUCCESSFUL; - } - - the_thread = _Thread_Get( id, &location ); - switch ( location ) { - - case OBJECTS_LOCAL: - api = the_thread->API_Extensions[ THREAD_API_RTEMS ]; - api->Notepads[ notepad ] = note; - _Objects_Put( &the_thread->Object ); - return RTEMS_SUCCESSFUL; - -#if defined(RTEMS_MULTIPROCESSING) - case OBJECTS_REMOTE: - return _RTEMS_tasks_MP_Send_request_packet( - RTEMS_TASKS_MP_SET_NOTE_REQUEST, - id, - 0, /* Not used */ - notepad, - note - ); -#endif - - case OBJECTS_ERROR: - break; - } - - return RTEMS_INVALID_ID; -} diff --git a/cpukit/rtems/src/tasksetpriority.c b/cpukit/rtems/src/tasksetpriority.c index 582c67f9f2..c6b2dc0a46 100644 --- a/cpukit/rtems/src/tasksetpriority.c +++ b/cpukit/rtems/src/tasksetpriority.c @@ -63,9 +63,7 @@ rtems_status_code rtems_task_set_priority( return _RTEMS_tasks_MP_Send_request_packet( RTEMS_TASKS_MP_SET_PRIORITY_REQUEST, id, - new_priority, - 0, /* Not used */ - 0 /* Not used */ + new_priority ); #endif diff --git a/cpukit/rtems/src/tasksuspend.c b/cpukit/rtems/src/tasksuspend.c index ae7995a53c..6b6616103e 100644 --- a/cpukit/rtems/src/tasksuspend.c +++ b/cpukit/rtems/src/tasksuspend.c @@ -44,9 +44,7 @@ rtems_status_code rtems_task_suspend( return _RTEMS_tasks_MP_Send_request_packet( RTEMS_TASKS_MP_SUSPEND_REQUEST, id, - 0, /* Not used */ - 0, /* Not used */ - 0 /* Not used */ + 0 /* Not used */ ); #endif diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 9ef0bc68cd..8635ca02d4 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -2085,24 +2085,6 @@ const rtems_libio_helper rtems_fs_init_helper = #define CONFIGURE_TASKS \ (CONFIGURE_MAXIMUM_TASKS + CONFIGURE_LIBBLOCK_TASKS) - /* - * Classic API notepads are a deprecated feature and will be removed - * in a future release of RTEMS. Warn the user who uses them. - */ - #if defined(CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS) - #warning "Classic API Notepads are deprecated and will be removed." - #endif - #if defined(CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS) - #warning "Classic API Notepads are deprecated and will be removed." - #endif - - /** This configuration parameter enables/disables Classic API notepads. */ - #ifdef CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS - #define CONFIGURE_NOTEPADS_ENABLED TRUE - #else - #define CONFIGURE_NOTEPADS_ENABLED FALSE - #endif - /** * This macro calculates the memory required for task variables. * @@ -3301,9 +3283,6 @@ const rtems_libio_helper rtems_fs_init_helper = #endif } Scheduler; RTEMS_API_Control API_RTEMS; - #if defined(CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS) - uint32_t Notepads[ RTEMS_NUMBER_NOTEPADS ] RTEMS_DEPRECATED; - #endif #ifdef RTEMS_POSIX_API POSIX_API_Control API_POSIX; #endif @@ -3354,7 +3333,6 @@ const rtems_libio_helper rtems_fs_init_helper = */ rtems_api_configuration_table Configuration_RTEMS_API = { CONFIGURE_TASKS, - CONFIGURE_NOTEPADS_ENABLED, CONFIGURE_MAXIMUM_TIMERS + CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER, CONFIGURE_SEMAPHORES, CONFIGURE_MAXIMUM_MESSAGE_QUEUES, diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/sapi/include/rtems/extension.h index d3b0aa3c5a..2a877ceee9 100644 --- a/cpukit/sapi/include/rtems/extension.h +++ b/cpukit/sapi/include/rtems/extension.h @@ -88,9 +88,7 @@ typedef User_extensions_routine * set to be linked to each task's control block (TCB). This area is only * available for the dynamic extensions. This set of pointers is an extension * of the TCB and can be used to store additional data required by the user's - * extension functions. It is also possible for a user extension to utilize the - * notepad locations associated with each task although this may conflict with - * application usage of those particular notepads. + * extension functions. * * The TCB extension is an array of pointers in the TCB. The index into the * table can be obtained from the extension identifier returned when the diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index 94ce31ed50..6e937e39de 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -907,9 +907,9 @@ typedef struct { * * The thread control block contains fields that point to application * configuration dependent memory areas, like the scheduler information, the - * API control blocks, the user extension context table, the RTEMS notepads and - * the Newlib re-entrancy support. Account for these areas in the - * configuration and avoid extra workspace allocations for these areas. + * API control blocks, the user extension context table, and the Newlib + * re-entrancy support. Account for these areas in the configuration and + * avoid extra workspace allocations for these areas. * * This array is provided via <rtems/confdefs.h>. * diff --git a/doc/user/conf.t b/doc/user/conf.t index 0dd0a50924..560b221464 100644 --- a/doc/user/conf.t +++ b/doc/user/conf.t @@ -595,75 +595,6 @@ require the addition of a new configuration parameter to specify the number of tasks which enable floating point support. @c -@c === CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS === -@c -@subsection Enable Classic API Notepads - -@findex CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS - -@table @b -@item CONSTANT: -@code{CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS} - -@item DATA TYPE: -Boolean feature macro. - -@item RANGE: -Defined or undefined. - -@item DEFAULT VALUE: -This is not defined by default, and Classic API Notepads are not supported. - -@end table - -@subheading DESCRIPTION: -@code{CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS} should be defined if the -user wants to have support for Classic API Notepads in their application. - -@subheading NOTES: -Disabling Classic API Notepads saves the allocation of sixteen (16) -thirty-two bit integers. This saves sixty-four bytes per task/thread -plus the allocation overhead. Notepads are rarely used in applications -and this can save significant memory in a low RAM system. Classic API -Notepads are deprecated, and this option is expected to be obsolete in -the near future. - -@c -@c === CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS === -@c -@subsection Disable Classic API Notepads - -@findex CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS - -@table @b -@item CONSTANT: -@code{CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS} - -@item DATA TYPE: -Boolean feature macro. - -@item RANGE: -Defined or undefined. - -@item DEFAULT VALUE: -This is not defined by default, and Classic API Notepads are not supported. - -@end table - -@subheading DESCRIPTION: -@code{CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS} is deprecated. If users -want to have support for Classic API Notepads, they should use -@code{CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS}. - -@subheading NOTES: -Disabling Classic API Notepads saves the allocation of sixteen (16) -thirty-two bit integers. This saves sixty-four bytes per task/thread -plus the allocation overhead. Notepads are rarely used in applications -and this can save significant memory in a low RAM system. Classic API -Notepads are deprecated, and this option is expected to be obsolete in -the near future. - -@c @c === CONFIGURE_MAXIMUM_TIMERS === @c @subsection Specify Maximum Classic API Timers diff --git a/doc/user/intr.t b/doc/user/intr.t index cf106f39d2..58187965e1 100644 --- a/doc/user/intr.t +++ b/doc/user/intr.t @@ -189,8 +189,6 @@ to the interrupted task. Most of the time, it is an application implementation error to use RTEMS_SELF from an ISR. @itemize -@item rtems_task_get_note -@item rtems_task_set_note @item rtems_task_suspend @item rtems_task_resume @end itemize diff --git a/doc/user/task.t b/doc/user/task.t index 5606c4adc3..6d0ff54e25 100644 --- a/doc/user/task.t +++ b/doc/user/task.t @@ -25,8 +25,6 @@ by the task manager are: @item @code{@value{DIRPREFIX}task_is_suspended} - Determine if a task is suspended @item @code{@value{DIRPREFIX}task_set_priority} - Set task priority @item @code{@value{DIRPREFIX}task_mode} - Change current task's mode -@item @code{@value{DIRPREFIX}task_get_note} - Get task notepad entry -@item @code{@value{DIRPREFIX}task_set_note} - Set task notepad entry @item @code{@value{DIRPREFIX}task_wake_after} - Wake up after interval @item @code{@value{DIRPREFIX}task_wake_when} - Wake up when specified @item @code{@value{DIRPREFIX}iterate_over_all_threads} - Iterate Over Tasks @@ -81,9 +79,9 @@ by the application in response to external and internal stimuli. TCBs are the only RTEMS internal data structure that can be accessed by an application via user extension routines. The TCB contains a task's name, ID, current priority, current and -starting states, execution mode, set of notepad locations, TCB -user extension pointer, scheduling control structures, as well -as data required by a blocked task. +starting states, execution mode, TCB user extension pointer, +scheduling control structures, as well as data required by a +blocked task. A task's context is stored in the TCB when a task switch occurs. When the task regains control of the processor, its context is @@ -636,22 +634,6 @@ The @code{@value{DIRPREFIX}task_restart} directive resets the mode of a task to its original value. -@subsection Notepad Locations - -RTEMS provides sixteen notepad locations for each task. Each -notepad location may contain a note consisting of four bytes of -information. RTEMS provides two directives, -@code{@value{DIRPREFIX}task_set_note} and -@code{@value{DIRPREFIX}task_get_note}, that enable a user -to access and change the -notepad locations. The @code{@value{DIRPREFIX}task_set_note} -directive enables the user -to set a task's notepad entry to a specified note. The -@code{@value{DIRPREFIX}task_get_note} -directive allows the user to obtain the note -contained in any one of the sixteen notepads of a specified task. -Notepads are deprecated and will be removed. - @subsection Task Deletion RTEMS provides the @code{@value{DIRPREFIX}task_delete} @@ -1482,123 +1464,6 @@ mask constant is provided in the following table: @page -@subsection TASK_GET_NOTE - Get task notepad entry - -@cindex get task notepad entry - -@subheading CALLING SEQUENCE: - -@ifset is-C -@findex rtems_task_get_note -@example -rtems_status_code rtems_task_get_note( - rtems_id id, - uint32_t notepad, - uint32_t *note -); -@end example -@end ifset - -@ifset is-Ada -@example -procedure Task_Get_Note ( - ID : in RTEMS.ID; - Notepad : in RTEMS.Notepad_Index; - Note : out RTEMS.Unsigned32; - Result : out RTEMS.Status_Codes -); -@end example -@end ifset - -@subheading DIRECTIVE STATUS CODES: -@code{@value{RPREFIX}SUCCESSFUL} - note obtained successfully@* -@code{@value{RPREFIX}INVALID_ADDRESS} - @code{note} is NULL@* -@code{@value{RPREFIX}INVALID_ID} - invalid task id@* -@code{@value{RPREFIX}INVALID_NUMBER} - invalid notepad location - -@subheading DESCRIPTION: -This directive returns the note contained in the notepad -location of the task specified by id. - -@subheading NOTES: -This directive is deprecated and will be removed. - -This directive will not cause the running task to be preempted. - -If id is set to @code{@value{RPREFIX}SELF}, -the calling task accesses its own notepad. - -@c This version of the paragraph avoids the overfull hbox error. -@c The constants NOTEPAD_0 through NOTEPAD_15 can be used to access the -@c sixteen notepad locations. - -The sixteen notepad locations can be accessed using the constants -@code{@value{RPREFIX}NOTEPAD_0} through @code{@value{RPREFIX}NOTEPAD_15}. - -Getting a note of a global task which does not reside on the -local node will generate a request to the remote node to obtain -the notepad entry of the specified task. - -@page - -@subsection TASK_SET_NOTE - Set task notepad entry - -@cindex set task notepad entry - -@subheading CALLING SEQUENCE: - -@ifset is-C -@findex rtems_task_set_note -@example -rtems_status_code rtems_task_set_note( - rtems_id id, - uint32_t notepad, - uint32_t note -); -@end example -@end ifset - -@ifset is-Ada -@example -procedure Task_Set_Note ( - ID : in RTEMS.ID; - Notepad : in RTEMS.Notepad_Index; - Note : in RTEMS.Unsigned32; - Result : out RTEMS.Status_Codes -); -@end example -@end ifset - -@subheading DIRECTIVE STATUS CODES: -@code{@value{RPREFIX}SUCCESSFUL} - task's note set successfully@* -@code{@value{RPREFIX}INVALID_ID} - invalid task id@* -@code{@value{RPREFIX}INVALID_NUMBER} - invalid notepad location - -@subheading DESCRIPTION: -This directive is deprecated and will be removed. - -This directive sets the notepad entry for the task specified by -id to the value note. - -@subheading NOTES: -If id is set to @code{@value{RPREFIX}SELF}, the calling -task accesses its own notepad locations. - -This directive will not cause the running task to be preempted. - -@c This version of the paragraph avoids the overfull hbox error. -@c The constants NOTEPAD_0 through NOTEPAD_15 can be used to access the -@c sixteen notepad locations. - -The sixteen notepad locations can be accessed using the constants -@code{@value{RPREFIX}NOTEPAD_0} through @code{@value{RPREFIX}NOTEPAD_15}. - -Setting a notepad location of a global task which does not -reside on the local node will generate a request to the remote -node to set the specified notepad entry. - -@page - @subsection TASK_WAKE_AFTER - Wake up after interval @cindex delay a task for an interval diff --git a/doc/user/userext.t b/doc/user/userext.t index dc6ad4e5ee..7f4a10180d 100644 --- a/doc/user/userext.t +++ b/doc/user/userext.t @@ -134,11 +134,7 @@ RTEMS provides for a pointer to a user-defined data area for each extension set to be linked to each task's control block. This set of pointers is an extension of the TCB and can be used to store additional data required by the user's -extension functions. It is also possible for a user extension -to utilize the notepad locations associated with each task -although this may conflict with application usage of those -particular notepads. However, notepads are deprecated and will -be removed. +extension functions. The TCB extension is an array of pointers in the TCB. The index into the table can be obtained from the extension id diff --git a/testsuites/PROBLEMS b/testsuites/PROBLEMS index 8a961fc2c5..5d3a6cc161 100644 --- a/testsuites/PROBLEMS +++ b/testsuites/PROBLEMS @@ -20,7 +20,7 @@ sp02 - Gets through some tests, then attempts to execute code at location 0. sp04 - hangs at end of tests. sp06 - rtems_task_restart of TA3 FAILED -- expected (0) got (4) -sp07, sp14 - hang in middle of tests +sp14 - hang in middle of tests sp13, sp15 - terminate properly, but output at end is missing. sp16 - _Internal_error_Occurred. sp19 - rtems_clock_get FAILED -- expected (0) got (11), and hangs in diff --git a/testsuites/libtests/rtems++/System.h b/testsuites/libtests/rtems++/System.h index 410fccbad8..e787fe21be 100644 --- a/testsuites/libtests/rtems++/System.h +++ b/testsuites/libtests/rtems++/System.h @@ -123,7 +123,6 @@ class Io_during_interrupt #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 0 #define CONFIGURE_TICKS_PER_TIMESLICE 100 -#define CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/testsuites/libtests/rtems++/Task1.cc b/testsuites/libtests/rtems++/Task1.cc index c4ce8c4d4b..02c1746e0c 100644 --- a/testsuites/libtests/rtems++/Task1.cc +++ b/testsuites/libtests/rtems++/Task1.cc @@ -259,75 +259,6 @@ void Task1::screen2(void) task_2.set_priority(current_priority, priority); printf("%s, priority was %" PRIirtems_task_priority "\n", task_2.last_status_string(), priority); - uint32_t current_note; - uint32_t note; - - // notepad registers for this object - - printf("%s - get note - ", name_string()); - get_note(0, current_note); - printf("%s, note is %" PRIi32 "\n", last_status_string(), current_note); - - printf("%s - get with bad notepad number - ", name_string()); - get_note(100, current_note); - printf("%s, note is %" PRIi32 "\n", last_status_string(), current_note); - - printf("%s - set note to 0xDEADBEEF - ", name_string()); - set_note(0, 0xDEADBEEF); - printf("%s\n", last_status_string()); - - printf("%s - get note - ", name_string()); - get_note(0, note); - printf("%s, note is 0x%08" PRIX32 "\n", last_status_string(), note); - - printf("%s - set note to original value - ", name_string()); - set_note(0, current_note); - printf("%s\n", last_status_string()); - - // notepad registers for connected object - - printf("%s - connected object get note - ", task_1.name_string()); - task_1.get_note(0, current_note); - printf("%s, notepad is %" PRIi32 "\n", task_1.last_status_string(), current_note); - - printf("%s - connected object get with bad notepad number - ", task_1.name_string()); - task_1.get_note(100, current_note); - printf("%s, note is %" PRIi32 "\n", task_1.last_status_string(), current_note); - - printf("%s - connected object set note to 0xDEADBEEF - ", task_1.name_string()); - task_1.set_note(0, 0xDEADBEEF); - printf("%s\n", task_1.last_status_string()); - - printf("%s - connected object get note - ", task_1.name_string()); - task_1.get_note(0, note); - printf("%s, note is 0x%08" PRIX32 "\n", task_1.last_status_string(), note); - - printf("%s - connected object set note to original value - ", task_1.name_string()); - task_1.set_note(0, current_note); - printf("%s\n", task_1.last_status_string()); - - // notepad registers for self object - - printf("%s - self object get note - ", task_2.name_string()); - task_2.get_note(0, current_note); - printf("%s, note is %" PRIi32 "\n", task_2.last_status_string(), current_note); - - printf("%s - self object get with bad notepad number - ", task_2.name_string()); - task_2.get_note(100, current_note); - printf("%s, note is %" PRIi32 "\n", task_2.last_status_string(), current_note); - - printf("%s - self object set note to 0xDEADBEEF - ", task_2.name_string()); - task_2.set_note(0, 0xDEADBEEF); - printf("%s\n", task_2.last_status_string()); - - printf("%s - self object get note - ", task_2.name_string()); - task_2.get_note(0, note); - printf("%s, notepad is 0x%08" PRIX32 "\n", task_2.last_status_string(), note); - - printf("%s - self object set note to original value - ", task_2.name_string()); - task_2.set_note(0, current_note); - printf("%s\n", task_2.last_status_string()); - printf(" END Task Class test\n"); } diff --git a/testsuites/libtests/rtems++/rtems++.scn b/testsuites/libtests/rtems++/rtems++.scn index f87d0e2906..0ac7c9c172 100644 --- a/testsuites/libtests/rtems++/rtems++.scn +++ b/testsuites/libtests/rtems++/rtems++.scn @@ -44,21 +44,6 @@ SELF - self object get priority - RTEMS[00] successful completion, priority is 1 SELF - self object set priority to 512 - RTEMS[19] invalid thread priority SELF - self object set priority to 25 - RTEMS[00] successful completion SELF - self object set priority to original - RTEMS[00] successful completion, priority was 25 -TA1 - get note - RTEMS[00] successful completion, note is 0 -TA1 - get with bad notepad number - RTEMS[10] number was invalid, note is 0 -TA1 - set note to 0xDEADBEEF - RTEMS[00] successful completion -TA1 - get note - RTEMS[00] successful completion, note is 0xDEADBEEF -TA1 - set note to original value - RTEMS[00] successful completion -TA1 - connected object get note - RTEMS[00] successful completion, notepad is 0 -TA1 - connected object get with bad notepad number - RTEMS[10] number was invalid, note is 0 -TA1 - connected object set note to 0xDEADBEEF - RTEMS[00] successful completion -TA1 - connected object get note - RTEMS[00] successful completion, note is 0xDEADBEEF -TA1 - connected object set note to original value - RTEMS[00] successful completion -SELF - self object get note - RTEMS[00] successful completion, note is 0 -SELF - self object get with bad notepad number - RTEMS[10] number was invalid, note is 0 -SELF - self object set note to 0xDEADBEEF - RTEMS[00] successful completion -SELF - self object get note - RTEMS[00] successful completion, notepad is 0xDEADBEEF -SELF - self object set note to original value - RTEMS[00] successful completion END Task Class test <pause - screen 3> START TaskMode Class test diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am index 4bc33df2b9..45889f1835 100644 --- a/testsuites/mptests/Makefile.am +++ b/testsuites/mptests/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I ../aclocal -_SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \ +_SUBDIRS = mp01 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \ mp14 include $(top_srcdir)/../automake/test-subdirs.am diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac index 282d97c552..f01cfc1c94 100644 --- a/testsuites/mptests/configure.ac +++ b/testsuites/mptests/configure.ac @@ -35,9 +35,6 @@ AC_CONFIG_FILES([Makefile mp01/Makefile mp01/node1/Makefile mp01/node2/Makefile -mp02/Makefile -mp02/node1/Makefile -mp02/node2/Makefile mp03/Makefile mp03/node1/Makefile mp03/node2/Makefile diff --git a/testsuites/mptests/mp02/Makefile.am b/testsuites/mptests/mp02/Makefile.am deleted file mode 100644 index 08a90da412..0000000000 --- a/testsuites/mptests/mp02/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = node1 node2 - -include $(top_srcdir)/../automake/subdirs.am -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp02/init.c b/testsuites/mptests/mp02/init.c deleted file mode 100644 index 7155e88f14..0000000000 --- a/testsuites/mptests/mp02/init.c +++ /dev/null @@ -1,61 +0,0 @@ -/* Init - * - * This routine is the initialization task for this test program. - * It is a user initialization task and has the responsibility for creating - * and starting the tasks that make up the test. If the time of day - * clock is required for the test, it should also be set to a known - * value by this function. - * - * Input parameters: - * argument - task argument - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989-1999. - * 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 - -#define CONFIGURE_INIT -#include "system.h" - -rtems_task Init( - rtems_task_argument argument -) -{ - rtems_status_code status; - - printf( - "\n\n*** TEST 2 -- NODE %" PRIu32 " ***\n", - Multiprocessing_configuration.node - ); - - Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' ); - Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' ); - - puts( "Creating Test_task (Global)" ); - status = rtems_task_create( - Task_name[Multiprocessing_configuration.node], - 1, - RTEMS_MINIMUM_STACK_SIZE, - RTEMS_NO_PREEMPT, - RTEMS_GLOBAL, - &Task_id[ 1 ] - ); - directive_failed( status, "rtems_task_create" ); - - puts( "Starting Test_task (Global)" ); - status = rtems_task_start( Task_id[ 1 ], Test_task, 0 ); - directive_failed( status, "rtems_task_start" ); - - puts( "Deleting initialization task" ); - status = rtems_task_delete( RTEMS_SELF ); - directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); -} diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am deleted file mode 100644 index f3ae2b4171..0000000000 --- a/testsuites/mptests/mp02/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp02-node1 -mp02_node1_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp02-node1.scn -dist_rtems_tests_DATA += mp02-node1.doc - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - -AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(mp02_node1_OBJECTS) -LINK_LIBS = $(mp02_node1_LDLIBS) - -mp02-node1$(EXEEXT): $(mp02_node1_OBJECTS) $(mp02_node1_DEPENDENCIES) - @rm -f mp02-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp02/node1/mp02-node1.doc b/testsuites/mptests/mp02/node1/mp02-node1.doc deleted file mode 100644 index 53959a2f15..0000000000 --- a/testsuites/mptests/mp02/node1/mp02-node1.doc +++ /dev/null @@ -1,43 +0,0 @@ -# COPYRIGHT (c) 1989-1999. -# 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: test51 - -directives: - ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident, - tm_set, tm_get, tm_wkafter, t_delete, t_restart, t_getreg, t_setreg - -concepts: - - a. Verifies system can create and start both the executive's system - initialization and idle task. - - b. Verifies can print strings to the CRT on port 2 of the mvme136 board - using Print and Println in the board support package. - - c. Verifies interrupt handler can handler a task switch from an interrupt - as specified with the i_return directive. - - d. Verifies executive initialization performed correctly. - - e. Verifies that a task can get the task identification number of itself. - - f. Verifies that a task can get the task identification number - of another task. - - g. Verifies that a task can delete itself or another task. - - h. Verifies that errors are returned in the following situations: - 1) when attempting to delete a remote task. - 2) when attempting to start a remote task. - 3) when attempting to restart a remote task. - - i. Verifies that a remote task's registers can be set and read. diff --git a/testsuites/mptests/mp02/node1/mp02-node1.scn b/testsuites/mptests/mp02/node1/mp02-node1.scn deleted file mode 100644 index 72fdefe69d..0000000000 --- a/testsuites/mptests/mp02/node1/mp02-node1.scn +++ /dev/null @@ -1,14 +0,0 @@ -*** TEST 2 -- NODE 1 *** -Creating Test_task (Global) -Starting Test_task (Global) -Deleting initialization task -Remote task's name is : 222 -Getting TID of remote task (all nodes) -Getting TID of remote task (1 node) -rtems_task_delete of remote task returned the correct error -rtems_task_start of remote task returned the correct error -rtems_task_restart of remote task returned the correct error -Setting notepad 1 of the remote task to 1 -Getting a notepad of the remote task -Remote notepad set and read correctly -*** END OF TEST 2 *** diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am deleted file mode 100644 index 107d845653..0000000000 --- a/testsuites/mptests/mp02/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp02-node2 -mp02_node2_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp02-node2.scn -dist_rtems_tests_DATA += mp02-node2.doc - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - -AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(mp02_node2_OBJECTS) -LINK_LIBS = $(mp02_node2_LDLIBS) - -mp02-node2$(EXEEXT): $(mp02_node2_OBJECTS) $(mp02_node2_DEPENDENCIES) - @rm -f mp02-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp02/node2/mp02-node2.doc b/testsuites/mptests/mp02/node2/mp02-node2.doc deleted file mode 100644 index 981286480f..0000000000 --- a/testsuites/mptests/mp02/node2/mp02-node2.doc +++ /dev/null @@ -1,9 +0,0 @@ -# COPYRIGHT (c) 1989-1999. -# 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. -# - - diff --git a/testsuites/mptests/mp02/node2/mp02-node2.scn b/testsuites/mptests/mp02/node2/mp02-node2.scn deleted file mode 100644 index 233a910999..0000000000 --- a/testsuites/mptests/mp02/node2/mp02-node2.scn +++ /dev/null @@ -1,14 +0,0 @@ -*** TEST 2 -- NODE 2 *** -Creating Test_task (Global) -Starting Test_task (Global) -Deleting initialization task -Remote task's name is : 111 -Getting TID of remote task (all nodes) -Getting TID of remote task (1 node) -rtems_task_delete of remote task returned the correct error -rtems_task_start of remote task returned the correct error -rtems_task_restart of remote task returned the correct error -Setting notepad 2 of the remote task to 2 -Getting a notepad of the remote task -Remote notepad set and read correctly -*** END OF TEST 2 *** diff --git a/testsuites/mptests/mp02/system.h b/testsuites/mptests/mp02/system.h deleted file mode 100644 index 69025d4107..0000000000 --- a/testsuites/mptests/mp02/system.h +++ /dev/null @@ -1,46 +0,0 @@ -/* system.h - * - * This include file contains information that is included in every - * function in the test set. - * - * COPYRIGHT (c) 1989-1999. - * 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. - */ - -#include <tmacros.h> - -/* functions */ - -rtems_task Init( - rtems_task_argument argument -); - -rtems_task Test_task( - rtems_task_argument argument -); - -/* configuration information */ - -#define CONFIGURE_MP_APPLICATION - -#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 - -#include <rtems/confdefs.h> - -/* variables */ - -TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */ -TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ - -/* end of include file */ diff --git a/testsuites/mptests/mp02/task1.c b/testsuites/mptests/mp02/task1.c deleted file mode 100644 index fbdcc0d65b..0000000000 --- a/testsuites/mptests/mp02/task1.c +++ /dev/null @@ -1,113 +0,0 @@ -/* Test_task - * - * This task tests the rtems_task_set_note directive on a remote task and that - * errors are returned when attempting to delete, start, or restart - * a remote task. - * - * Input parameters: - * argument - task argument - * - * Output parameters: NONE - * - * 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 "system.h" - -extern rtems_multiprocessing_table Multiprocessing_configuration; - -rtems_task Test_task( - rtems_task_argument argument -) -{ - rtems_id tid; - rtems_status_code status; - uint32_t remote_node; - rtems_id remote_tid; - rtems_id test_tid; - uint32_t note; - uint32_t tmpNode; - - status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); - - remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1; - printf( "Remote task's name is : " ); - put_name( Task_name[ remote_node ], TRUE ); - - puts( "Getting TID of remote task (all nodes)" ); - do { - status = rtems_task_ident( - Task_name[ remote_node ], - RTEMS_SEARCH_ALL_NODES, - &remote_tid - ); - } while ( status != RTEMS_SUCCESSFUL ); - - directive_failed( status, "rtems_task_ident" ); - - puts( "Getting TID of remote task (1 node)" ); - status = rtems_task_ident( Task_name[ remote_node ], remote_node, &test_tid ); - directive_failed( status, "rtems_task_ident" ); - - if ( test_tid != remote_tid ) { - puts( "rtems_task_ident tid's do not match!!" ); - rtems_fatal_error_occurred( status ); - } - - status = rtems_task_delete( remote_tid ); - fatal_directive_status( - status, - RTEMS_ILLEGAL_ON_REMOTE_OBJECT, - "rtems_task_delete of remote task" - ); - puts( "rtems_task_delete of remote task returned the correct error" ); - - status = rtems_task_start( remote_tid, Test_task, 0 ); - fatal_directive_status( - status, - RTEMS_ILLEGAL_ON_REMOTE_OBJECT, - "rtems_task_start of remote task" - ); - puts( "rtems_task_start of remote task returned the correct error" ); - - status = rtems_task_restart( remote_tid, 0 ); - fatal_directive_status( - status, - RTEMS_ILLEGAL_ON_REMOTE_OBJECT, - "rtems_task_restart of remote task" - ); - puts( "rtems_task_restart of remote task returned the correct error" ); - - tmpNode = rtems_object_id_get_node(tid); - printf( "Setting notepad %" PRId32 " of the remote task to %" PRId32 "\n", tmpNode, tmpNode ); - status = rtems_task_set_note( remote_tid, tmpNode, tmpNode ); - directive_failed( status, "rtems_task_set_note" ); - - puts( "Getting a notepad of the remote task" ); - status = rtems_task_get_note( remote_tid, tmpNode, ¬e ); - directive_failed( status, "rtems_task_get_note" ); - - if ( note == tmpNode ) - puts( "Remote notepad set and read correctly" ); - else - printf( - "FAILURE!! Remote notepad was not set and read correctly (%" PRId32 ", %" PRId32 ")\n", - note, - tmpNode - ); - - status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); - directive_failed( status, "rtems_task_wake_after" ); - - puts( "*** END OF TEST 2 ***" ); - rtems_test_exit( 0 ); -} 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( diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h index 6e2df2f846..3610fe954d 100644 --- a/testsuites/tmtests/tm08/system.h +++ b/testsuites/tmtests/tm08/system.h @@ -27,8 +27,6 @@ rtems_task Init( #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER -#define CONFIGURE_ENABLE_CLASSIC_API_NOTEPADS - #define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c index 6d42de9900..a86322c61f 100644 --- a/testsuites/tmtests/tm08/task1.c +++ b/testsuites/tmtests/tm08/task1.c @@ -81,7 +81,6 @@ rtems_task test_task( uint32_t index; rtems_task_priority old_priority; rtems_time_of_day time; - uint32_t old_note; uint32_t old_mode; benchmark_timer_initialize(); @@ -186,44 +185,6 @@ rtems_task test_task( benchmark_timer_initialize(); (void) rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode ); - /** 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" - - benchmark_timer_initialize(); - for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) rtems_task_set_note( Test_task_id, 8, 10 ); - end_time = benchmark_timer_read(); - - put_time( - "rtems_task_set_note: only case", - end_time, - OPERATION_COUNT, - overhead, - CALLING_OVERHEAD_TASK_SET_NOTE - ); - - benchmark_timer_initialize(); - for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) rtems_task_get_note( Test_task_id, 8, &old_note ); - end_time = benchmark_timer_read(); - - put_time( - "rtems_task_get_note: only case", - end_time, - OPERATION_COUNT, - overhead, - CALLING_OVERHEAD_TASK_GET_NOTE - ); - - #pragma GCC diagnostic pop - - /** END OF NOTEPAD TESTS **/ - build_time( &time, 1, 1, 1988, 0, 0, 0, 0 ); benchmark_timer_initialize(); diff --git a/testsuites/tmtests/tm08/tm08.doc b/testsuites/tmtests/tm08/tm08.doc index dcc7a7f247..e364a58dc3 100644 --- a/testsuites/tmtests/tm08/tm08.doc +++ b/testsuites/tmtests/tm08/tm08.doc @@ -11,10 +11,8 @@ This test benchmarks the following operations: + rtems_clock_get_tod + rtems_clock_set + rtems_task_mode - + rtems_task_get_note - + rtems_task_set_note + rtems_task_set_priority For more information 1. tmtests/include/timesys.h -2. tmtests/README
\ No newline at end of file +2. tmtests/README diff --git a/testsuites/tmtests/tmoverhd/dumrtems.h b/testsuites/tmtests/tmoverhd/dumrtems.h index 535d6a1faf..eeefb75d39 100644 --- a/testsuites/tmtests/tmoverhd/dumrtems.h +++ b/testsuites/tmtests/tmoverhd/dumrtems.h @@ -59,12 +59,10 @@ #undef rtems_semaphore_release #undef rtems_task_create #undef rtems_task_delete -#undef rtems_task_get_note #undef rtems_task_ident #undef rtems_task_mode #undef rtems_task_restart #undef rtems_task_resume -#undef rtems_task_set_note #undef rtems_task_set_priority #undef rtems_task_start #undef rtems_task_suspend @@ -184,8 +182,6 @@ Empty_directive() #define rtems_task_delete( tid ) \ Empty_directive() -#define rtems_task_get_note( tid, notepad, note ) \ - Empty_directive() #define rtems_task_ident( name, node, tid ) \ Empty_directive() #define rtems_task_mode( mode, mask, pmode ) \ @@ -194,8 +190,6 @@ Empty_directive() #define rtems_task_resume( tid ) \ Empty_directive() -#define rtems_task_set_note( tid, notepad, note ) \ - Empty_directive() #define rtems_task_set_priority( tid, priority, ppriority ) \ Empty_directive() #define rtems_task_start( tid, saddr, arg ) \ diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c index d14fd8951b..76f4e157b1 100644 --- a/testsuites/tmtests/tmoverhd/testtask.c +++ b/testsuites/tmtests/tmoverhd/testtask.c @@ -68,7 +68,6 @@ rtems_task Task_1( rtems_mode in_mode RTEMS_GCC_NOWARN_UNUSED; rtems_mode mask RTEMS_GCC_NOWARN_UNUSED; rtems_mode out_mode RTEMS_GCC_NOWARN_UNUSED; - uint32_t note RTEMS_GCC_NOWARN_UNUSED; rtems_time_of_day time RTEMS_GCC_NOWARN_UNUSED; rtems_interval timeout RTEMS_GCC_NOWARN_UNUSED; rtems_signal_set signals RTEMS_GCC_NOWARN_UNUSED; @@ -86,7 +85,6 @@ rtems_task Task_1( in_priority = 250; in_mode = RTEMS_NO_PREEMPT; mask = RTEMS_PREEMPT_MASK; - note = 8; timeout = 100; signals = RTEMS_SIGNAL_1 | RTEMS_SIGNAL_3; major = 10; @@ -251,36 +249,6 @@ rtems_task Task_1( 0 ); -/* rtems_task_get_note */ - - benchmark_timer_initialize(); - for ( index = 1 ; index <= OPERATION_COUNT ; index ++ ) - (void) rtems_task_get_note( id, 1, note ); - end_time = benchmark_timer_read(); - - put_time( - "overhead: rtems_task_get_note", - end_time, - OPERATION_COUNT, - overhead, - 0 - ); - -/* rtems_task_set_note */ - - benchmark_timer_initialize(); - for ( index = 1 ; index <= OPERATION_COUNT ; index ++ ) - (void) rtems_task_set_note( id, 1, note ); - end_time = benchmark_timer_read(); - - put_time( - "overhead: rtems_task_set_note", - end_time, - OPERATION_COUNT, - overhead, - 0 - ); - /* rtems_task_wake_when */ benchmark_timer_initialize(); diff --git a/testsuites/tmtests/tmoverhd/tmoverhd.doc b/testsuites/tmtests/tmoverhd/tmoverhd.doc index dc326c2c32..8c1d97ed28 100644 --- a/testsuites/tmtests/tmoverhd/tmoverhd.doc +++ b/testsuites/tmtests/tmoverhd/tmoverhd.doc @@ -18,8 +18,6 @@ directives: + rtems task resume + rtems task set priority + rtems task mode -+ rtems task get note -+ rtems task set note + rtems task wake when + rtems task wake after + rtems interrupt catch diff --git a/testsuites/tmtests/tmtests_plan.csv b/testsuites/tmtests/tmtests_plan.csv index de3335b519..326a888a48 100644 --- a/testsuites/tmtests/tmtests_plan.csv +++ b/testsuites/tmtests/tmtests_plan.csv @@ -2,8 +2,6 @@ "rtems_barrier_delete: only case",tm30,NA,Yes "rtems_barrier_ident: only case",tm30,NA,Yes ,,, -"rtems_clock_get_tod: only case",tm08,NA,Yes -"rtems_clock_set: only case",tm08,NA,Yes "rtems_clock_tick: only case",tm25,NA,Yes ,,, "rtems_event_receive: available",tm15,NA,Yes @@ -124,12 +122,7 @@ "rtems_task_delete: calling task",tm18,NA,Yes "rtems_task_delete: ready task",tm06,NA,Yes "rtems_task_delete: suspended task",tm04,NA,Yes -"rtems_task_get_note: only case",tm08,NA,Yes "rtems_task_ident: only case",tm21,NA,Yes -"rtems_task_mode: no reschedule",tm08,NA,Yes -"rtems_task_mode: obtain current mode",tm08,NA,Yes -"rtems_task_mode: reschedule returns to caller",tm08,NA,Yes -"rtems_task_mode: reschedule",tm08,NA,Yes "rtems_task_restart: blocked task preempts caller",tm04,NA,Yes "rtems_task_restart: blocked task",tm04,NA,Yes "rtems_task_restart: calling task",tm06,NA,Yes @@ -139,10 +132,7 @@ "rtems_task_restart: suspended task",tm04,NA,Yes "rtems_task_resume: task readied preempts caller",tm05,NA,Yes "rtems_task_resume: task readied returns to caller",tm06,NA,Yes -"rtems_task_set_note: only case",tm08,NA,Yes -"rtems_task_set_priority: obtain current priority",tm08,NA,Yes "rtems_task_set_priority: preempts caller",tm17,NA,Yes -"rtems_task_set_priority: returns to caller",tm08,NA,Yes "rtems_task_start: only case",tm04,NA,Yes "rtems_task_suspend: calling task",tm05,NA,Yes "rtems_task_suspend: returns to caller",tm06,NA,Yes diff --git a/testsuites/tools/generic/sorttimes.in b/testsuites/tools/generic/sorttimes.in index 41d30ceeaf..3fe4fb6a62 100644 --- a/testsuites/tools/generic/sorttimes.in +++ b/testsuites/tools/generic/sorttimes.in @@ -66,8 +66,6 @@ lookup rtems_task_mode: obtain current mode lookup rtems_task_mode: no reschedule lookup rtems_task_mode: reschedule -- returns to caller lookup rtems_task_mode: reschedule -- preempts caller -lookup rtems_task_get_note -lookup rtems_task_set_note lookup rtems_task_wake_after: yield -- returns to caller lookup rtems_task_wake_after: yields -- preempts caller lookup rtems_task_wake_when |