2008-01-29 Joel Sherrill <joel.sherrill@oarcorp.com>

	* mp02/task1.c, mp14/delay.c: Add new Object Services collection. This
	changed the name of a few previously public but undocumented services
	and added a some new services.

3 files changed, 18 insertions, 18 deletions

diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog
index 71560e2ac1..dff00829b6 100644
--- a/testsuites/mptests/ChangeLog
+++ b/testsuites/mptests/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-29	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* mp02/task1.c, mp14/delay.c: Add new Object Services collection. This
+	changed the name of a few previously public but undocumented services
+	and added a some new services.
+
 2007-03-28	Joel Sherrill <joel@OARcorp.com>
 
 	* mp12/node2/mp12-node2.scn: Redo screen to not have cvs conflict
diff --git a/testsuites/mptests/mp02/task1.c b/testsuites/mptests/mp02/task1.c
index c00df840ba..6e63a7c9fe 100644
--- a/testsuites/mptests/mp02/task1.c
+++ b/testsuites/mptests/mp02/task1.c
@@ -9,7 +9,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -29,10 +29,11 @@ rtems_task Test_task(
 {
   rtems_id          tid;
   rtems_status_code status;
-  uint32_t    remote_node;
+  uint32_t          remote_node;
   rtems_id          remote_tid;
   rtems_id          test_tid;
-  uint32_t    note;
+  uint32_t          note;
+  uint32_t          tmpNode;
 
   status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
 
@@ -84,29 +85,22 @@ rtems_task Test_task(
   );
   puts( "rtems_task_restart of remote task returned the correct error" );
 
-  printf(
-   "Setting notepad %d of the remote task to %d\n",
-   rtems_get_node(tid),
-   rtems_get_node(tid)
-  );
-  status = rtems_task_set_note(
-    remote_tid,
-    rtems_get_node(tid),
-    rtems_get_node(tid)
-  );
+  tmpNode = rtems_object_id_get_node(tid);
+  printf( "Setting notepad %d of the remote task to %d\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, rtems_get_node(tid), &note );
+  status = rtems_task_get_note( remote_tid, tmpNode, &note );
   directive_failed( status, "rtems_task_get_note" );
 
-  if ( note == rtems_get_node(tid) )
+  if ( note == tmpNode )
     puts( "Remote notepad set and read correctly" );
   else
     printf(
       "FAILURE!! Remote notepad was not set and read correctly (%d, %d)\n",
       note,
-      rtems_get_node( tid )
+      tmpNode
     );
 
   status = rtems_task_wake_after( TICKS_PER_SECOND );
diff --git a/testsuites/mptests/mp14/delay.c b/testsuites/mptests/mp14/delay.c
index c7b9632e38..f2d1dcb730 100644
--- a/testsuites/mptests/mp14/delay.c
+++ b/testsuites/mptests/mp14/delay.c
@@ -6,7 +6,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -26,7 +26,7 @@ rtems_timer_service_routine Delayed_send_event(
   rtems_status_code status;
 
   status = rtems_event_send(
-    Task_id[ rtems_get_index( timer_id ) ],
+    Task_id[ rtems_object_id_get_index( timer_id ) ],
     RTEMS_EVENT_16
   );
   fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "rtems_event_send" );