validation: Format comment blocks

9 files changed, 136 insertions, 164 deletions

diff --git a/testsuites/validation/tc-barrier-create.c b/testsuites/validation/tc-barrier-create.c
index f55e3311d1..cd3c2283e8 100644
--- a/testsuites/validation/tc-barrier-create.c
+++ b/testsuites/validation/tc-barrier-create.c
@@ -278,8 +278,7 @@ static void RtemsBarrierReqCreate_Pre_Class_Prepare(
   switch ( state ) {
     case RtemsBarrierReqCreate_Pre_Class_Default: {
       /*
-       * The ``attribute_set`` parameter shall specify the default
-       * class.
+       * The ``attribute_set`` parameter shall specify the default class.
        */
       /* Nothing to do */
       break;
@@ -287,8 +286,8 @@ static void RtemsBarrierReqCreate_Pre_Class_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Class_Manual: {
       /*
-       * The ``attribute_set`` parameter shall specify the manual
-       * release class.
+       * The ``attribute_set`` parameter shall specify the manual release
+       * class.
        */
       ctx->attribute_set |= RTEMS_BARRIER_MANUAL_RELEASE;
       break;
@@ -296,8 +295,8 @@ static void RtemsBarrierReqCreate_Pre_Class_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Class_Auto: {
       /*
-       * The ``attribute_set`` parameter shall specify the
-       * automatic release class.
+       * The ``attribute_set`` parameter shall specify the automatic release
+       * class.
        */
       ctx->attribute_set |= RTEMS_BARRIER_AUTOMATIC_RELEASE;
       break;
@@ -343,8 +342,7 @@ static void RtemsBarrierReqCreate_Pre_Id_Prepare(
   switch ( state ) {
     case RtemsBarrierReqCreate_Pre_Id_Valid: {
       /*
-       * The ``id`` parameter shall reference an object
-       * identifier value.
+       * The ``id`` parameter shall reference an object identifier value.
        */
       ctx->id = &ctx->id_value;
       break;
@@ -352,8 +350,7 @@ static void RtemsBarrierReqCreate_Pre_Id_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Id_Null: {
       /*
-       * The ``id`` parameter shall be
-       * NULL.
+       * The ``id`` parameter shall be NULL.
        */
       ctx->id = NULL;
       break;
@@ -399,8 +396,7 @@ static void RtemsBarrierReqCreate_Post_Status_Check(
   switch ( state ) {
     case RtemsBarrierReqCreate_Post_Status_Ok: {
       /*
-       * The return status of rtems_barrier_create() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_barrier_create() shall be RTEMS_SUCCESSFUL.
        */
       T_rsc_success( ctx->status );
       break;
@@ -435,8 +431,7 @@ static void RtemsBarrierReqCreate_Post_Status_Check(
 
     case RtemsBarrierReqCreate_Post_Status_TooMany: {
       /*
-       * The return status of rtems_barrier_create() shall be
-       * RTEMS_TOO_MANY.
+       * The return status of rtems_barrier_create() shall be RTEMS_TOO_MANY.
        */
       T_rsc( ctx->status, RTEMS_TOO_MANY );
       break;
@@ -492,7 +487,8 @@ static void RtemsBarrierReqCreate_Post_Class_Check(
   switch ( state ) {
     case RtemsBarrierReqCreate_Post_Class_NoObj: {
       /*
-       * The barrier class is not applicable since there was no barrier created.
+       * The barrier class is not applicable since there was no barrier
+       * created.
        */
       /* Not applicable */
       break;
@@ -534,8 +530,9 @@ static void RtemsBarrierReqCreate_Post_IdValue_Check(
   switch ( state ) {
     case RtemsBarrierReqCreate_Post_IdValue_Assigned: {
       /*
-       * The value of the object identifier variable shall be equal to the object
-       * identifier of the barrier created by the rtems_barrier_create() call.
+       * The value of the object identifier variable shall be equal to the
+       * object identifier of the barrier created by the rtems_barrier_create()
+       * call.
        */
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
diff --git a/testsuites/validation/tc-barrier-delete.c b/testsuites/validation/tc-barrier-delete.c
index a65e3d4c91..a676889926 100644
--- a/testsuites/validation/tc-barrier-delete.c
+++ b/testsuites/validation/tc-barrier-delete.c
@@ -184,8 +184,7 @@ static void RtemsBarrierReqDelete_Pre_Id_Prepare(
   switch ( state ) {
     case RtemsBarrierReqDelete_Pre_Id_Valid: {
       /*
-       * The ``id`` parameter shall be associated with
-       * the barrier.
+       * The ``id`` parameter shall be associated with the barrier.
        */
       ctx->id = ctx->barrier_id;
       break;
@@ -212,8 +211,7 @@ static void RtemsBarrierReqDelete_Post_Status_Check(
   switch ( state ) {
     case RtemsBarrierReqDelete_Post_Status_Ok: {
       /*
-       * The return status of rtems_barrier_delete() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_barrier_delete() shall be RTEMS_SUCCESSFUL.
        */
       ctx->barrier_id = 0;
       T_rsc_success( ctx->status );
@@ -222,8 +220,7 @@ static void RtemsBarrierReqDelete_Post_Status_Check(
 
     case RtemsBarrierReqDelete_Post_Status_InvId: {
       /*
-       * The return status of rtems_barrier_delete() shall be
-       * RTEMS_INVALID_ID.
+       * The return status of rtems_barrier_delete() shall be RTEMS_INVALID_ID.
        */
       T_rsc( ctx->status, RTEMS_INVALID_ID );
       break;
diff --git a/testsuites/validation/tc-barrier-release.c b/testsuites/validation/tc-barrier-release.c
index 3fcf8f13e9..1228a8ba1b 100644
--- a/testsuites/validation/tc-barrier-release.c
+++ b/testsuites/validation/tc-barrier-release.c
@@ -222,8 +222,8 @@ static void RtemsBarrierReqRelease_Pre_Barrier_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Barrier_Manual: {
       /*
-       * The ``id`` parameter shall be associated with a
-       * manual release barrier.
+       * The ``id`` parameter shall be associated with a manual release
+       * barrier.
        */
       ctx->id = ctx->manual_release_id;
       break;
@@ -231,8 +231,8 @@ static void RtemsBarrierReqRelease_Pre_Barrier_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Barrier_Auto: {
       /*
-       * The ``id`` parameter shall be associated with an
-       * automatic release barrier.
+       * The ``id`` parameter shall be associated with an automatic release
+       * barrier.
        */
       ctx->id = ctx->auto_release_id;
       break;
@@ -261,8 +261,7 @@ static void RtemsBarrierReqRelease_Pre_Released_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Released_Null: {
       /*
-       * The ``released`` parameter shall be
-       * NULL.
+       * The ``released`` parameter shall be NULL.
        */
       ctx->released = NULL;
       break;
@@ -356,8 +355,8 @@ static void RtemsBarrierReqRelease_Post_Released_Check(
 
     case RtemsBarrierReqRelease_Post_Released_Unchanged: {
       /*
-       * The value of variable for the number of released tasks shall be unchanged
-       * by the rtems_barrier_release() call.
+       * The value of variable for the number of released tasks shall be
+       * unchanged by the rtems_barrier_release() call.
        */
       T_eq_u32( ctx->released_value, RELEASED_INVALID_VALUE );
       break;
diff --git a/testsuites/validation/tc-barrier-wait.c b/testsuites/validation/tc-barrier-wait.c
index f66452a5e0..a6b3527ec5 100644
--- a/testsuites/validation/tc-barrier-wait.c
+++ b/testsuites/validation/tc-barrier-wait.c
@@ -272,8 +272,8 @@ static void RtemsBarrierReqWait_Pre_Barrier_Prepare(
 
     case RtemsBarrierReqWait_Pre_Barrier_Manual: {
       /*
-       * The ``id`` parameter shall be associated with a
-       * manual release barrier.
+       * The ``id`` parameter shall be associated with a manual release
+       * barrier.
        */
       ctx->id = ctx->manual_release_id;
       break;
@@ -281,8 +281,8 @@ static void RtemsBarrierReqWait_Pre_Barrier_Prepare(
 
     case RtemsBarrierReqWait_Pre_Barrier_Auto: {
       /*
-       * The ``id`` parameter shall be associated with an
-       * automatic release barrier.
+       * The ``id`` parameter shall be associated with an automatic release
+       * barrier.
        */
       ctx->id = ctx->auto_release_id;
       break;
@@ -301,8 +301,7 @@ static void RtemsBarrierReqWait_Pre_Timeout_Prepare(
   switch ( state ) {
     case RtemsBarrierReqWait_Pre_Timeout_Ticks: {
       /*
-       * The ``released`` parameter shall be a clock tick
-       * interval.
+       * The ``released`` parameter shall be a clock tick interval.
        */
       ctx->timeout = 2;
       break;
@@ -310,8 +309,7 @@ static void RtemsBarrierReqWait_Pre_Timeout_Prepare(
 
     case RtemsBarrierReqWait_Pre_Timeout_Forever: {
       /*
-       * The ``released`` parameter shall be
-       * RTEMS_NO_TIMEOUT.
+       * The ``released`` parameter shall be RTEMS_NO_TIMEOUT.
        */
       ctx->timeout = RTEMS_NO_TIMEOUT;
       break;
@@ -378,8 +376,7 @@ static void RtemsBarrierReqWait_Post_Status_Check(
   switch ( state ) {
     case RtemsBarrierReqWait_Post_Status_Ok: {
       /*
-       * The return status of rtems_barrier_wait() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_barrier_wait() shall be RTEMS_SUCCESSFUL.
        */
       T_rsc_success( ctx->status );
       break;
@@ -387,8 +384,7 @@ static void RtemsBarrierReqWait_Post_Status_Check(
 
     case RtemsBarrierReqWait_Post_Status_InvId: {
       /*
-       * The return status of rtems_barrier_wait() shall be
-       * RTEMS_INVALID_ID.
+       * The return status of rtems_barrier_wait() shall be RTEMS_INVALID_ID.
        */
       T_rsc( ctx->status, RTEMS_INVALID_ID );
       break;
@@ -396,8 +392,7 @@ static void RtemsBarrierReqWait_Post_Status_Check(
 
     case RtemsBarrierReqWait_Post_Status_Timeout: {
       /*
-       * The return status of rtems_barrier_wait() shall be
-       * RTEMS_TIMEOUT.
+       * The return status of rtems_barrier_wait() shall be RTEMS_TIMEOUT.
        */
       T_rsc( ctx->status, RTEMS_TIMEOUT );
       break;
diff --git a/testsuites/validation/tc-message-construct-errors.c b/testsuites/validation/tc-message-construct-errors.c
index d5e0b301fd..e1b36091b4 100644
--- a/testsuites/validation/tc-message-construct-errors.c
+++ b/testsuites/validation/tc-message-construct-errors.c
@@ -316,8 +316,8 @@ static void RtemsMessageReqConstructErrors_Pre_MaxPending_Prepare(
   switch ( state ) {
     case RtemsMessageReqConstructErrors_Pre_MaxPending_Valid: {
       /*
-       * The maximum number of pending messages of the message queue configuration
-       * shall be valid.
+       * The maximum number of pending messages of the message queue
+       * configuration shall be valid.
        */
       ctx->config.maximum_pending_messages = MAX_PENDING_MESSAGES;
       break;
@@ -325,8 +325,8 @@ static void RtemsMessageReqConstructErrors_Pre_MaxPending_Prepare(
 
     case RtemsMessageReqConstructErrors_Pre_MaxPending_Zero: {
       /*
-       * The maximum number of pending messages of the message queue configuration
-       * shall be zero.
+       * The maximum number of pending messages of the message queue
+       * configuration shall be zero.
        */
       ctx->config.maximum_pending_messages = 0;
       break;
@@ -334,9 +334,9 @@ static void RtemsMessageReqConstructErrors_Pre_MaxPending_Prepare(
 
     case RtemsMessageReqConstructErrors_Pre_MaxPending_Big: {
       /*
-       * The maximum number of pending messages of the message queue configuration
-       * shall be big enough so that a calculation to get the message buffer
-       * storage area size overflows.
+       * The maximum number of pending messages of the message queue
+       * configuration shall be big enough so that a calculation to get the
+       * message buffer storage area size overflows.
        */
       ctx->config.maximum_pending_messages = UINT32_MAX;
       break;
@@ -373,9 +373,9 @@ static void RtemsMessageReqConstructErrors_Pre_MaxSize_Prepare(
 
     case RtemsMessageReqConstructErrors_Pre_MaxSize_Big: {
       /*
-       * The maximum message size of the message queue configuration
-       * shall be big enough so that a calculation to get the message buffer
-       * storage area size overflows.
+       * The maximum message size of the message queue configuration shall be
+       * big enough so that a calculation to get the message buffer storage
+       * area size overflows.
        */
       ctx->config.maximum_message_size = SIZE_MAX;
       break;
@@ -454,8 +454,8 @@ static void RtemsMessageReqConstructErrors_Pre_AreaSize_Prepare(
   switch ( state ) {
     case RtemsMessageReqConstructErrors_Pre_AreaSize_Valid: {
       /*
-       * The message buffer storage area size of the message queue configuration
-       * shall be valid.
+       * The message buffer storage area size of the message queue
+       * configuration shall be valid.
        */
       ctx->config.storage_size = sizeof( buffers );
       break;
@@ -463,8 +463,8 @@ static void RtemsMessageReqConstructErrors_Pre_AreaSize_Prepare(
 
     case RtemsMessageReqConstructErrors_Pre_AreaSize_Invalid: {
       /*
-       * The message buffer storage area size of the message queue configuration
-       * shall be invalid.
+       * The message buffer storage area size of the message queue
+       * configuration shall be invalid.
        */
       ctx->config.storage_size = SIZE_MAX;
       break;
@@ -592,8 +592,8 @@ static void RtemsMessageReqConstructErrors_Post_IdValue_Check(
   switch ( state ) {
     case RtemsMessageReqConstructErrors_Post_IdValue_Assigned: {
       /*
-       * The value of the object identifier variable shall be equal to the object
-       * identifier of the message queue constructed by the
+       * The value of the object identifier variable shall be equal to the
+       * object identifier of the message queue constructed by the
        * rtems_message_queue_construct() call.
        */
       T_eq_ptr( ctx->id, &ctx->id_value );
diff --git a/testsuites/validation/tc-signal-catch.c b/testsuites/validation/tc-signal-catch.c
index 7c3292ba71..acca855ede 100644
--- a/testsuites/validation/tc-signal-catch.c
+++ b/testsuites/validation/tc-signal-catch.c
@@ -279,8 +279,7 @@ static void RtemsSignalReqCatch_Pre_Preempt_Prepare(
   switch ( state ) {
     case RtemsSignalReqCatch_Pre_Preempt_Yes: {
       /*
-       * The ``mode_set`` parameter shall specify that
-       * preemption is enabled.
+       * The ``mode_set`` parameter shall specify that preemption is enabled.
        */
       #if defined(RTEMS_SMP)
       if ( rtems_configuration_get_maximum_processors() == 1 ) {
@@ -294,8 +293,7 @@ static void RtemsSignalReqCatch_Pre_Preempt_Prepare(
 
     case RtemsSignalReqCatch_Pre_Preempt_No: {
       /*
-       * The ``mode_set`` parameter shall specify that
-       * preemption is disabled.
+       * The ``mode_set`` parameter shall specify that preemption is disabled.
        */
       ctx->mode |= RTEMS_NO_PREEMPT;
       break;
@@ -314,8 +312,7 @@ static void RtemsSignalReqCatch_Pre_Timeslice_Prepare(
   switch ( state ) {
     case RtemsSignalReqCatch_Pre_Timeslice_Yes: {
       /*
-       * The ``mode_set`` parameter shall specify that
-       * timeslicing is enabled.
+       * The ``mode_set`` parameter shall specify that timeslicing is enabled.
        */
       ctx->mode |= RTEMS_TIMESLICE;
       break;
@@ -323,8 +320,7 @@ static void RtemsSignalReqCatch_Pre_Timeslice_Prepare(
 
     case RtemsSignalReqCatch_Pre_Timeslice_No: {
       /*
-       * The ``mode_set`` parameter shall specify that
-       * timeslicing is disabled.
+       * The ``mode_set`` parameter shall specify that timeslicing is disabled.
        */
       ctx->normal_mode |= RTEMS_TIMESLICE;
       break;
@@ -343,8 +339,8 @@ static void RtemsSignalReqCatch_Pre_ASR_Prepare(
   switch ( state ) {
     case RtemsSignalReqCatch_Pre_ASR_Yes: {
       /*
-       * The ``mode_set`` parameter shall specify that
-       * ASR processing is enabled.
+       * The ``mode_set`` parameter shall specify that ASR processing is
+       * enabled.
        */
       /* We cannot disable ASR processing at normal task level for this test */
       break;
@@ -352,8 +348,8 @@ static void RtemsSignalReqCatch_Pre_ASR_Prepare(
 
     case RtemsSignalReqCatch_Pre_ASR_No: {
       /*
-       * The ``mode_set`` parameter shall specify that
-       * ASR processing is disabled.
+       * The ``mode_set`` parameter shall specify that ASR processing is
+       * disabled.
        */
       ctx->mode |= RTEMS_NO_ASR;
       break;
@@ -372,8 +368,7 @@ static void RtemsSignalReqCatch_Pre_IntLvl_Prepare(
   switch ( state ) {
     case RtemsSignalReqCatch_Pre_IntLvl_Zero: {
       /*
-       * The ``mode_set`` parameter shall specify an interrupt
-       * level of zero.
+       * The ``mode_set`` parameter shall specify an interrupt level of zero.
        */
       #if !defined(RTEMS_SMP) && CPU_ENABLE_ROBUST_THREAD_DISPATCH == FALSE
       ctx->normal_mode |= RTEMS_INTERRUPT_LEVEL( 1 );
@@ -383,8 +378,7 @@ static void RtemsSignalReqCatch_Pre_IntLvl_Prepare(
 
     case RtemsSignalReqCatch_Pre_IntLvl_Positive: {
       /*
-       * The ``mode_set`` parameter shall specify a positive
-       * interrupt level.
+       * The ``mode_set`` parameter shall specify a positive interrupt level.
        */
       ctx->mode |= RTEMS_INTERRUPT_LEVEL( 1 );
       break;
@@ -403,8 +397,7 @@ static void RtemsSignalReqCatch_Post_Status_Check(
   switch ( state ) {
     case RtemsSignalReqCatch_Post_Status_Ok: {
       /*
-       * The return status of rtems_signal_catch() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_signal_catch() shall be RTEMS_SUCCESSFUL.
        */
       T_rsc_success( ctx->catch_status );
       break;
@@ -414,8 +407,8 @@ static void RtemsSignalReqCatch_Post_Status_Check(
       /*
        * Where the system is configured with SMP support, if the scheduler does
        * not support the no-preempt mode, then the return status of
-       * rtems_signal_catch() shall be RTEMS_NOT_IMPLEMENTED,
-       * otherwise the return status shall be RTEMS_SUCCESSFUL.
+       * rtems_signal_catch() shall be RTEMS_NOT_IMPLEMENTED, otherwise the
+       * return status shall be RTEMS_SUCCESSFUL.
        */
       #if defined(RTEMS_SMP)
       if ( rtems_configuration_get_maximum_processors() > 1 ) {
@@ -434,8 +427,8 @@ static void RtemsSignalReqCatch_Post_Status_Check(
        * Where the system is configured with SMP support and the configured
        * processor maximum is greater than one, or the CPU port enabled robust
        * thread dispatching, the return status of rtems_signal_catch() shall be
-       * RTEMS_NOT_IMPLEMENTED, otherwise the return status
-       * shall be RTEMS_SUCCESSFUL.
+       * RTEMS_NOT_IMPLEMENTED, otherwise the return status shall be
+       * RTEMS_SUCCESSFUL.
        */
       #if CPU_ENABLE_ROBUST_THREAD_DISPATCH == TRUE
       T_rsc( ctx->catch_status, RTEMS_NOT_IMPLEMENTED );
@@ -464,9 +457,10 @@ static void RtemsSignalReqCatch_Post_Send_Check(
   switch ( state ) {
     case RtemsSignalReqCatch_Post_Send_New: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call was successful, the ASR processing shall be done with the specified
-       * handler, otherwise the ASR information of the caller shall be unchanged.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call was successful, the ASR processing shall be done with the
+       * specified handler, otherwise the ASR information of the caller shall
+       * be unchanged.
        */
       T_rsc_success( ctx->send_status );
 
@@ -484,10 +478,10 @@ static void RtemsSignalReqCatch_Post_Send_Check(
 
     case RtemsSignalReqCatch_Post_Send_NotDef: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call was successful, the ASR processing shall be deactivated and all
-       * pending signals shall be cleared, otherwise the ASR information of the
-       * caller shall be unchanged.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call was successful, the ASR processing shall be deactivated and
+       * all pending signals shall be cleared, otherwise the ASR information of
+       * the caller shall be unchanged.
        */
       if ( ctx->catch_status == RTEMS_SUCCESSFUL ) {
         T_rsc( ctx->send_status, RTEMS_NOT_DEFINED );
@@ -516,9 +510,9 @@ static void RtemsSignalReqCatch_Post_Preempt_Check(
   switch ( state ) {
     case RtemsSignalReqCatch_Post_Preempt_Yes: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with preemption enabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with preemption enabled.
        */
       CheckHandlerMode( ctx, RTEMS_PREEMPT_MASK, RTEMS_PREEMPT );
       break;
@@ -526,9 +520,9 @@ static void RtemsSignalReqCatch_Post_Preempt_Check(
 
     case RtemsSignalReqCatch_Post_Preempt_No: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with preemption disabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with preemption disabled.
        */
       CheckHandlerMode( ctx, RTEMS_PREEMPT_MASK, RTEMS_NO_PREEMPT );
       break;
@@ -547,9 +541,9 @@ static void RtemsSignalReqCatch_Post_Timeslice_Check(
   switch ( state ) {
     case RtemsSignalReqCatch_Post_Timeslice_Yes: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with timeslicing enabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with timeslicing enabled.
        */
       CheckHandlerMode( ctx, RTEMS_TIMESLICE_MASK, RTEMS_TIMESLICE );
       break;
@@ -557,9 +551,9 @@ static void RtemsSignalReqCatch_Post_Timeslice_Check(
 
     case RtemsSignalReqCatch_Post_Timeslice_No: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with timeslicing disabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with timeslicing disabled.
        */
       CheckHandlerMode( ctx, RTEMS_TIMESLICE_MASK, RTEMS_NO_TIMESLICE );
       break;
@@ -578,9 +572,9 @@ static void RtemsSignalReqCatch_Post_ASR_Check(
   switch ( state ) {
     case RtemsSignalReqCatch_Post_ASR_Yes: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with ASR processing enabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with ASR processing enabled.
        */
       CheckHandlerMode( ctx, RTEMS_ASR_MASK, RTEMS_ASR );
       break;
@@ -588,9 +582,9 @@ static void RtemsSignalReqCatch_Post_ASR_Check(
 
     case RtemsSignalReqCatch_Post_ASR_No: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with ASR processing disabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with ASR processing disabled.
        */
       CheckHandlerMode( ctx, RTEMS_ASR_MASK, RTEMS_NO_ASR );
       break;
@@ -609,9 +603,9 @@ static void RtemsSignalReqCatch_Post_IntLvl_Check(
   switch ( state ) {
     case RtemsSignalReqCatch_Post_IntLvl_Zero: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with interrupts enabled.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with interrupts enabled.
        */
       CheckHandlerMode( ctx, RTEMS_INTERRUPT_MASK, RTEMS_INTERRUPT_LEVEL( 0 ) );
       break;
@@ -619,9 +613,10 @@ static void RtemsSignalReqCatch_Post_IntLvl_Check(
 
     case RtemsSignalReqCatch_Post_IntLvl_Positive: {
       /*
-       * When a signal set is sent to the caller of rtems_signal_catch() and the
-       * call with a valid handler was successful, the ASR processing shall be
-       * done with interrupts disabled according to the specified interrupt level.
+       * When a signal set is sent to the caller of rtems_signal_catch() and
+       * the call with a valid handler was successful, the ASR processing shall
+       * be done with interrupts disabled according to the specified interrupt
+       * level.
        */
       CheckHandlerMode( ctx, RTEMS_INTERRUPT_MASK, RTEMS_INTERRUPT_LEVEL( 1 ) );
       break;
diff --git a/testsuites/validation/tc-signal-send.c b/testsuites/validation/tc-signal-send.c
index cf5235f752..382a7167ca 100644
--- a/testsuites/validation/tc-signal-send.c
+++ b/testsuites/validation/tc-signal-send.c
@@ -380,8 +380,7 @@ static void RtemsSignalReqSend_Pre_Task_Prepare(
 
     case RtemsSignalReqSend_Pre_Task_Self: {
       /*
-       * The ``id`` parameter shall be associated with
-       * the calling task.
+       * The ``id`` parameter shall be associated with the calling task.
        */
       ctx->id = RTEMS_SELF;
       break;
@@ -389,8 +388,8 @@ static void RtemsSignalReqSend_Pre_Task_Prepare(
 
     case RtemsSignalReqSend_Pre_Task_Other: {
       /*
-       * The ``id`` parameter shall be associated with a
-       * task other than the calling task.
+       * The ``id`` parameter shall be associated with a task other than the
+       * calling task.
        */
       ctx->id = ctx->worker_id;
       break;
@@ -465,8 +464,8 @@ static void RtemsSignalReqSend_Pre_ASR_Prepare(
   switch ( state ) {
     case RtemsSignalReqSend_Pre_ASR_Enabled: {
       /*
-       * When the target task has ASR processing enabled, the rtems_signal_send()
-       * directive shall be called.
+       * When the target task has ASR processing enabled, the
+       * rtems_signal_send() directive shall be called.
        */
       ctx->mode = RTEMS_DEFAULT_MODES;
       break;
@@ -474,8 +473,8 @@ static void RtemsSignalReqSend_Pre_ASR_Prepare(
 
     case RtemsSignalReqSend_Pre_ASR_Disabled: {
       /*
-       * When the target task has ASR processing disabled, the rtems_signal_send()
-       * directive shall be called.
+       * When the target task has ASR processing disabled, the
+       * rtems_signal_send() directive shall be called.
        */
       ctx->mode = RTEMS_NO_ASR;
       break;
@@ -523,8 +522,7 @@ static void RtemsSignalReqSend_Post_Status_Check(
   switch ( state ) {
     case RtemsSignalReqSend_Post_Status_Ok: {
       /*
-       * The return status of rtems_signal_send() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_signal_send() shall be RTEMS_SUCCESSFUL.
        */
       T_rsc_success( ctx->status );
       break;
@@ -541,8 +539,7 @@ static void RtemsSignalReqSend_Post_Status_Check(
 
     case RtemsSignalReqSend_Post_Status_InvId: {
       /*
-       * The return status of rtems_signal_send() shall be
-       * RTEMS_INVALID_ID.
+       * The return status of rtems_signal_send() shall be RTEMS_INVALID_ID.
        */
       T_rsc( ctx->status, RTEMS_INVALID_ID );
       break;
@@ -550,8 +547,7 @@ static void RtemsSignalReqSend_Post_Status_Check(
 
     case RtemsSignalReqSend_Post_Status_NotDef: {
       /*
-       * The return status of rtems_signal_send() shall be
-       * RTEMS_NOT_DEFINED.
+       * The return status of rtems_signal_send() shall be RTEMS_NOT_DEFINED.
        */
       T_rsc( ctx->status, RTEMS_NOT_DEFINED );
       break;
diff --git a/testsuites/validation/tc-task-construct-errors.c b/testsuites/validation/tc-task-construct-errors.c
index 72baefb5ff..5d5b910ecf 100644
--- a/testsuites/validation/tc-task-construct-errors.c
+++ b/testsuites/validation/tc-task-construct-errors.c
@@ -482,8 +482,8 @@ static void RtemsTaskReqConstructErrors_Pre_TLS_Prepare(
   switch ( state ) {
     case RtemsTaskReqConstructErrors_Pre_TLS_Enough: {
       /*
-       * The maximum thread-local storage size of the task configuration shall be
-       * greater than or equal to the thread-local storage size.
+       * The maximum thread-local storage size of the task configuration shall
+       * be greater than or equal to the thread-local storage size.
        */
       ctx->config.maximum_thread_local_storage_size = MAX_TLS_SIZE;
       break;
@@ -491,8 +491,8 @@ static void RtemsTaskReqConstructErrors_Pre_TLS_Prepare(
 
     case RtemsTaskReqConstructErrors_Pre_TLS_Small: {
       /*
-       * The maximum thread-local storage size of the task configuration shall be
-       * less than the thread-local storage size.
+       * The maximum thread-local storage size of the task configuration shall
+       * be less than the thread-local storage size.
        */
       ctx->config.maximum_thread_local_storage_size = 0;
       break;
@@ -567,8 +567,7 @@ static void RtemsTaskReqConstructErrors_Post_Status_Check(
   switch ( state ) {
     case RtemsTaskReqConstructErrors_Post_Status_Ok: {
       /*
-       * The return status of rtems_task_construct() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_task_construct() shall be RTEMS_SUCCESSFUL.
        */
       T_rsc_success( ctx->status );
       break;
@@ -612,8 +611,7 @@ static void RtemsTaskReqConstructErrors_Post_Status_Check(
 
     case RtemsTaskReqConstructErrors_Post_Status_TooMany: {
       /*
-       * The return status of rtems_task_construct() shall be
-       * RTEMS_TOO_MANY.
+       * The return status of rtems_task_construct() shall be RTEMS_TOO_MANY.
        */
       T_rsc( ctx->status, RTEMS_TOO_MANY );
       break;
@@ -644,8 +642,8 @@ static void RtemsTaskReqConstructErrors_Post_Name_Check(
   switch ( state ) {
     case RtemsTaskReqConstructErrors_Post_Name_Valid: {
       /*
-       * The unique object name shall identify the task constructed by
-       * the rtems_task_construct() call.
+       * The unique object name shall identify the task constructed by the
+       * rtems_task_construct() call.
        */
       id = 0;
       sc = rtems_task_ident( NAME, RTEMS_SEARCH_LOCAL_NODE, &id );
@@ -676,8 +674,9 @@ static void RtemsTaskReqConstructErrors_Post_IdValue_Check(
   switch ( state ) {
     case RtemsTaskReqConstructErrors_Post_IdValue_Assigned: {
       /*
-       * The value of the object identifier variable shall be equal to the object
-       * identifier of the task constructed by the rtems_task_construct() call.
+       * The value of the object identifier variable shall be equal to the
+       * object identifier of the task constructed by the
+       * rtems_task_construct() call.
        */
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
@@ -773,8 +772,8 @@ static void RtemsTaskReqConstructErrors_Post_StoFree_Check(
 
     case RtemsTaskReqConstructErrors_Post_StoFree_No: {
       /*
-       * The storage free handler of the task configuration shall not be invoked
-       * during the rtems_task_construct() call.
+       * The storage free handler of the task configuration shall not be
+       * invoked during the rtems_task_construct() call.
        */
       T_eq_u32( ctx->storage_free_calls, 0 );
       break;
diff --git a/testsuites/validation/tc-task-create-errors.c b/testsuites/validation/tc-task-create-errors.c
index 67e3fb7697..3dcbe635d2 100644
--- a/testsuites/validation/tc-task-create-errors.c
+++ b/testsuites/validation/tc-task-create-errors.c
@@ -356,8 +356,7 @@ static void RtemsTaskReqCreateErrors_Pre_SysTsk_Prepare(
   switch ( state ) {
     case RtemsTaskReqCreateErrors_Pre_SysTsk_Yes: {
       /*
-       * The ``attribute_set`` parameter shall specify a system
-       * task.
+       * The ``attribute_set`` parameter shall specify a system task.
        */
       ctx->attributes = RTEMS_SYSTEM_TASK;
       break;
@@ -365,8 +364,7 @@ static void RtemsTaskReqCreateErrors_Pre_SysTsk_Prepare(
 
     case RtemsTaskReqCreateErrors_Pre_SysTsk_No: {
       /*
-       * The ``attribute_set`` parameter shall specify an
-       * application task.
+       * The ``attribute_set`` parameter shall specify an application task.
        */
       ctx->attributes = RTEMS_DEFAULT_ATTRIBUTES;
       break;
@@ -447,8 +445,8 @@ static void RtemsTaskReqCreateErrors_Pre_Stack_Prepare(
   switch ( state ) {
     case RtemsTaskReqCreateErrors_Pre_Stack_Normal: {
       /*
-       * The ``initial_priority`` parameter shall be greater than or
-       * equal to the configured minimum size.
+       * The ``initial_priority`` parameter shall be greater than or equal to
+       * the configured minimum size.
        */
       ctx->stack_size = RTEMS_MINIMUM_STACK_SIZE;
       break;
@@ -456,8 +454,8 @@ static void RtemsTaskReqCreateErrors_Pre_Stack_Prepare(
 
     case RtemsTaskReqCreateErrors_Pre_Stack_Small: {
       /*
-       * The ``initial_priority`` parameter shall be less than the
-       * configured minimum size.
+       * The ``initial_priority`` parameter shall be less than the configured
+       * minimum size.
        */
       ctx->stack_size = 0;
       break;
@@ -465,8 +463,8 @@ static void RtemsTaskReqCreateErrors_Pre_Stack_Prepare(
 
     case RtemsTaskReqCreateErrors_Pre_Stack_Huge: {
       /*
-       * The ``initial_priority`` parameter shall be greater than the
-       * maximum stack size which can be allocated by the system.
+       * The ``initial_priority`` parameter shall be greater than the maximum
+       * stack size which can be allocated by the system.
        */
       ctx->stack_size = SIZE_MAX;
       break;
@@ -512,8 +510,7 @@ static void RtemsTaskReqCreateErrors_Post_Status_Check(
   switch ( state ) {
     case RtemsTaskReqCreateErrors_Post_Status_Ok: {
       /*
-       * The return status of rtems_task_create() shall be
-       * RTEMS_SUCCESSFUL.
+       * The return status of rtems_task_create() shall be RTEMS_SUCCESSFUL.
        */
       T_rsc_success( ctx->status );
       break;
@@ -530,8 +527,7 @@ static void RtemsTaskReqCreateErrors_Post_Status_Check(
 
     case RtemsTaskReqCreateErrors_Post_Status_InvName: {
       /*
-       * The return status of rtems_task_create() shall be
-       * RTEMS_INVALID_NAME.
+       * The return status of rtems_task_create() shall be RTEMS_INVALID_NAME.
        */
       T_rsc( ctx->status, RTEMS_INVALID_NAME );
       break;
@@ -548,8 +544,7 @@ static void RtemsTaskReqCreateErrors_Post_Status_Check(
 
     case RtemsTaskReqCreateErrors_Post_Status_TooMany: {
       /*
-       * The return status of rtems_task_create() shall be
-       * RTEMS_TOO_MANY.
+       * The return status of rtems_task_create() shall be RTEMS_TOO_MANY.
        */
       T_rsc( ctx->status, RTEMS_TOO_MANY );
       break;
@@ -557,8 +552,7 @@ static void RtemsTaskReqCreateErrors_Post_Status_Check(
 
     case RtemsTaskReqCreateErrors_Post_Status_Unsat: {
       /*
-       * The return status of rtems_task_create() shall be
-       * RTEMS_UNSATISFIED.
+       * The return status of rtems_task_create() shall be RTEMS_UNSATISFIED.
        */
       T_rsc( ctx->status, RTEMS_UNSATISFIED  );
       break;
@@ -580,8 +574,8 @@ static void RtemsTaskReqCreateErrors_Post_Name_Check(
   switch ( state ) {
     case RtemsTaskReqCreateErrors_Post_Name_Valid: {
       /*
-       * The unique object name shall identify the task created by
-       * the rtems_task_create() call.
+       * The unique object name shall identify the task created by the
+       * rtems_task_create() call.
        */
       id = 0;
       sc = rtems_task_ident( NAME, RTEMS_SEARCH_LOCAL_NODE, &id );
@@ -612,8 +606,8 @@ static void RtemsTaskReqCreateErrors_Post_IdValue_Check(
   switch ( state ) {
     case RtemsTaskReqCreateErrors_Post_IdValue_Assigned: {
       /*
-       * The value of the object identifier variable shall be equal to the object
-       * identifier of the task created by the rtems_task_create() call.
+       * The value of the object identifier variable shall be equal to the
+       * object identifier of the task created by the rtems_task_create() call.
        */
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );