Index: TestSupport.h
===================================================================
diff -u -r6520e649188757399c2dfd58a30af80d96256295 -rb8c0a53bcfa6be12c305761b0b1b5c79e97b55ca
--- TestSupport.h	(.../TestSupport.h)	(revision 6520e649188757399c2dfd58a30af80d96256295)
+++ TestSupport.h	(.../TestSupport.h)	(revision b8c0a53bcfa6be12c305761b0b1b5c79e97b55ca)
@@ -18,6 +18,8 @@
 #ifndef __TEST_SUPPORT_H__
 #define __TEST_SUPPORT_H__
 
+#include "MessageSupport.h"
+
 /**
  *  @defgroup TestSupport TestSupport
  *  @brief Test support functions for accessing override records, managing
@@ -32,6 +34,15 @@
 #define OVERRIDE_KEY    0xCCC33C33          ///< Override key
 #define OVERRIDE_RESET  0x00000000          ///< Override reset
 
+/// Override types.
+typedef enum override_Types
+{
+    OVERRIDE_INVALID = 0,                                      ///< Invalid - payload invalid or corrupted.
+    OVERRIDE_RESET_OVERRIDE,                                   ///< Override reset.
+    OVERRIDE_OVERRIDE,                                         ///< Override.
+    NUM_OF_OVERRIDE_TYPES                                      ///< Number of override types.
+} OVERRIDE_TYPE_T;
+
 #ifdef _DD_
 
 /// DD test software configurations
@@ -44,7 +55,8 @@
     NUM_OF_TEST_CONFIGS                                        ///< Number of test configuration.
 } TEST_CONFIG_T;
 
-#else
+#endif
+#ifdef _TD_
 
 /// TD test software configurations
 typedef enum test_Config
@@ -131,6 +143,9 @@
 S32 getS32OverrideValue( OVERRIDE_S32_T *ovS32 );
 F32 getF32OverrideValue( OVERRIDE_F32_T *ovF32 );
 
+OVERRIDE_TYPE_T getOverridePayloadFromMessage( MESSAGE_T *message, TEST_OVERRIDE_PAYLOAD_T *override );
+OVERRIDE_TYPE_T getOverrideArrayPayloadFromMessage( MESSAGE_T *message, TEST_OVERRIDE_ARRAY_PAYLOAD_T *override );
+
 // Test configuration functions
 
 void initTestConfigs( void );