Index: NVMgmt.c
===================================================================
diff -u -r0b8f91f84aebe54470508381ec6381088901eeba -r8f45f16377ce0ee02824aeb15446cc427ce88c70
--- NVMgmt.c	(.../NVMgmt.c)	(revision 0b8f91f84aebe54470508381ec6381088901eeba)
+++ NVMgmt.c	(.../NVMgmt.c)	(revision 8f45f16377ce0ee02824aeb15446cc427ce88c70)
@@ -15,13 +15,20 @@
 *
 ***************************************************************************/
 
+
+
+
 #include <string.h>      // For memcpy
 #include "Common.h"
 #include "NVDriver.h"
 #include "NVJobQ.h"
+#ifdef _DD_
 #include "NVMessagingDD.h"
+#endif
 #include "NVMgmt.h"
+#ifdef _DD_
 #include "NVRecordsDD.h"
+#endif
 #include "Timers.h"
 
 /**
@@ -154,7 +161,8 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_EXEC_STATE, ( U32 )nvmExecState );
+              // TODO: Fix in TD
+//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_EXEC_STATE, ( U32 )nvmExecState );
             nvmExecState = NVM_EXEC_STATE_IDLE;
             break;
     }
@@ -171,8 +179,9 @@
 
 void resetNVMPOSTState( void )
 {
-    updateNVSelfTestResult( SELF_TEST_STATUS_IN_PROGRESS );
-    updateNVSelfTestState( NVM_SELF_TEST_STATE_READ_RECORDS );
+      // TODO: Fix in TD
+//    updateNVSelfTestResult( SELF_TEST_STATUS_IN_PROGRESS );
+//    updateNVSelfTestState( NVM_SELF_TEST_STATE_READ_RECORDS );
 }
 
 /*********************************************************************//**
@@ -185,7 +194,9 @@
  *************************************************************************/
 BOOL isNewCalibrationRecordAvailable( void )
 {
-    return getNewCalRecordAvalability();
+      // TODO: Fix in TD
+//    return getNewCalRecordAvalability();
+    return FALSE;
 }
 
 /*********************************************************************//**
@@ -210,8 +221,9 @@
          ( NULL != bufferAddress ) &&
          ( bufferLength > 0U ) )
     {
-        status =  getNVMRecord(nvData, bufferAddress,
-                               bufferLength, numOfSnsrs2Check, nvAlarm);
+          // TODO: Fix in TD
+//        status =  getNVMRecord(nvData, bufferAddress,
+//                               bufferLength, numOfSnsrs2Check, nvAlarm);
     }
 
     return status;
@@ -227,7 +239,8 @@
  *************************************************************************/
 void execNVMProcessRecord( void )
 {
-    execNVMPSendReceiveRecord();
+      // TODO: Fix in TD
+//    execNVMPSendReceiveRecord();
 }
 
 /*********************************************************************//**
@@ -240,7 +253,10 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execNVMSelfTest( void )
 {
-    return execNVMRecordsSelfTest();
+      // TODO: Fix in TD
+//    return execNVMRecordsSelfTest();
+    return SELF_TEST_STATUS_IN_PROGRESS;
+
 }
 
 /*********************************************************************//**
@@ -274,7 +290,8 @@
             dequeueRecordJob();
             recordCurrentJob    = getCurrentProcessRecordJob();
             job                 = recordCurrentJob.recordJob;
-            jobSpecs = getProcessRecord( job );
+              // TODO: Fix in TD
+//            jobSpecs = getProcessRecord( job );
             // Set the record address offset to 0 since a job will just be started
             recordAddressOffset = 0;
             areQueuesNotEmpty   = TRUE;
@@ -308,19 +325,22 @@
                 break;
 
             default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_OPS, ( U32 )nvmExecState );
+                  //TODO: Fix in TD
+//                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_OPS, ( U32 )nvmExecState );
                 break;
         }
     }
 
     // Update Self Test Read Records Flag
     if ( ( TRUE == isRecordQueueEmpty() ) && ( state == NVM_EXEC_STATE_IDLE ) )
     {
-        updateSelfTestReadRecordsFlag( TRUE );
+          // TODO: Fix in TD
+//        updateSelfTestReadRecordsFlag( TRUE );
     }
     else
     {
-        updateSelfTestReadRecordsFlag( FALSE );
+          // TODO: Fix in TD
+//        updateSelfTestReadRecordsFlag( FALSE );
     }
 
     return state;
@@ -367,8 +387,11 @@
     BOOL timeoutStatus                    = didCommandTimeout( state );
     PROCESS_RECORD_JOB_T recordCurrentJob = getCurrentProcessRecordJob();
     NVM_RECORD_TYPE_T job                 = recordCurrentJob.recordJob;
-    PROCESS_RECORD_SPECS_T jobSpecs       = getProcessRecord( job );
 
+    // TODO: Fix in TD
+    PROCESS_RECORD_SPECS_T jobSpecs;
+//    PROCESS_RECORD_SPECS_T jobSpecs       = getProcessRecord( job );
+
     // Check if the fapi has finished
     if ( TRUE == isFlashReady() )
     {
@@ -458,8 +481,11 @@
     BOOL timeoutStatus                    = didCommandTimeout( state );
     PROCESS_RECORD_JOB_T recordCurrentJob = getCurrentProcessRecordJob();
     NVM_RECORD_TYPE_T job                 = recordCurrentJob.recordJob;
-    PROCESS_RECORD_SPECS_T jobSpecs       = getProcessRecord( job );
 
+    // TODO: Fix in TD
+    PROCESS_RECORD_SPECS_T jobSpecs;
+//    PROCESS_RECORD_SPECS_T jobSpecs       = getProcessRecord( job );
+
     // Check if the flash is ready
     if ( TRUE == isFlashReady() )
     {
@@ -514,9 +540,10 @@
 
     if ( TRUE == didTimeout( currentTime, COMMAND_TIME_OUT ) )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT,
-                                   SW_FAULT_ID_NVM_OPS_TIMEOUT,
-                                   ( U32 )state )
+          // TODO: Fix in TD
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT,
+//                                   SW_FAULT_ID_NVM_OPS_TIMEOUT,
+//                                   ( U32 )state );
         status = TRUE;
     }