validation: Fix warnings in model based tests

32 files changed, 29 insertions, 102 deletions

diff --git a/testsuites/validation/tr-chains-api-model-0.c b/testsuites/validation/tr-chains-api-model-0.c
index fac9a20de1..e53ec14ab3 100644
--- a/testsuites/validation/tr-chains-api-model-0.c
+++ b/testsuites/validation/tr-chains-api-model-0.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -155,8 +154,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run0(
-)
+static void RtemsModelChainsAPI_Run0(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-1.c b/testsuites/validation/tr-chains-api-model-1.c
index 30255f191c..8ed2f51c75 100644
--- a/testsuites/validation/tr-chains-api-model-1.c
+++ b/testsuites/validation/tr-chains-api-model-1.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run1(
-)
+static void RtemsModelChainsAPI_Run1(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-10.c b/testsuites/validation/tr-chains-api-model-10.c
index fbf31c296c..2ed4ee6be2 100644
--- a/testsuites/validation/tr-chains-api-model-10.c
+++ b/testsuites/validation/tr-chains-api-model-10.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run10(
-)
+static void RtemsModelChainsAPI_Run10(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-11.c b/testsuites/validation/tr-chains-api-model-11.c
index 2e1f9cdf27..5912f5ae14 100644
--- a/testsuites/validation/tr-chains-api-model-11.c
+++ b/testsuites/validation/tr-chains-api-model-11.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run11(
-)
+static void RtemsModelChainsAPI_Run11(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-12.c b/testsuites/validation/tr-chains-api-model-12.c
index 877cc37b92..cd9de1e6a4 100644
--- a/testsuites/validation/tr-chains-api-model-12.c
+++ b/testsuites/validation/tr-chains-api-model-12.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -159,8 +158,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run12(
-)
+static void RtemsModelChainsAPI_Run12(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-13.c b/testsuites/validation/tr-chains-api-model-13.c
index dd8c881c10..83d65019da 100644
--- a/testsuites/validation/tr-chains-api-model-13.c
+++ b/testsuites/validation/tr-chains-api-model-13.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run13(
-)
+static void RtemsModelChainsAPI_Run13(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-14.c b/testsuites/validation/tr-chains-api-model-14.c
index e616775ce0..22c611f12c 100644
--- a/testsuites/validation/tr-chains-api-model-14.c
+++ b/testsuites/validation/tr-chains-api-model-14.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -159,8 +158,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run14(
-)
+static void RtemsModelChainsAPI_Run14(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-15.c b/testsuites/validation/tr-chains-api-model-15.c
index affe0ac2e6..763a67547f 100644
--- a/testsuites/validation/tr-chains-api-model-15.c
+++ b/testsuites/validation/tr-chains-api-model-15.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run15(
-)
+static void RtemsModelChainsAPI_Run15(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-16.c b/testsuites/validation/tr-chains-api-model-16.c
index 6b75c62b6d..b47177c905 100644
--- a/testsuites/validation/tr-chains-api-model-16.c
+++ b/testsuites/validation/tr-chains-api-model-16.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run16(
-)
+static void RtemsModelChainsAPI_Run16(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-17.c b/testsuites/validation/tr-chains-api-model-17.c
index 9b83d11f35..0d2a7f855e 100644
--- a/testsuites/validation/tr-chains-api-model-17.c
+++ b/testsuites/validation/tr-chains-api-model-17.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run17(
-)
+static void RtemsModelChainsAPI_Run17(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-18.c b/testsuites/validation/tr-chains-api-model-18.c
index 5e013e75c6..e237c3704c 100644
--- a/testsuites/validation/tr-chains-api-model-18.c
+++ b/testsuites/validation/tr-chains-api-model-18.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -159,8 +158,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run18(
-)
+static void RtemsModelChainsAPI_Run18(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-19.c b/testsuites/validation/tr-chains-api-model-19.c
index 615e8b4c77..8b577fc579 100644
--- a/testsuites/validation/tr-chains-api-model-19.c
+++ b/testsuites/validation/tr-chains-api-model-19.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run19(
-)
+static void RtemsModelChainsAPI_Run19(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-2.c b/testsuites/validation/tr-chains-api-model-2.c
index 8928857876..8cb4bf008d 100644
--- a/testsuites/validation/tr-chains-api-model-2.c
+++ b/testsuites/validation/tr-chains-api-model-2.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -155,8 +154,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run2(
-)
+static void RtemsModelChainsAPI_Run2(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-20.c b/testsuites/validation/tr-chains-api-model-20.c
index a523c6c8e9..26955a3c0a 100644
--- a/testsuites/validation/tr-chains-api-model-20.c
+++ b/testsuites/validation/tr-chains-api-model-20.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -159,8 +158,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run20(
-)
+static void RtemsModelChainsAPI_Run20(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-3.c b/testsuites/validation/tr-chains-api-model-3.c
index 26ca19067d..7772587383 100644
--- a/testsuites/validation/tr-chains-api-model-3.c
+++ b/testsuites/validation/tr-chains-api-model-3.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run3(
-)
+static void RtemsModelChainsAPI_Run3(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-4.c b/testsuites/validation/tr-chains-api-model-4.c
index e03d3ad9c1..d114ba30dd 100644
--- a/testsuites/validation/tr-chains-api-model-4.c
+++ b/testsuites/validation/tr-chains-api-model-4.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run4(
-)
+static void RtemsModelChainsAPI_Run4(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-5.c b/testsuites/validation/tr-chains-api-model-5.c
index a70f18f9a3..f5766c7fba 100644
--- a/testsuites/validation/tr-chains-api-model-5.c
+++ b/testsuites/validation/tr-chains-api-model-5.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -159,8 +158,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run5(
-)
+static void RtemsModelChainsAPI_Run5(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-6.c b/testsuites/validation/tr-chains-api-model-6.c
index b452c555aa..7186697e3f 100644
--- a/testsuites/validation/tr-chains-api-model-6.c
+++ b/testsuites/validation/tr-chains-api-model-6.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run6(
-)
+static void RtemsModelChainsAPI_Run6(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-7.c b/testsuites/validation/tr-chains-api-model-7.c
index 6812f02fe9..e5ee6ae9f6 100644
--- a/testsuites/validation/tr-chains-api-model-7.c
+++ b/testsuites/validation/tr-chains-api-model-7.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -159,8 +158,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run7(
-)
+static void RtemsModelChainsAPI_Run7(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-8.c b/testsuites/validation/tr-chains-api-model-8.c
index 4455b80247..f6179d02a4 100644
--- a/testsuites/validation/tr-chains-api-model-8.c
+++ b/testsuites/validation/tr-chains-api-model-8.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -157,8 +156,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run8(
-)
+static void RtemsModelChainsAPI_Run8(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model-9.c b/testsuites/validation/tr-chains-api-model-9.c
index c8c38215ff..5c92aea00d 100644
--- a/testsuites/validation/tr-chains-api-model-9.c
+++ b/testsuites/validation/tr-chains-api-model-9.c
@@ -63,7 +63,6 @@ static rtems_chain_control chain;
 //  ===== TEST CODE SEGMENT 0 =====
 
 static void TestSegment0( Context* ctx ) {
-  const char rtems_test_name[] = "Model_Chain_API";
   
   T_log(T_NORMAL,"@@@ 0 INIT");
   rtems_chain_initialize_empty( &chain );
@@ -155,8 +154,7 @@ static void TestSegment0( Context* ctx ) {
 
 
 /* post-amble empty for now */
-void RtemsModelChainsAPI_Run9(
-)
+static void RtemsModelChainsAPI_Run9(void)
 {
   Context ctx;
 
diff --git a/testsuites/validation/tr-chains-api-model.h b/testsuites/validation/tr-chains-api-model.h
index 38610df68d..fd2e029e0f 100644
--- a/testsuites/validation/tr-chains-api-model.h
+++ b/testsuites/validation/tr-chains-api-model.h
@@ -42,6 +42,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
+#include "tx-support.h"
 
 typedef struct item
 {
diff --git a/testsuites/validation/tr-event-mgr-model-0.c b/testsuites/validation/tr-event-mgr-model-0.c
index 2aa05dfd2b..99ddcf7f6d 100644
--- a/testsuites/validation/tr-event-mgr-model-0.c
+++ b/testsuites/validation/tr-event-mgr-model-0.c
@@ -89,12 +89,8 @@
 #define RC_Timeout RTEMS_TIMEOUT
 // @@@ 0 DECL byte sendrc 0
 static rtems_status_code sendrc = 0;
-// @@@ 0 DECL byte recrc 0
-static rtems_status_code recrc = 0;
 // @@@ 0 DCLARRAY EvtSet pending TASK_MAX
 static rtems_event_set pending[TASK_MAX];
-// @@@ 0 DCLARRAY byte recout TASK_MAX
-static rtems_event_set recout[TASK_MAX];
 // @@@ 0 DCLARRAY Semaphore semaphore SEMA_MAX
 static rtems_id semaphore[SEMA_MAX];
 
@@ -136,7 +132,7 @@ static void TestSegment3( Context* ctx ) {
   T_log( T_NORMAL, "Returned 0x%x from Send", sendrc );
   
   T_log(T_NORMAL,"@@@ 3 CALL CheckNoPreemption");
-  log = &ctx->thread_switch_log;
+  log = (T_thread_switch_log *) &ctx->thread_switch_log;
   T_le_sz( log->header.recorded, 1 );
   for ( size_t i = 0; i < log->header.recorded; ++i ) {
     T_ne_u32( log->events[ i ].executing, ctx->worker_id );
diff --git a/testsuites/validation/tr-event-mgr-model-1.c b/testsuites/validation/tr-event-mgr-model-1.c
index c083a20d4d..757341361f 100644
--- a/testsuites/validation/tr-event-mgr-model-1.c
+++ b/testsuites/validation/tr-event-mgr-model-1.c
@@ -87,8 +87,6 @@
 #define RC_Unsat RTEMS_UNSATISFIED
 // @@@ 0 DEF RC_Timeout RTEMS_TIMEOUT
 #define RC_Timeout RTEMS_TIMEOUT
-// @@@ 0 DECL byte sendrc 0
-static rtems_status_code sendrc = 0;
 // @@@ 0 DECL byte recrc 0
 static rtems_status_code recrc = 0;
 // @@@ 0 DCLARRAY EvtSet pending TASK_MAX
diff --git a/testsuites/validation/tr-event-mgr-model-2.c b/testsuites/validation/tr-event-mgr-model-2.c
index 7be3578052..e8f9c1751c 100644
--- a/testsuites/validation/tr-event-mgr-model-2.c
+++ b/testsuites/validation/tr-event-mgr-model-2.c
@@ -87,8 +87,6 @@
 #define RC_Unsat RTEMS_UNSATISFIED
 // @@@ 0 DEF RC_Timeout RTEMS_TIMEOUT
 #define RC_Timeout RTEMS_TIMEOUT
-// @@@ 0 DECL byte sendrc 0
-static rtems_status_code sendrc = 0;
 // @@@ 0 DECL byte recrc 0
 static rtems_status_code recrc = 0;
 // @@@ 0 DCLARRAY EvtSet pending TASK_MAX
@@ -109,14 +107,6 @@ static void TestSegment0( Context* ctx ) {
   
 }
 
-//  ===== TEST CODE SEGMENT 2 =====
-
-static void TestSegment2( Context* ctx ) {
-  T_log(T_NORMAL,"@@@ 2 STATE 2 Ready");
-  /* We (Task 2) must have been recently ready because we are running */
-
-}
-
 //  ===== TEST CODE SEGMENT 3 =====
 
 static void TestSegment3( Context* ctx ) {
diff --git a/testsuites/validation/tr-event-mgr-model-3.c b/testsuites/validation/tr-event-mgr-model-3.c
index df0f3b884c..b13c9bc9d6 100644
--- a/testsuites/validation/tr-event-mgr-model-3.c
+++ b/testsuites/validation/tr-event-mgr-model-3.c
@@ -87,8 +87,6 @@
 #define RC_Unsat RTEMS_UNSATISFIED
 // @@@ 0 DEF RC_Timeout RTEMS_TIMEOUT
 #define RC_Timeout RTEMS_TIMEOUT
-// @@@ 0 DECL byte sendrc 0
-static rtems_status_code sendrc = 0;
 // @@@ 0 DECL byte recrc 0
 static rtems_status_code recrc = 0;
 // @@@ 0 DCLARRAY EvtSet pending TASK_MAX
diff --git a/testsuites/validation/tr-event-mgr-model-4.c b/testsuites/validation/tr-event-mgr-model-4.c
index a48974471f..97c5771d0b 100644
--- a/testsuites/validation/tr-event-mgr-model-4.c
+++ b/testsuites/validation/tr-event-mgr-model-4.c
@@ -136,7 +136,7 @@ static void TestSegment3( Context* ctx ) {
   T_log( T_NORMAL, "Returned 0x%x from Send", sendrc );
   
   T_log(T_NORMAL,"@@@ 3 CALL CheckNoPreemption");
-  log = &ctx->thread_switch_log;
+  log = (T_thread_switch_log *) &ctx->thread_switch_log;
   T_le_sz( log->header.recorded, 1 );
   for ( size_t i = 0; i < log->header.recorded; ++i ) {
     T_ne_u32( log->events[ i ].executing, ctx->worker_id );
diff --git a/testsuites/validation/tr-event-mgr-model-5.c b/testsuites/validation/tr-event-mgr-model-5.c
index 49851f4f61..f5dcf6959f 100644
--- a/testsuites/validation/tr-event-mgr-model-5.c
+++ b/testsuites/validation/tr-event-mgr-model-5.c
@@ -136,7 +136,7 @@ static void TestSegment3( Context* ctx ) {
   T_log( T_NORMAL, "Returned 0x%x from Send", sendrc );
   
   T_log(T_NORMAL,"@@@ 3 CALL CheckNoPreemption");
-  log = &ctx->thread_switch_log;
+  log = (T_thread_switch_log *) &ctx->thread_switch_log;
   T_le_sz( log->header.recorded, 1 );
   for ( size_t i = 0; i < log->header.recorded; ++i ) {
     T_ne_u32( log->events[ i ].executing, ctx->worker_id );
diff --git a/testsuites/validation/tr-event-mgr-model-6.c b/testsuites/validation/tr-event-mgr-model-6.c
index 09279a2952..77b2f8dea8 100644
--- a/testsuites/validation/tr-event-mgr-model-6.c
+++ b/testsuites/validation/tr-event-mgr-model-6.c
@@ -109,14 +109,6 @@ static void TestSegment0( Context* ctx ) {
   
 }
 
-//  ===== TEST CODE SEGMENT 1 =====
-
-static void TestSegment1( Context* ctx ) {
-  T_log(T_NORMAL,"@@@ 1 STATE 1 Ready");
-  /* We (Task 1) must have been recently ready because we are running */
-
-}
-
 //  ===== TEST CODE SEGMENT 3 =====
 
 static void TestSegment3( Context* ctx ) {
@@ -144,7 +136,7 @@ static void TestSegment3( Context* ctx ) {
   T_log( T_NORMAL, "Returned 0x%x from Send", sendrc );
   
   T_log(T_NORMAL,"@@@ 3 CALL CheckPreemption");
-  log = &ctx->thread_switch_log;
+  log = (T_thread_switch_log *) &ctx->thread_switch_log;
   T_eq_sz( log->header.recorded, 2 );
   T_eq_u32( log->events[ 0 ].heir, ctx->runner_id );
   T_eq_u32( log->events[ 1 ].heir, ctx->worker_id );
diff --git a/testsuites/validation/tr-event-mgr-model-7.c b/testsuites/validation/tr-event-mgr-model-7.c
index 743737ca45..2061c50ecd 100644
--- a/testsuites/validation/tr-event-mgr-model-7.c
+++ b/testsuites/validation/tr-event-mgr-model-7.c
@@ -136,7 +136,7 @@ static void TestSegment3( Context* ctx ) {
   T_log( T_NORMAL, "Returned 0x%x from Send", sendrc );
   
   T_log(T_NORMAL,"@@@ 3 CALL CheckNoPreemption");
-  log = &ctx->thread_switch_log;
+  log = (T_thread_switch_log *) &ctx->thread_switch_log;
   T_le_sz( log->header.recorded, 1 );
   for ( size_t i = 0; i < log->header.recorded; ++i ) {
     T_ne_u32( log->events[ i ].executing, ctx->worker_id );
diff --git a/testsuites/validation/tr-event-mgr-model-8.c b/testsuites/validation/tr-event-mgr-model-8.c
index f60c15ffd0..4042b2597c 100644
--- a/testsuites/validation/tr-event-mgr-model-8.c
+++ b/testsuites/validation/tr-event-mgr-model-8.c
@@ -143,7 +143,7 @@ static void TestSegment3( Context* ctx ) {
   T_log( T_NORMAL, "Returned 0x%x from Send", sendrc );
   
   T_log(T_NORMAL,"@@@ 3 CALL CheckNoPreemption");
-  log = &ctx->thread_switch_log;
+  log = (T_thread_switch_log *) &ctx->thread_switch_log;
   T_le_sz( log->header.recorded, 1 );
   for ( size_t i = 0; i < log->header.recorded; ++i ) {
     T_ne_u32( log->events[ i ].executing, ctx->worker_id );
diff --git a/testsuites/validation/tr-event-mgr-model.h b/testsuites/validation/tr-event-mgr-model.h
index 927e2592bd..c7d3515a34 100644
--- a/testsuites/validation/tr-event-mgr-model.h
+++ b/testsuites/validation/tr-event-mgr-model.h
@@ -55,6 +55,7 @@
 
 #include <rtems/test.h>
 #include "ts-config.h"
+#include "tx-support.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -98,13 +99,6 @@ typedef struct {
   T_thread_switch_log_4 thread_switch_log; // thread switch log
 } RtemsModelEventsMgr_Context;
 
-typedef enum {
-  PRIO_HIGH = 1,
-  PRIO_NORMAL,
-  PRIO_LOW,
-  PRIO_OTHER
-} Priorities;
-
 #define POWER_OF_10 100
 
 #define WORKER_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES