maximum number of messages removed and include statement cleanup

8 files changed, 66 insertions, 48 deletions

diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c
index 9b091a407a..b036468562 100644
--- a/testsuites/sptests/sp09/screen05.c
+++ b/testsuites/sptests/sp09/screen05.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen05.c,v 1.2 1995/05/31 17:08:59 joel Exp
  */
 
 #include "system.h"
@@ -49,12 +49,14 @@ void Screen5()
   directive_failed( status, "rtems_semaphore_create" );
   puts( "TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_semaphore_create(
-     Semaphore_name[ 3 ],
-     1,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Junk_id
-  );
+  do {
+      status = rtems_semaphore_create(
+          Semaphore_name[ 3 ],
+          1,
+          RTEMS_DEFAULT_ATTRIBUTES,
+          &Junk_id);
+  } while (status == RTEMS_SUCCESSFUL);
+
   fatal_directive_status(
     status,
     RTEMS_TOO_MANY,
diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c
index fd808f833d..0fa8b5c27b 100644
--- a/testsuites/sptests/sp09/screen07.c
+++ b/testsuites/sptests/sp09/screen07.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen07.c,v 1.2 1995/05/31 17:09:03 joel Exp
  */
 
 #include "system.h"
@@ -22,10 +22,11 @@
 void Screen7()
 {
   long              buffer[ 4 ];
+  rtems_unsigned32  size;
   rtems_unsigned32  count;
   rtems_status_code status;
 
-  status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, &count );
+  status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, 16, &count );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -36,6 +37,7 @@ void Screen7()
   status = rtems_message_queue_create(
     0,
     3,
+    16,
     RTEMS_DEFAULT_ATTRIBUTES,
     &Junk_id
   );
@@ -49,6 +51,7 @@ void Screen7()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     1,
+    16,
     RTEMS_GLOBAL,
     &Junk_id
   );
@@ -62,17 +65,19 @@ void Screen7()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     2,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL"
   );
 
   status = rtems_message_queue_create(
     Queue_name[ 2 ],
     1,
+    16,
     RTEMS_DEFAULT_ATTRIBUTES,
     &Junk_id
   );
@@ -118,6 +123,7 @@ void Screen7()
   status = rtems_message_queue_receive(
     100,
     (long (*)[4]) buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     0
   );
@@ -131,6 +137,7 @@ void Screen7()
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4]) buffer,
+    &size,
     RTEMS_NO_WAIT,
     RTEMS_NO_TIMEOUT
   );
@@ -145,6 +152,7 @@ void Screen7()
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4]) buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     3 * TICKS_PER_SECOND
   );
@@ -158,7 +166,7 @@ void Screen7()
     "TA1 - rtems_message_queue_receive - Q 1 - woke up with RTEMS_TIMEOUT"
   );
 
