Index: NVDataMgmt.c
===================================================================
diff -u -r153215cc72cbd5b4738f20561041ea3c81bea701 -r687c5d91e2abef8c72e0f9db1ec0ea83b0e0141b
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 153215cc72cbd5b4738f20561041ea3c81bea701)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 687c5d91e2abef8c72e0f9db1ec0ea83b0e0141b)
@@ -2961,72 +2961,25 @@
  *************************************************************************/
 static BOOL areRecordsValid( void )
 {
-    U32 i;
-    U16 calcCRC;
-    U16 recordCRC;
-    PROCESS_RECORD_SPECS_T spec;
-    BOOL status;
-    BOOL isCheckRequired;
+    ALARM_ID_T alarm;
 
-    for ( i = 0; i < NUM_OF_NVDATMGMT_RECORDS_JOBS; i++ )
-    {
-        status = TRUE;
+    BOOL status = TRUE;
+    PROCESS_RECORD_SPECS_T spec = RECORDS_SPECS [ NVDATAMGMT_CALIBRATION_RECORD ];
+    U16 calcCRC                 = crc16 ( spec.structAddressPtr, spec.sizeofJob - sizeof(U16) );
+    U16 recordCRC               = *(U16*)spec.structCRCPtr;
 
+    // If the CRCs do not match, break out of loop since POST will be failed
+    // regardless of the rest of the results
+    if ( calcCRC != recordCRC )
+    {
 #ifdef _DG_
-        // Scheduled runs are not part this phase but it is part of the enums
-        // so they are ignored during checking
-        isCheckRequired = ( NVDATAMGMT_SCHEDULED_RUNS_RECORD == i ? FALSE : TRUE );
+        alarm = ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID;
 #endif
-
-        if ( TRUE == isCheckRequired )
-        {
-            spec      = RECORDS_SPECS [ i ];
-            calcCRC   = crc16 ( spec.structAddressPtr, spec.sizeofJob - sizeof(U16) );
-            recordCRC = *(U16*)spec.structCRCPtr;
-
-            // If the CRCs do not match, break out of loop since POST will be failed
-            // regardless of the rest of the results
-            if ( calcCRC != recordCRC )
-            {
-                ALARM_ID_T alarm;
-
-                switch ( i )
-                {
-                    case NVDATAMGMT_CALIBRATION_RECORD:
-#ifdef _DG_
-                        alarm = ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID;
+#ifdef _HD_
+        alam = ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID
 #endif
-                        activateAlarmNoData( alarm );
-                        break;
-
-                    case NVDATAMGMT_SYSTEM_RECORD:
-#ifdef _DG_
-                        alarm = ALARM_ID_DG_NVDATAMGMT_SYSTEM_GROUP_RECORD_CRC_INVALID;
-#endif
-                        activateAlarmNoData( alarm );
-                        break;
-
-                    case NVDATAMGMT_SERVICE_RECORD:
-#ifdef _DG_
-                        alarm = ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID;
-#endif
-                        activateAlarmNoData( alarm );
-                        break;
-
-#ifdef _DG_
-                    case NVDATAMGMT_SCHEDULED_RUNS_RECORD:
-                        activateAlarmNoData( ALARM_ID_DG_SCHEDULED_RUNS_GROUP_RECORD_CRC_INVALID );
-                        break;
-#endif
-                    default:
-#ifdef _DG_
-                        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_NVDATAMGMT_GROUP_RECORD_SELECTED );
-#endif
-                        break;
-                }
-                status = FALSE;
-            }
-        }
+        activateAlarmNoData( alarm );
+        status = FALSE;
     }
 
     return status;