testsuites/validation/tc-sys-lock.c

1 files changed, 43 insertions, 43 deletions

diff --git a/testsuites/validation/tc-sys-lock.c b/testsuites/validation/tc-sys-lock.c
index 1d2567de33..85b290ab9b 100644
--- a/testsuites/validation/tc-sys-lock.c
+++ b/testsuites/validation/tc-sys-lock.c
@@ -125,49 +125,6 @@ typedef struct {
 static NewlibValSysLock_Context
   NewlibValSysLock_Instance;
 
-static void NewlibValSysLock_Setup( NewlibValSysLock_Context *ctx )
-{
-  memset( ctx, 0, sizeof( *ctx ) );
-  ctx->tq_mtx_ctx.base.enqueue_variant = TQ_ENQUEUE_BLOCKS;
-  ctx->tq_mtx_ctx.base.discipline = TQ_PRIORITY;
-  ctx->tq_mtx_ctx.base.deadlock = TQ_DEADLOCK_FATAL;
-  ctx->tq_mtx_ctx.base.convert_status = TQConvertStatusPOSIX;
-  ctx->tq_mtx_ctx.protocol = TQ_MTX_PRIORITY_INHERIT;
-  ctx->tq_mtx_ctx.owner_check = TQ_MTX_NO_OWNER_CHECK;
-  ctx->tq_mtx_ctx.priority_ceiling = PRIO_INVALID;
-  TQInitialize( &ctx->tq_mtx_ctx.base );
-}
-
-static void NewlibValSysLock_Setup_Wrap( void *arg )
-{
-  NewlibValSysLock_Context *ctx;
-
-  ctx = arg;
-  NewlibValSysLock_Setup( ctx );
-}
-
-static void NewlibValSysLock_Teardown( NewlibValSysLock_Context *ctx )
-{
-  TQDestroy( &ctx->tq_mtx_ctx.base );
-  RestoreRunnerPriority();
-}
-
-static void NewlibValSysLock_Teardown_Wrap( void *arg )
-{
-  NewlibValSysLock_Context *ctx;
-
-  ctx = arg;
-  NewlibValSysLock_Teardown( ctx );
-}
-
-static T_fixture NewlibValSysLock_Fixture = {
-  .setup = NewlibValSysLock_Setup_Wrap,
-  .stop = NULL,
-  .teardown = NewlibValSysLock_Teardown_Wrap,
-  .scope = NULL,
-  .initial_context = &NewlibValSysLock_Instance
-};
-
 static Status_Control Enqueue( TQContext *ctx, TQWait wait )
 {
   const struct timespec abstime = {
@@ -257,6 +214,49 @@ static rtems_tcb *RecursiveGetOwner( TQContext *ctx )
   return mutex->_Mutex._Queue._owner;
 }
 
+static void NewlibValSysLock_Setup( NewlibValSysLock_Context *ctx )
+{
+  memset( ctx, 0, sizeof( *ctx ) );
+  ctx->tq_mtx_ctx.base.enqueue_variant = TQ_ENQUEUE_BLOCKS;
+  ctx->tq_mtx_ctx.base.discipline = TQ_PRIORITY;
+  ctx->tq_mtx_ctx.base.deadlock = TQ_DEADLOCK_FATAL;
+  ctx->tq_mtx_ctx.base.convert_status = TQConvertStatusPOSIX;
+  ctx->tq_mtx_ctx.protocol = TQ_MTX_PRIORITY_INHERIT;
+  ctx->tq_mtx_ctx.owner_check = TQ_MTX_NO_OWNER_CHECK;
+  ctx->tq_mtx_ctx.priority_ceiling = PRIO_INVALID;
+  TQInitialize( &ctx->tq_mtx_ctx.base );
+}
+
+static void NewlibValSysLock_Setup_Wrap( void *arg )
+{
+  NewlibValSysLock_Context *ctx;
+
+  ctx = arg;
+  NewlibValSysLock_Setup( ctx );
+}
+
+static void NewlibValSysLock_Teardown( NewlibValSysLock_Context *ctx )
+{
+  TQDestroy( &ctx->tq_mtx_ctx.base );
+  RestoreRunnerPriority();
+}
+
+static void NewlibValSysLock_Teardown_Wrap( void *arg )
+{
+  NewlibValSysLock_Context *ctx;
+
+  ctx = arg;
+  NewlibValSysLock_Teardown( ctx );
+}
+
+static T_fixture NewlibValSysLock_Fixture = {
+  .setup = NewlibValSysLock_Setup_Wrap,
+  .stop = NULL,
+  .teardown = NewlibValSysLock_Teardown_Wrap,
+  .scope = NULL,
+  .initial_context = &NewlibValSysLock_Instance
+};
+
 /**
  * @brief Create a mutex and validate the mutex directives.
  */