2009-01-05 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp09/screen05.c, sp09/screen07.c, sp09/screen10.c, sp09/screen11.c,
	sp09/screen12.c, sp09/screen14.c: Use rtems_build_id rather than
	hard-coded hex numbers for bad object Ids.

6 files changed, 24 insertions, 14 deletions

diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c
index b20e96dfb4..9b3faa7c01 100644
--- a/testsuites/sptests/sp09/screen05.c
+++ b/testsuites/sptests/sp09/screen05.c
@@ -144,7 +144,7 @@ void Screen5()
   );
   puts( "TA1 - rtems_semaphore_delete - RTEMS_INVALID_ID" );
 
-  status = rtems_semaphore_delete( 0x010100 );
+  status = rtems_semaphore_delete( rtems_build_id( 1, 0, 0, 0 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c
index 4d3c26ff27..0401421b23 100644
--- a/testsuites/sptests/sp09/screen07.c
+++ b/testsuites/sptests/sp09/screen07.c
@@ -117,7 +117,7 @@ void Screen7()
   );
   puts( "TA1 - rtems_message_queue_delete - unknown RTEMS_INVALID_ID" );
 
-  status = rtems_message_queue_delete( 0x10100 );
+  status = rtems_message_queue_delete( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
diff --git a/testsuites/sptests/sp09/screen10.c b/testsuites/sptests/sp09/screen10.c
index 7fe865621d..c9c88a31ee 100644
--- a/testsuites/sptests/sp09/screen10.c
+++ b/testsuites/sptests/sp09/screen10.c
@@ -68,7 +68,7 @@ void Screen10()
   );
   puts( "TA1 - rtems_rate_monotonic_period - RTEMS_INVALID_ID" );
 
-  status = rtems_rate_monotonic_period( 0x10100, 5 );
+  status = rtems_rate_monotonic_period( rtems_build_id( 1, 1, 1, 256 ), 5 );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -135,7 +135,7 @@ void Screen10()
   );
   puts( "TA1 - rtems_rate_monotonic_cancel - RTEMS_INVALID_ID" );
 
-  status = rtems_rate_monotonic_cancel( 0x10100 );
+  status = rtems_rate_monotonic_cancel( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -178,7 +178,7 @@ void Screen10()
   );
   puts( "TA1 - rtems_rate_monotonic_delete - RTEMS_INVALID_ID" );
 
-  status = rtems_rate_monotonic_delete( 0x10100 );
+  status = rtems_rate_monotonic_delete( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
diff --git a/testsuites/sptests/sp09/screen11.c b/testsuites/sptests/sp09/screen11.c
index 3ddd87471e..d685b62f97 100644
--- a/testsuites/sptests/sp09/screen11.c
+++ b/testsuites/sptests/sp09/screen11.c
@@ -155,7 +155,7 @@ void Screen11()
   );
   puts( "TA1 - rtems_partition_delete - unknown RTEMS_INVALID_ID" );
 
-  status = rtems_partition_delete( 0x10100 );
+  status = rtems_partition_delete( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
diff --git a/testsuites/sptests/sp09/screen12.c b/testsuites/sptests/sp09/screen12.c
index 000c4a5f16..516cbeb2f4 100644
--- a/testsuites/sptests/sp09/screen12.c
+++ b/testsuites/sptests/sp09/screen12.c
@@ -162,7 +162,7 @@ void Screen12()
   );
   puts( "TA1 - rtems_region_delete - unknown RTEMS_INVALID_ID" );
 
-  status = rtems_region_delete( 0x10100 );
+  status = rtems_region_delete( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
diff --git a/testsuites/sptests/sp09/screen14.c b/testsuites/sptests/sp09/screen14.c
index ef8b006f6c..d4cb40ae08 100644
--- a/testsuites/sptests/sp09/screen14.c
+++ b/testsuites/sptests/sp09/screen14.c
@@ -53,7 +53,7 @@ void Screen14()
   );
   puts( "TA1 - rtems_timer_delete - local RTEMS_INVALID_ID" );
 
-  status = rtems_timer_delete( 0x010100 );
+  status = rtems_timer_delete( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -69,7 +69,7 @@ void Screen14()
   );
   puts( "TA1 - rtems_timer_ident - RTEMS_INVALID_NAME" );
 
-  status = rtems_timer_cancel( 0x010100 );
+  status = rtems_timer_cancel( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -77,7 +77,7 @@ void Screen14()
   );
   puts( "TA1 - rtems_timer_cancel - RTEMS_INVALID_ID" );
 
-  status = rtems_timer_reset( 0x010100 );
+  status = rtems_timer_reset( rtems_build_id( 1, 1, 1, 256 ) );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -94,7 +94,7 @@ void Screen14()
   puts( "TA1 - rtems_timer_reset - RTEMS_NOT_DEFINED" );
 
   status = rtems_timer_fire_after(
-    0x010100,
+    rtems_build_id( 1, 1, 1, 256 ),
     5 * TICKS_PER_SECOND,
     Delayed_routine,
     NULL
@@ -107,7 +107,12 @@ void Screen14()
   puts( "TA1 - rtems_timer_fire_after - RTEMS_INVALID_ID" );
 
   build_time( &time, 12, 31, 1994, 9, 0, 0, 0 );
-  status = rtems_timer_fire_when( 0x010100, &time, Delayed_routine, NULL );
+  status = rtems_timer_fire_when( 
+    rtems_build_id( 1, 1, 1, 256 ),
+    &time,
+    Delayed_routine,
+    NULL
+  );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -214,7 +219,7 @@ void Screen14()
   puts( "TA1 - rtems_timer_initiate_server - SUCCESSFUL" );
 
   status = rtems_timer_server_fire_after(
-    0x010100,
+    rtems_build_id( 1, 1, 1, 256 ),
     5 * TICKS_PER_SECOND,
     Delayed_routine,
     NULL
@@ -227,7 +232,12 @@ void Screen14()
   puts( "TA1 - rtems_timer_server_fire_after - RTEMS_INVALID_ID" );
 
   build_time( &time, 12, 31, 1994, 9, 0, 0, 0 );
-  status = rtems_timer_server_fire_when( 0x010100, &time, Delayed_routine, NULL );
+  status = rtems_timer_server_fire_when(
+    rtems_build_id( 1, 1, 1, 256 ),
+    &time,
+    Delayed_routine,
+    NULL
+  );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,