Index: NVDataMgmt.c
===================================================================
diff -u -r0229ed2875a9bb9b1a64ac9a4fac948f1ba1410c -r6c622ecaa2a2abed374ca86e425f9d4dc516da35
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0229ed2875a9bb9b1a64ac9a4fac948f1ba1410c)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 6c622ecaa2a2abed374ca86e425f9d4dc516da35)
@@ -1702,7 +1702,7 @@
         U08* bufferAddress  = specs.structAddressPtr;
         U32 maxBufferLength = ( specs.maxReadBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
 
-        Fapi_doMarginRead ( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
+        Fapi_doMarginRead( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
         currentTime = getMSTimerCount();
         state = NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD;
     }
@@ -1730,7 +1730,7 @@
         U08* bufferAddress  = specs.structAddressPtr;
         U32 maxBufferLength = ( specs.maxReadBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
 
-        Fapi_doMarginRead ( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
+        Fapi_doMarginRead( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
         currentTime = getMSTimerCount();
         state = NVDATAMGMT_SELF_TEST_STATE_READ_SYS_RECORD;
     }
@@ -1754,7 +1754,7 @@
     {
         if ( getRTCRAMState() == RTC_RAM_STATE_READY )
         {
-            PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS [ NVDATAMGMT_SERVICE_RECORD ];
+            PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS[ NVDATAMGMT_SERVICE_RECORD ];
             U32 startAddress    = specs.startAddress;
             U32 maxBufferLength = specs.maxReadBufferSize;
 
@@ -1783,7 +1783,7 @@
 
     if ( getRTCRAMStatus() == RTC_RAM_STATUS_IDLE || timeoutStatus == TRUE )
     {
-        PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS [ NVDATAMGMT_SERVICE_RECORD ];
+        PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS[ NVDATAMGMT_SERVICE_RECORD ];
         U08* bufferAddress  = specs.structAddressPtr;
         U32 maxBufferLength = specs.maxReadBufferSize;
 
@@ -1792,7 +1792,7 @@
 #ifdef _DG_
         if ( getRTCRAMState() == RTC_RAM_STATE_READY )
         {
-            PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS [ NVDATAMGMT_SCHEDULED_RUNS_RECORD ];
+            PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS[ NVDATAMGMT_SCHEDULED_RUNS_RECORD ];
             U32 startAddress    = specs.startAddress;
             U32 maxBufferLength = specs.maxReadBufferSize;
 
@@ -1821,11 +1821,11 @@
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadScheduledRunsRecord( void )
 {
     NVDATAMGMT_SELF_TEST_STATE_T state = NVDATAMGMT_SELF_TEST_STATE_READ_SCHEDULED_RUNS_RECORD;
-    BOOL timeoutStatus = didCommandTimeout ( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
+    BOOL timeoutStatus = didCommandTimeout( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
 
     if ( getRTCRAMStatus() == RTC_RAM_STATUS_IDLE || timeoutStatus == TRUE )
     {
-        PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS [ NVDATAMGMT_SCHEDULED_RUNS_RECORD ];
+        PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS[ NVDATAMGMT_SCHEDULED_RUNS_RECORD ];
         U08* bufferAddress  = specs.structAddressPtr;
         U32 maxBufferLength = specs.maxReadBufferSize;
 
@@ -1848,16 +1848,16 @@
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadHDTreatmentTime ( void )
 {
     NVDATAMGMT_SELF_TEST_STATE_T state = NVDATAMGMT_SELF_TEST_STATE_READ_TREATMENT_TIME;
-    BOOL timeoutStatus = didCommandTimeout ( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
+    BOOL timeoutStatus = didCommandTimeout( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
 
     // If the RTC RAM is ready, read the results
     if ( getRTCRAMStatus() == RTC_RAM_STATUS_IDLE || timeoutStatus == TRUE )
     {
-        getDataFromRAM ( (U08*)&hdUsageInfoGroup, sizeof(HD_USAGE_INFO_RECORD_T) );
+        getDataFromRAM( (U08*)&hdUsageInfoGroup, sizeof(HD_USAGE_INFO_RECORD_T) );
         // If the RAM is ready, request a read for the log records (RAM)
         if ( getRTCRAMState() == RTC_RAM_STATE_READY )
         {
-            readFromRAM ( LOG_RECORD_START_ADDRESS, sizeof(LOG_RECORD_T) );
+            readFromRAM( LOG_RECORD_START_ADDRESS, sizeof(LOG_RECORD_T) );
             currentTime = getMSTimerCount();
             state = NVDATAMGMT_SELF_TEST_STATE_READ_LOG_RECORD;
         }
@@ -2049,25 +2049,25 @@
     {
         if ( ops == NVDATAMGMT_ERASE_SECTOR )
         {
-            Fapi_issueAsyncCommandWithAddress ( Fapi_EraseSector, (U32*)startAddress );
+            Fapi_issueAsyncCommandWithAddress( Fapi_EraseSector, (U32*)startAddress );
             state = NVDATAMGMT_EXEC_STATE_ERASE_EEPROM;
         }
         else if ( ops == NVDATAMGMT_WRITE && location == NVDATAMGMT_EEPROM )
         {
-            Fapi_issueProgrammingCommand ( (U32*)startAddress, (U08*)bufferAddress, maxBufferLength, 0x00, 0, Fapi_DataOnly );
+            Fapi_issueProgrammingCommand( (U32*)startAddress, (U08*)bufferAddress, maxBufferLength, 0x00, 0, Fapi_DataOnly );
             state = NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM;
         }
         else if ( ops == NVDATAMGMT_READ && location == NVDATAMGMT_EEPROM )
         {
-            Fapi_doMarginRead ( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
+            Fapi_doMarginRead( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength / EEPROM_OPS_SIZE_OF_CONVERTER, Fapi_NormalRead );
             state = NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM;
         }
         else if ( ops == NVDATAMGMT_WRITE && location == NVDATAMGMT_RTC )
         {
             if ( getRTCRAMState() == RTC_RAM_STATE_READY )
             {
                 currentTime = getMSTimerCount();
-                writeToRAM ( startAddress, bufferAddress, maxBufferLength );
+                writeToRAM( startAddress, bufferAddress, maxBufferLength );
                 state = NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC;
             }
         }
@@ -2111,12 +2111,13 @@
         {
             currentTime = getMSTimerCount();
             U32 startAddress = jobSpecs.startAddress + recordAddressOffset;
+            U32 maxBufferLength = ( jobSpecs.maxWriteBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
 
             // Clear the buffer from the previous content
             memset( writtenRecordCheckBuffer, 0, sizeof(writtenRecordCheckBuffer));
 
             // Issue a FAPI read command but only the bytes that were written, so use maxWriteBufferSize
-            Fapi_doMarginRead ( (U32*)startAddress, (U32*)writtenRecordCheckBuffer, jobSpecs.maxWriteBufferSize, Fapi_NormalRead );
+            Fapi_doMarginRead( (U32*)startAddress, (U32*)writtenRecordCheckBuffer, maxBufferLength, Fapi_NormalRead );
 
             state = NVDATAMGMT_EXEC_STATE_VERIFY_EEPROM_WRITE;
         }
@@ -2138,7 +2139,7 @@
                 writtenRecordStatus = NVDATAMGMT_RECORD_NOT_CHECKED;
 
                 // Issue the write command
-                Fapi_issueProgrammingCommand ( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
+                Fapi_issueProgrammingCommand( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
             }
         }
     }
Index: Utilities.h
===================================================================
diff -u -r810dd01b8fa7d5864adea6aaf13c43c61f2c889b -r6c622ecaa2a2abed374ca86e425f9d4dc516da35
--- Utilities.h	(.../Utilities.h)	(revision 810dd01b8fa7d5864adea6aaf13c43c61f2c889b)
+++ Utilities.h	(.../Utilities.h)	(revision 6c622ecaa2a2abed374ca86e425f9d4dc516da35)
@@ -36,7 +36,6 @@
 {
     TIME_WINDOWED_COUNT_BAD_MSG_CRC = 0,                    ///< Bad message CRC
     TIME_WINDOWED_COUNT_CAN_WARNING,                        ///< CAN warning
-    TIME_WINDOWED_COUNT_CAN_PASSIVE,                        ///< CAN passive mode
     TIME_WINDOWED_COUNT_CAN_OFF,                            ///< CAN off
     TIME_WINDOWED_COUNT_CAN_PARITY,                         ///< CAN parity error
     TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR,              ///< FPGA UART frame error