Ticket #1388: pr1388.diff

cpukit/rtems/src/semcreate.c

@@ -15 +15 @@
  *     + acquire a semaphore
  *     + release a semaphore
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -111 +111 @@
 
   }
 
+  if ( _Attributes_Is_inherit_priority( attribute_set ) &&
+       _Attributes_Is_priority_ceiling( attribute_set ) )
+    return RTEMS_NOT_DEFINED;
+
   if ( !_Attributes_Is_counting_semaphore( attribute_set ) && ( count > 1 ) )
     return RTEMS_INVALID_NUMBER;
 

testsuites/sptests/sp09/screen05.c

@@ -6 +6 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -85 +85 @@
     RTEMS_NOT_DEFINED,
     "rtems_semaphore_create of RTEMS_FIFO RTEMS_INHERIT_PRIORITY"
   );
-  puts( "TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED" );
+  puts( "TA1 - rtems_semaphore_create - FIFO and inherit - RTEMS_NOT_DEFINED" );
+
+  status = rtems_semaphore_create(
+    Semaphore_name[ 1 ],
+    1,
+    RTEMS_PRIORITY_CEILING | RTEMS_BINARY_SEMAPHORE | RTEMS_FIFO,
+    RTEMS_NO_PRIORITY,
+    &Junk_id
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_NOT_DEFINED,
+    "rtems_semaphore_create of RTEMS_FIFO RTEMS_CEILING_PRIORITY"
+  );
+  puts( "TA1 - rtems_semaphore_create - FIFO and ceiling - RTEMS_NOT_DEFINED" );
+
+  status = rtems_semaphore_create(
+    Semaphore_name[ 1 ],
+    1,
+    RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY_CEILING | 
+      RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY,
+    10,
+    &Junk_id
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_NOT_DEFINED,
+    "rtems_semaphore_create of binary with ceiling and inherit"
+  );
+  puts(
+    "TA1 - rtems_semaphore_create - ceiling and inherit - RTEMS_NOT_DEFINED" );
 
   status = rtems_semaphore_create(
     Semaphore_name[ 1 ],

testsuites/sptests/sp09/screen09.c

@@ -6 +6 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -24 +24 @@
   rtems_status_code status;
   rtems_isr_entry   old_service_routine;
 
-#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
-  puts( "TRUE" );
-#else
-  puts( "FALSE" );
-#endif
-
   #if ((CPU_SIMPLE_VECTORED_INTERRUPTS == FALSE) || \
        defined(_C3x) || defined(_C4x))
     puts(

testsuites/sptests/sp09/sp09.scn

@@ -72 +72 @@
 TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL
 TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL
 TA1 - rtems_semaphore_create - 3 - RTEMS_TOO_MANY
-TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - FIFO and inherit - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - FIFO and ceiling - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - ceiling and inherit - RTEMS_NOT_DEFINED
 TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED
 TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER
 TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED