Index: TestSupport.h
===================================================================
diff -u -r4cc881a776c1868f7b7c28c6ce334b59f155ae32 -r9d99536cc13313e6d88baf50905707404142c09e
--- TestSupport.h	(.../TestSupport.h)	(revision 4cc881a776c1868f7b7c28c6ce334b59f155ae32)
+++ TestSupport.h	(.../TestSupport.h)	(revision 9d99536cc13313e6d88baf50905707404142c09e)
@@ -31,8 +31,34 @@
 #define OVERRIDE_KEY    0xCCC33C33          ///< Override key
 #define OVERRIDE_RESET  0x00000000          ///< Override reset
 
+#ifdef _DG_
+/// DG test software configurations
+typedef enum test_Config_enums
+{
+    TEST_CONFIG_ENABLE_MIXING_WITH_WATER = 0,                  ///< Test configuration enable mixing with water.
+    TEST_CONFIG_FIRST = TEST_CONFIG_ENABLE_MIXING_WITH_WATER,  ///< Test configuration first configuration.
+    NUM_OF_TEST_CONFIGS                                        ///< Number of test configuration.
+} TEST_CONFIG_T;
+#else
+/// HD test software configurations
+typedef enum test_Config
+{
+    // TODO update this enum in HD
+    TEST_CONFIG_FIRST = 0,                                     ///< Test configuration first configuration.
+    TEST_CONFIG_ENABLE_MIXING_WITH_WATER = TEST_CONFIG_FIRST,  ///< Test configuration enable mixing with water.
+    NUM_OF_TEST_CONFIGS                                        ///< Number of test configuration.
+} TEST_CONFIG_T;
+#endif
+
 #pragma pack(push,1)
 
+/// Test configuration payload
+typedef struct
+{
+    BOOL reset;                                 ///< Test configuration reset.
+    U32 config;                                 ///< Test configuration.
+} TEST_CONFIG_PAYLOAD_T ;
+
 /// Test override payload type union.
 typedef union
 {
@@ -92,6 +118,18 @@
 S32 getS32OverrideValue( OVERRIDE_S32_T *ovS32 );
 F32 getF32OverrideValue( OVERRIDE_F32_T *ovF32 );
 
+// Test configuration functions
+
+void initTestConfigs( void );
+BOOL setTestConfig( TEST_CONFIG_T config );
+BOOL resetTestConfig( TEST_CONFIG_T config );
+BOOL getTestConfigStatus( TEST_CONFIG_T config );
+BOOL sendTestConfigStatusToDialin( void );
+BOOL resetAllTestConfigs( void );
+
+void setDialinCheckInTimeStamp( void );
+BOOL hasDialinCheckInExpired( void );
+
 /**@}*/
 
 #endif