psxtests/psxhdrs patch (GCI 2018)

66 files changed, 662 insertions, 662 deletions

diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_destroy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_destroy.c
index 9d485dcd5e..3cae3a90ae 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_destroy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_destroy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_destroy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getdetachstate.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getdetachstate.c
index 8e5e9475fe..216e77b683 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getdetachstate.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getdetachstate.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getdetachstate() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getguardsize.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getguardsize.c
index b868a425ba..4bdc4d8fc4 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getguardsize.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getguardsize.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getguardsize() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getinheritsched.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getinheritsched.c
index 13d52cfec8..a2c524ae54 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getinheritsched.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getinheritsched.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getinheritsched() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedparam.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedparam.c
index 73f7a3c5a0..8dbf8bad24 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedparam.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedparam.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getschedparam() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedpolicy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedpolicy.c
index 2ca03d7a78..2958826cbd 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedpolicy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedpolicy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getschedpolicy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getscope.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getscope.c
index 871dfd7080..c24f80758a 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getscope.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getscope.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getscope() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstack.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstack.c
index bf0aeb8bca..c1ca327d94 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstack.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstack.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getstack() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2010.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstackaddr.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstackaddr.c
index 9c52f0699d..5ece105af1 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstackaddr.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstackaddr.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getstackaddr() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstacksize.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstacksize.c
index f86d5533a2..cc5affd0c6 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstacksize.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstacksize.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_getstacksize() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_init.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_init.c
index b5129d9c4e..b81a4538e1 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_init.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_init.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_init() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setguardsize.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setguardsize.c
index f79aa14672..907b3d9753 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setguardsize.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setguardsize.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setguardsize() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2010.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setinheritsched.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setinheritsched.c
index fabd960ecf..0d87708c76 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setinheritsched.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setinheritsched.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setinheritsched() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedparam.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedparam.c
index 13cacc8f23..b97608dfe1 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedparam.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedparam.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setschedparam() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedpolicy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedpolicy.c
index 6ab67572c3..6fe244294c 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedpolicy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedpolicy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setschedpolicy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setscope.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setscope.c
index 4adbbc893a..9f7db4a511 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setscope.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setscope.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setscope() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstack.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstack.c
index 0527853dc4..f19ee9497e 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstack.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstack.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setstack() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2010.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstackaddr.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstackaddr.c
index 966bf45f97..191891ad0d 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstackaddr.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstackaddr.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setstackaddr() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstacksize.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstacksize.c
index 9d693ef2a5..7e17a50527 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstacksize.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstacksize.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_attr_setstacksize() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cancel.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cancel.c
index 4adc88a78e..8b2632e4c0 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cancel.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cancel.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cancel() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cleanup.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cleanup.c
index 6400c70d4c..0220b0e21e 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cleanup.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cleanup.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cleanup_push() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_broadcast.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_broadcast.c
index ae44545937..8577ef944b 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_broadcast.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_broadcast.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cond_broadcast() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_destroy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_destroy.c
index cb9d2b3e34..afd5fa132c 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_destroy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_destroy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cond_destroy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_init.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_init.c
index a291fd60f4..c02ab5c996 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_init.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_init.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cond_init() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_signal.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_signal.c
index 39048abe72..fcf32cb689 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_signal.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_signal.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cond_signal() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_timedwait.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_timedwait.c
index 98b2617069..a531b0d638 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_timedwait.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_timedwait.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cond_timedwait() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_wait.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_wait.c
index 5b7e5c3de1..40a65ffbf3 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_cond_wait.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_wait.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_cond_wait() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_destroy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_destroy.c
index 53cee6f6a3..3e56912668 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_destroy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_destroy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_condattr_destroy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_getpshared.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_getpshared.c
index 6e682fcadb..ea0766a378 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_getpshared.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_getpshared.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_condattr_setpshared() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_init.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_init.c
index 22d022f53e..51a0d39b68 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_init.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_init.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_condattr_init() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_setpshared.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_setpshared.c
index 2ed9169dbf..618507373e 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_setpshared.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_setpshared.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_condattr_setpshared() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_create.c b/testsuites/psxtests/psxhdrs/pthread/pthread_create.c
index 5922e1f743..56eb182ce8 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_create.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_create.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_create() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_detach.c b/testsuites/psxtests/psxhdrs/pthread/pthread_detach.c
index eacc37e93e..08eb13b641 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_detach.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_detach.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_detach() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_equal.c b/testsuites/psxtests/psxhdrs/pthread/pthread_equal.c
index f7bdc4d3c8..81b1a699a0 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_equal.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_equal.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_equal() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_exit.c b/testsuites/psxtests/psxhdrs/pthread/pthread_exit.c
index 992629c27e..09a43ad0c0 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_exit.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_exit.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_exit() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_getconcurrency.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getconcurrency.c
index dda472030e..179e526597 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_getconcurrency.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_getconcurrency.c
@@ -1,16 +1,16 @@
-/**
- *  @file
- *  @brief pthread_getconcurrency() API Conformance Test
- */
+/*
+* @file
+* @brief pthread_getconcurrency() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 2016.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_getcpuclockid.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getcpuclockid.c
index 2796a1271c..cb6383be4d 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_getcpuclockid.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_getcpuclockid.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_getcpuclockid() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_getschedparam.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getschedparam.c
index 47089ca37d..f3c18629c2 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_getschedparam.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_getschedparam.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_getschedparam() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_getspecific.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getspecific.c
index f5253b11f6..1f2ecee101 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_getspecific.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_getspecific.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_getspecific() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_join.c b/testsuites/psxtests/psxhdrs/pthread/pthread_join.c
index 02c9d38ebe..2455224ec8 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_join.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_join.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_join() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_key_create.c b/testsuites/psxtests/psxhdrs/pthread/pthread_key_create.c
index 245674a6a9..649b178c9f 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_key_create.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_key_create.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_key_create() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_key_delete.c b/testsuites/psxtests/psxhdrs/pthread/pthread_key_delete.c
index c5323ee2f2..e824a7d7a4 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_key_delete.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_key_delete.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_key_delete() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_destroy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_destroy.c
index 3528e06b17..5b8cbe2703 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_destroy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_destroy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_destroy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_getprioceiling.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_getprioceiling.c
index 620734f911..103bdc6f4c 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_getprioceiling.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_getprioceiling.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_getprioceiling() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_init.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_init.c
index 02e5963d88..b4d619ee25 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_init.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_init.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_init() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_lock.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_lock.c
index e5fe8c2ea2..bed9cb5a97 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_lock.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_lock.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_lock() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_setprioceiling.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_setprioceiling.c
index f6feb81fa2..7b8a4e5e21 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_setprioceiling.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_setprioceiling.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_setprioceiling() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_timedlock.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_timedlock.c
index 61467bf046..57d91c7466 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_timedlock.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_timedlock.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_timedlock() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_trylock.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_trylock.c
index d740cacec7..a2dc94264a 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_trylock.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_trylock.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_trylock() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_unlock.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_unlock.c
index 33cdd9ef31..451937a0f6 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_unlock.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_unlock.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutex_unlock() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_destroy.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_destroy.c
index 62893b6bff..c4e1f1c67f 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_destroy.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_destroy.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_destroy() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprioceiling.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprioceiling.c
index d458336ccc..6eda0c713d 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprioceiling.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprioceiling.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_getprioceiling() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprotocol.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprotocol.c
index 4b8bc502f7..bf4a74cf40 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprotocol.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprotocol.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_getprotocol() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getpshared.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getpshared.c
index 1bd440ec34..f123cbfe10 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getpshared.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getpshared.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_getpshared() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_init.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_init.c
index 0ac6ccab92..e7d607d345 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_init.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_init.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_init() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprioceiling.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprioceiling.c
index 1f1faa757c..bac37a7a98 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprioceiling.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprioceiling.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_setprioceiling() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprotocol.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprotocol.c
index 586fc2f76d..1f56389908 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprotocol.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprotocol.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_setprotocol() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setpshared.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setpshared.c
index cd8b40ac2f..d798d70661 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setpshared.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setpshared.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_mutexattr_setpshared() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_once.c b/testsuites/psxtests/psxhdrs/pthread/pthread_once.c
index c9c087f1ae..dbd6b00bf6 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_once.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_once.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_once() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_self.c b/testsuites/psxtests/psxhdrs/pthread/pthread_self.c
index 42aa1e5fb0..cb663a2d64 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_self.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_self.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_self() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_setcancelstate.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setcancelstate.c
index 274cf2a1c3..ba780977cc 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_setcancelstate.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_setcancelstate.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_setcancelstate() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_setcanceltype.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setcanceltype.c
index 2a6e36838f..947447887c 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_setcanceltype.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_setcanceltype.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_setcanceltype() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_setconcurrency.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setconcurrency.c
index 91b1889f10..1e2b7cb4b1 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_setconcurrency.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_setconcurrency.c
@@ -1,16 +1,16 @@
-/**
- *  @file
- *  @brief pthread_setconcurrency() API Conformance Test
- */
+/*
+* @file
+* @brief pthread_setconcurrency() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 2016.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_setschedparam.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setschedparam.c
index 6bc7d1f735..df2ab2b40c 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_setschedparam.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_setschedparam.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_setschedparam() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_setspecific.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setspecific.c
index ebce3dbbb5..9b638d0677 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_setspecific.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_setspecific.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_setspecific() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/testsuites/psxtests/psxhdrs/pthread/pthread_testcancel.c b/testsuites/psxtests/psxhdrs/pthread/pthread_testcancel.c
index d562b78a1d..22406c31ac 100644
--- a/testsuites/psxtests/psxhdrs/pthread/pthread_testcancel.c
+++ b/testsuites/psxtests/psxhdrs/pthread/pthread_testcancel.c
@@ -1,16 +1,16 @@
 /*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- */
+* @file
+* @brief pthread_testcancel() API Conformance Test
+*/
 
 /*
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
+* COPYRIGHT (c) 1989-2009.
+* On-Line Applications Research Corporation (OAR).
+*
+* The license and distribution terms for this file may be
+* found in the file LICENSE in this distribution or at
+* http://www.rtems.org/license/LICENSE.
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"