Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
@@ -24,16 +24,9 @@
 
 // ********** private definitions **********
 
-/// Enumeration of service mode states.
-typedef enum Service_States
-{
-    SERVICE_STATE_START = 0,                                     ///< Start service mode state.
-    NUM_OF_SERVICE_STATES                                        ///< Number of service mode states.
-} SERVICE_STATE_T;
-
 // ********** private data **********
 
-static SERVICE_STATE_T serviceState = SERVICE_STATE_START;       ///< Currently active service state.
+static DG_SERVICE_STATE_T serviceState = DG_SERVICE_STATE_START;       ///< Currently active service state.
 
 // ********** private function prototypes **********
 
@@ -47,7 +40,7 @@
  *************************************************************************/
 void initServiceMode( void )
 {
-    serviceState = SERVICE_STATE_START;
+    serviceState = DG_SERVICE_STATE_START;
 }
 
 /*********************************************************************//**
@@ -68,21 +61,37 @@
  * @details
  * Inputs : none
  * Outputs :
- * @return none
+ * @return current state.
  *************************************************************************/
-void execServiceMode( void )
+U32 execServiceMode( void )
 {
     // execute current service state
     switch ( serviceState )
     {
-        case SERVICE_STATE_START:
+        case DG_SERVICE_STATE_START:
             break;
 
         default:
-            serviceState = SERVICE_STATE_START;
             // TODO - s/w fault
+            serviceState = DG_SERVICE_STATE_START;
             break;
     }
+
+    return serviceState;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getCurrentServiceState function returns the current state of the \n
+ * service mode.
+ * @details
+ * Inputs : serviceState
+ * Outputs : none
+ * @return the current state of service mode.
+ *************************************************************************/
+DG_SERVICE_STATE_T getCurrentServiceState( void )
+{
+    return serviceState;
+}
+
 /**@}*/