-  status = rtems_message_queue_send( 100, (long (*)[4]) buffer );
+  status = rtems_message_queue_send( 100, (long (*)[4]) buffer, 16 );
   fatal_directive_status(
     status,
     RTEMS_INVALID_ID,
@@ -166,15 +174,15 @@ void Screen7()
   );
   puts( "TA1 - rtems_message_queue_send - RTEMS_INVALID_ID" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
   directive_failed( status, "rtems_message_queue_send" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
   fatal_directive_status(
     status,
     RTEMS_TOO_MANY,
diff --git a/testsuites/sptests/sp09/screen08.c b/testsuites/sptests/sp09/screen08.c
index 18c9b8d2d8..2431dbbd0e 100644
--- a/testsuites/sptests/sp09/screen08.c
+++ b/testsuites/sptests/sp09/screen08.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen08.c,v 1.2 1995/05/31 17:09:05 joel Exp
  */
 
 #include "system.h"
@@ -31,23 +31,24 @@ void Screen8()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     2,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL"
   );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   fatal_directive_status(
     status,
     RTEMS_TOO_MANY,
@@ -62,30 +63,35 @@ void Screen8()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     3,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL"
   );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   directive_failed( status, "rtems_message_queue_send successful" );
   puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
 
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer );
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
+  directive_failed( status, "rtems_message_queue_send successful" );
+  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL" );
+
+  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
   fatal_directive_status(
     status,
-    RTEMS_UNSATISFIED,
+    RTEMS_TOO_MANY,
     "rtems_message_queue_send too many to limited queue"
   );
   puts(
-    "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_UNSATISFIED"
+    "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 1 - RTEMS_TOO_MANY"
   );
 
   status = rtems_message_queue_delete( Queue_id[ 1 ] );
@@ -95,12 +101,13 @@ void Screen8()
   status = rtems_message_queue_create(
     Queue_name[ 1 ],
     3,
-    RTEMS_LIMIT,
+    16,
+    RTEMS_DEFAULT_ATTRIBUTES,
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create successful" );
   puts(
-    "TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL"
+    "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL"
   );
 
   puts( "TA1 - rtems_task_start - start TA3 - RTEMS_SUCCESSFUL" );
diff --git a/testsuites/sptests/sp09/screen09.c b/testsuites/sptests/sp09/screen09.c
index 5c6eece679..444ead79a2 100644
--- a/testsuites/sptests/sp09/screen09.c
+++ b/testsuites/sptests/sp09/screen09.c
@@ -14,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen09.c,v 1.2 1995/05/31 17:09:07 joel Exp
  */
 
 #include "system.h"
diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c
index c96adeec40..6e09d7196c 100644
--- a/testsuites/sptests/sp09/screen13.c
+++ b/testsuites/sptests/sp09/screen13.c
@@ -14,53 +14,52 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  screen13.c,v 1.2 1995/05/31 17:09:14 joel Exp
  */
 
 #include "system.h"
 
 void Screen13()
 {
-  rtems_unsigned32  result;
   rtems_time_of_day time;
   rtems_status_code status;
 
-  status = rtems_io_close( 0xffff, 0x0000, NULL, &result );
+  status = rtems_io_close( 0xffff, 0x0000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_close with bad major number"
   );
   puts( "TA1 - rtems_io_close - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_control( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_control( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_close with bad major number"
   );
   puts( "TA1 - rtems_io_control - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_initialize( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_initialize( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_initialize with bad major number"
   );
   puts( "TA1 - rtems_io_initialize - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_open( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_open( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_open with bad major number"
   );
   puts( "TA1 - rtems_io_open - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_read( 0xffff, 0x00000, NULL, &result );
+  status = rtems_io_read( 0xffff, 0x00000, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
     "rtems_io_read with bad major number"
   );
   puts( "TA1 - rtems_io_read - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_write( 0xffff, 0x0ffff, NULL, &result );
+  status = rtems_io_write( 0xffff, 0x0ffff, NULL);
   fatal_directive_status(
     status,
     RTEMS_INVALID_NUMBER,
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index 158593dcba..e1c59f6397 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -96,7 +96,7 @@ TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_broadcast - RTEMS_INVALID_ID
 TA1 - rtems_message_queue_create - Q 1 - RTEMS_INVALID_NAME
 TA1 - rtems_message_queue_create - Q 1 - RTEMS_MP_NOT_CONFIGURED
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_create - Q 2 - RTEMS_TOO_MANY
 TA1 - rtems_message_queue_delete - unknown RTEMS_INVALID_ID
 TA1 - rtems_message_queue_delete - local RTEMS_INVALID_ID
@@ -112,17 +112,18 @@ TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY
 <pause - screen 8>
 TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY
 TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_UNSATISFIED
+TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_send - BUFFER 4 TO Q 1 - RTEMS_TOO_MANY
 TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_LIMIT - RTEMS_SUCCESSFUL
+TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL
 TA1 - rtems_task_start - start TA3 - RTEMS_SUCCESSFUL
 TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
 TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER
diff --git a/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h
index aa2c6d17e4..b46c6c992d 100644
--- a/testsuites/sptests/sp09/system.h
+++ b/testsuites/sptests/sp09/system.h
@@ -11,11 +11,10 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  system.h,v 1.2 1995/05/31 17:09:17 joel Exp
  */
 
-#include <rtems.h>
-#include "tmacros.h"
+#include <tmacros.h>
 
 /* Miscellaneous */
 
diff --git a/testsuites/sptests/sp09/task3.c b/testsuites/sptests/sp09/task3.c
index 8420c51f4d..7a953e2e26 100644
--- a/testsuites/sptests/sp09/task3.c
+++ b/testsuites/sptests/sp09/task3.c
@@ -17,7 +17,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  task3.c,v 1.2 1995/05/31 17:09:22 joel Exp
  */
 
 #include "system.h"
@@ -28,11 +28,13 @@ rtems_task Task_3(
 {
   rtems_status_code status;
   long              buffer[ 4 ];
+  rtems_unsigned32  size;
 
   puts( "TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER" );
   status = rtems_message_queue_receive(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
+    &size,
     RTEMS_DEFAULT_OPTIONS,
     RTEMS_NO_TIMEOUT
   );