Index: NVDataMgmt.h
===================================================================
diff -u -rf45e0c61d9ca26a63c30cbba80cc5e835a89416a -r0170e69752974589e2f3c3507d3fb0ebd771bd89
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision f45e0c61d9ca26a63c30cbba80cc5e835a89416a)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 0170e69752974589e2f3c3507d3fb0ebd771bd89)
@@ -19,9 +19,9 @@
 
 #include "Common.h"
 
-#define MAX_SYS_SERIAL_NUMBER_CHARACTERS    7U
-#define MAX_HW_SERIAL_NUMBER_CHARACTERS     5U
-#define MAX_MFG_DATE_CHARACTERS            10U
+#define MAX_SYS_SERIAL_NUMBER_CHARACTERS 7U
+#define MAX_HW_SERIAL_NUMBER_CHARACTERS  5U
+#define MAX_MFG_DATE_CHARACTERS          10U
 
 typedef enum LOG_EVENT
 {
@@ -34,6 +34,15 @@
    NVDATAMGMT_UI_CRASHED
 } NVDATAMGMT_LOG_EVENT_T;
 
+#pragma pack(push, 1)
+typedef struct mfg_Data
+{
+    char SYSSerialNumber [ MAX_SYS_SERIAL_NUMBER_CHARACTERS ];
+    char HWSerialNumber  [ MAX_HW_SERIAL_NUMBER_CHARACTERS ];
+    char mfgDate         [ MAX_MFG_DATE_CHARACTERS ];
+} MFG_DATA_T;
+#pragma pack(pop)
+
 void initNVDataMgmt ( void );
 
 void execNVDataMgmt ( void );
@@ -42,12 +51,10 @@
 
 BOOL getSerialNumber ( char buffer );
 
-BOOL setSerialNumber ( char* buffer );
+BOOL setMfgData ( MFG_DATA_T data );
 
-BOOL setMfgData ( char* buffer );
+void getMfgData ( U08* buffer );
 
-BOOL getMfgData ( char* buffer );
-
 BOOL setTreatmentTime ( U32 mins );
 
 BOOL setLitersOfFilteredWater ( U32 liter );