Index: NVDataMgmt.h
===================================================================
diff -u -r1dca03388e2ccf64fc0bbee3e77080462a17097f -r32d19410fc08e86e4503f6e8af5470170bb72cdf
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 1dca03388e2ccf64fc0bbee3e77080462a17097f)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 32d19410fc08e86e4503f6e8af5470170bb72cdf)
@@ -31,28 +31,44 @@
 
 // ********** public definitions **********
 
-#define MAX_SYS_SERIAL_NUMBER_CHARACTERS 7U                     ///< Max number of characters for SYS serial number
-#define MAX_HW_SERIAL_NUMBER_CHARACTERS  5U                     ///< Max number of characters for HD serial number
-#define MAX_DATE_CHARACTERS              10U                    ///< Max number of characters for date
+#define MAX_TOP_LEVEL_PN_CHARS 10U                              ///< Max number of characters for top level part number.
+#define MAX_TOP_LEVEL_SN_CHARS 10U                              ///< Max number of characters for top level serial number.
 
+#define MAX_HW_SERIAL_NUMBER_CHARACTERS  5U                     ///< Max number of characters for HD serial number TODO remove
+#define MAX_DATE_CHARACTERS              10U                    ///< Max number of characters for date TODO REMOVE
+
+/// Manufacturing location enumeration.
+typedef enum mfg_location
+{
+    MFG_LOC_FACTORY = 0,                                        ///< Manufacturing location (HD/DG).
+    NUM_OF_MFG_LOC                                              ///< Number of manufacturing location.
+} MFG_LOCATION_T;
+
+typedef enum last_service_location
+{
+    LAST_SERVICE_LOC_FACTORY = 0,                               ///< Last service location factory (HD/DG).
+    LAST_SERVICE_LOC_FIELD,                                     ///< Last service location field (HD/DG).
+    NUM_OF_LAST_SERVICE_LOC                                     ///< Number of last service location.
+} LAST_SERVICE_LOCATION_T;
+
 /// Log event enumeration.
-typedef enum LOG_EVENT
+typedef enum log_event
 {
-   NVDATAMGMT_MODE_CHANGE = 0,                                  ///< Mode change
-   NVDATAMGMT_ALARM,                                            ///< Alarm
-   NVDATAMGMT_DISINFECTION_STARTED,                             ///< Disinfection started
-   NVDATAMGMT_DISINFECTION_ENDED,                               ///< Disinfection ended
-   NVDATAMGMT_DEVICE_TURNED_ON,                                 ///< Device turned on
-   NVDATAMGMT_DEVICE_TURNED_OFF,                                ///< Device turned off
-   NVDATAMGMT_UI_CRASHED                                        ///< UI crashed
+   NVDATAMGMT_MODE_CHANGE = 0,                                  ///< Mode change.
+   NVDATAMGMT_ALARM,                                            ///< Alarm.
+   NVDATAMGMT_DISINFECTION_STARTED,                             ///< Disinfection started.
+   NVDATAMGMT_DISINFECTION_ENDED,                               ///< Disinfection ended.
+   NVDATAMGMT_DEVICE_TURNED_ON,                                 ///< Device turned on.
+   NVDATAMGMT_DEVICE_TURNED_OFF,                                ///< Device turned off.
+   NVDATAMGMT_UI_CRASHED                                        ///< UI crashed.
 } NVDATAMGMT_LOG_EVENT_T;
 
 /// Read status enumeration.
-typedef enum READ_STATUS
+typedef enum read_status
 {
-   NVDATAMGMT_READ_IDLE = 0,                                    ///< Read status idle
-   NVDATAMGMT_READ_IN_PROGRESS,                                 ///< Read status in progress
-   NVDATAMGMT_READ_COMPLETE                                     ///< Read status complete
+   NVDATAMGMT_READ_IDLE = 0,                                    ///< Read status idle.
+   NVDATAMGMT_READ_IN_PROGRESS,                                 ///< Read status in progress.
+   NVDATAMGMT_READ_COMPLETE                                     ///< Read status complete.
 } NVDATAMGMT_READ_STATUS_T;
 
 typedef enum dg_pressure_sensors
@@ -117,14 +133,13 @@
     NUM_OF_CAL_DATA_DG_PUMPS
 } CAL_DATA_DG_PUMPS_T;
 
-
 #pragma pack(push, 1)
 /// Manufacturing data structure.
 typedef struct mfg_Data
 {
-    char SYSSerialNumber [ MAX_SYS_SERIAL_NUMBER_CHARACTERS ];  ///< SYS serial number
-    char HWSerialNumber  [ MAX_HW_SERIAL_NUMBER_CHARACTERS ];   ///< HW serial number
-    char mfgDate         [ MAX_DATE_CHARACTERS ];               ///< Manufacturing date
+    char SYSSerialNumber [ MAX_TOP_LEVEL_PN_CHARS ];            ///< SYS serial number.
+    char HWSerialNumber  [ MAX_HW_SERIAL_NUMBER_CHARACTERS ];   ///< HW serial number.
+    char mfgDate         [ MAX_DATE_CHARACTERS ];               ///< Manufacturing date.
 } MFG_DATA_T;
 
 /// Calibration data structure.