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.

25 files changed, 1 insertions, 765 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;