Index: NVDataMgmt.c
===================================================================
diff -u -re56d7029633d6d184884f9abacd9c5fce9fb903f -rccbdbdb98dc4d8c11cacade96002284d7d41d2d6
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision e56d7029633d6d184884f9abacd9c5fce9fb903f)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision ccbdbdb98dc4d8c11cacade96002284d7d41d2d6)
@@ -534,7 +534,7 @@
 static U32  getAvailableQueueCount( void );
 
 // Helper functions
-static BOOL didCommandTimeout( ALARM_ID_T alarm, U08* state );
+static BOOL didCommandTimeout( NVDATAMGMT_EXEC_STATE_T state );
 static BOOL eraseDataLogSectors( void );
 static void monitorNewCalSignal( void );
 
@@ -1800,7 +1800,7 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecWriteToEEPROMState ( void )
 {
     NVDATAMGMT_EXEC_STATE_T state    = NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM;
-    BOOL               timeoutStatus = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
+    BOOL timeoutStatus               = didCommandTimeout( state );
     RECORD_JOBS_STATE_T     job      = recordCurrentJob.recordJob;
     PROCESS_RECORD_SPECS_T  jobSpecs = RECORDS_SPECS [ job ];
 
@@ -1867,7 +1867,7 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecVerifyEEPROMWriteState ( void )
 {
     NVDATAMGMT_EXEC_STATE_T state   = NVDATAMGMT_EXEC_STATE_VERIFY_EEPROM_WRITE;
-    BOOL              timeoutStatus = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
+    BOOL timeoutStatus              = didCommandTimeout( state );
     RECORD_JOBS_STATE_T    job      = recordCurrentJob.recordJob;
     PROCESS_RECORD_SPECS_T jobSpecs = RECORDS_SPECS [ job ];
 
@@ -1919,7 +1919,7 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecReadFromEEPROMState ( void )
 {
     NVDATAMGMT_EXEC_STATE_T state = NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM;
-    BOOL timeoutStatus            = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
+    BOOL timeoutStatus            = didCommandTimeout( state );
 
     if ( ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY ) || ( TRUE == timeoutStatus ) )
     {
@@ -1948,7 +1948,7 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecEraseState ( void )
 {
     NVDATAMGMT_EXEC_STATE_T state = NVDATAMGMT_EXEC_STATE_ERASE_EEPROM;
-    BOOL timeoutStatus = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
+    BOOL timeoutStatus = didCommandTimeout( state );
 
     if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY || timeoutStatus == TRUE )
     {
@@ -1970,8 +1970,8 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecWriteToRAMState ( void )
 {
     NVDATAMGMT_EXEC_STATE_T state   = NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC;
-    BOOL timeoutStatus              = didCommandTimeout ( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
-    RECORD_JOBS_STATE_T    job      = recordCurrentJob.recordJob;
+    BOOL timeoutStatus              = didCommandTimeout( state );
+    RECORD_JOBS_STATE_T job         = recordCurrentJob.recordJob;
     PROCESS_RECORD_SPECS_T jobSpecs = RECORDS_SPECS [ job ];
 
    // Check if the RTC RAM has finished
@@ -2043,8 +2043,8 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecVerifyRTCWriteState( void )
 {
     NVDATAMGMT_EXEC_STATE_T state   = NVDATAMGMT_EXEC_STATE_VERIFY_RTC_WRITE;
-    BOOL              timeoutStatus = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
-    RECORD_JOBS_STATE_T    job      = recordCurrentJob.recordJob;
+    BOOL timeoutStatus              = didCommandTimeout( state );
+    RECORD_JOBS_STATE_T job         = recordCurrentJob.recordJob;
     PROCESS_RECORD_SPECS_T jobSpecs = RECORDS_SPECS [ job ];
 
     // Check if the write job is EEPROM or RTC RAM
@@ -2097,7 +2097,7 @@
 static NVDATAMGMT_EXEC_STATE_T handleExecReadFromRAMState ( void )
 {
     NVDATAMGMT_EXEC_STATE_T state = NVDATAMGMT_EXEC_STATE_READ_FROM_RTC;
-    BOOL timeoutStatus            = didCommandTimeout ( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
+    BOOL timeoutStatus            = didCommandTimeout( state );
 
     if ( ( ( TRUE == isSemaphoreReleased( SEMAPHORE_RTC ) ) && ( RTC_RAM_STATUS_IDLE == getRTCRAMStatus() ) ) || ( TRUE == timeoutStatus ) )
     {
@@ -2551,21 +2551,21 @@
  * flag to TRUE.
  * @details Inputs: none
  * @details Outputs: alarm if command timed out
- * @param alarm alarm ID
  * @param state the state that the command timed out
  * @return TRUE if a command timed out
  *************************************************************************/
-static BOOL didCommandTimeout ( ALARM_ID_T alarm, U08* state )
+static BOOL didCommandTimeout ( NVDATAMGMT_EXEC_STATE_T state )
 {
-    /*
-     * NOTE: The state is a pointer so it can cover both the self-test
-     * states and exec states
-     */
     BOOL status = FALSE;
 
-    if ( didTimeout( currentTime, COMMAND_TIME_OUT ) )
+    if ( TRUE == didTimeout( currentTime, COMMAND_TIME_OUT ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( alarm, *state );
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_MANAGEMENT_OPS_TIMEOUT, state )
+#endif
+#ifdef _HD_
+
+#endif
         status = TRUE;
     }