Index: WatchdogMgmt.c
===================================================================
diff -u -r3ca022103ce50b39e5d805b7577c7f360730412d -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088)
@@ -442,63 +442,21 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetWatchdogTaskCheckInOverride function overrides the state of the
+ * The testWatchdogTaskCheckInOverride function overrides the state of the
  * check-in for a given task with a given check-in state.
  * @warning Dialin must be logged into related firmware stack to perform
  * an override successfully.
  * @details \b Inputs: none
  * @details \b Outputs: watchdogTaskCheckedIn[]
- * @param task ID of task to override check-in state for
- * @param value override state for the given task ID
+ * @param message Override message from Dialin which includes an ID of
+ * the task to override and the check-in status to override the task to.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetWatchdogTaskCheckInOverride( U32 task, BOOL value )
+BOOL testWatchdogTaskCheckInOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32ArrayOverride( message, &watchdogTaskCheckedIn[0], NUM_OF_TASKS - 1, FALSE, TRUE );
 
-    // validate given task
-    if ( task < NUM_OF_TASKS )
-    {
-        // Dialin must be logged in to perform an override
-        if ( TRUE == isTestingActivated() )
-        {
-            result = TRUE;
-            watchdogTaskCheckedIn[ task ].ovData = value;
-            watchdogTaskCheckedIn[ task ].override = OVERRIDE_KEY;
-        }
-    }
-
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testResetWatchdogTaskCheckInOverride function resets the override of the
- * state of the check-in for a given task.
- * @warning Dialin must be logged into related firmware stack to perform
- * an override successfully.
- * @details \b Inputs: none
- * @details \b Outputs: watchdogTaskCheckedIn[]
- * @param task ID of task to override check-in state for
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetWatchdogTaskCheckInOverride( U32 task )
-{
-    BOOL result = FALSE;
-
-    // validate given task
-    if ( task < NUM_OF_TASKS )
-    {
-        // Dialin must be logged in to perform an override
-        if ( TRUE == isTestingActivated() )
-        {
-            result = TRUE;
-            watchdogTaskCheckedIn[ task ].override = OVERRIDE_RESET;
-            watchdogTaskCheckedIn[ task ].ovData = watchdogTaskCheckedIn[ task ].ovInitData;
-        }
-    }
-
-    return result;
-}
-
 /**@}*/