Index: NVDataMgmt.h
===================================================================
diff -u -rd2ff6db64d23836f7e649c7c13240c3c93a8b5aa -racf23cc2f7d60625777583d890f0f1c936e7c3bf
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision d2ff6db64d23836f7e649c7c13240c3c93a8b5aa)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision acf23cc2f7d60625777583d890f0f1c936e7c3bf)
@@ -92,12 +92,9 @@
 
 BOOL isNewCalibrationRecordAvailable( void );
 
-BOOL getCalibrationRecord2Driver( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength, ALARM_ID_T nvAlarm );
+BOOL getNVRecord2Driver( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength, U08 numOfSnsrs2Check, ALARM_ID_T nvAlarm );
 
 #ifdef _DG_
-DG_PRES_SENSORS_CAL_RECORD_T         getDGPressureSensorsCalibrationRecord( void );
-DG_FLOW_SENSORS_CAL_RECORD_T         getDGFlowSensorsCalibrationRecord( void );
-DG_LOAD_CELLS_CAL_RECORD_T           getDGLoadCellsCalibrationRecord( void );
 DG_TEMP_SENSORS_CAL_RECORD_T         getDGTemperatureSensorsCalibrationRecord( void );
 DG_COND_SENSORS_CAL_RECORD_T         getDGConducitivitySensorsCalibrationRecord( void );
 DG_RO_PUMP_CAL_RECORD_T              getDGROPumpRecord( void );
@@ -106,17 +103,14 @@
 DG_DRAIN_LINE_VOLUME_T               getDGDrainLineVolumeRecord( void );
 DG_PRE_RO_PURGE_VOLUME_T             getDGPreROPurgeVolumeRecord( void );
 DG_RESERVOIR_VOLUME_RECORD_T         getDGReservoirsVolumeRecord( void );
-DG_ACID_CONCENTRATES_RECORD_T        getDGAcidConcentratesRecord( void );
-DG_BICARB_CONCENTRATES_RECORD_T      getDGBicarbConcentratesRecord( void );
 DG_FILTERS_CAL_RECORD_T              getDGFiltersRecord( void );
 DG_FANS_CAL_RECORD_T                 getDGFansRecord( void );
-DG_ACCELEROMETER_SENSOR_CAL_RECORD_T getDGAccelerometerSensorCalibrationRecord( void );
+DG_ACCEL_SENSOR_CAL_RECORD_T         getDGAccelerometerSensorCalibrationRecord( void );
 DG_SYSTEM_RECORD_T                   getDGSystemRecord( void );
 DG_SERVICE_RECORD_T                  getDGServiceRecord( void );
 DG_SCHEDULED_RUN_RECORD_T            getDGScheduledRunsRecord( void );
 BOOL                                 setWaterConsumption ( U32 liters );
 U32                                  getWaterConsumption ( void );
-DG_HEATERS_RECORD_T                  getHeatersInfoReocrd( void );
 BOOL                                 setHeatersInfoRecord( U08 *addressPtr );
 #endif
 #ifdef _HD_
@@ -134,8 +128,8 @@
 U32                                  getTreatmentTime ( void );
 #endif
 
-BOOL writeLogData ( LOG_DATA_T* data );
-BOOL readLogData ( READ_DATA_T* buffer, U32 length );
+BOOL writeLogData( LOG_DATA_T* data );
+BOOL readLogData( READ_DATA_T* buffer, U32 length );
 
 // From Dialin
 BOOL getCalibrationRecord( void );