Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r3ca05094a51e41dfafa2dbc6bbb40df1971a8679 -rc946dc2b288b45541d1ee583560aa2af5f49c1c7
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3ca05094a51e41dfafa2dbc6bbb40df1971a8679)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c946dc2b288b45541d1ee583560aa2af5f49c1c7)
@@ -76,21 +76,11 @@
     NUM_OF_CONFIRMATION_REQUEST_STATUS                 ///< Number of confirmation status
 } CONFIRMATION_REQUEST_STATUS_T;
 
-/// List of confirmation status.
-typedef enum Confirmation_Request_Type
-{
-    CONFIRMATION_REQUEST_TYPE_OPEN = 0,                ///< Confirmation type open
-    CONFIRMATION_REQUEST_TYPE_CLOSE_TIMEOUT,           ///< Confirmation type close due to timeout
-    CONFIRMATION_REQUEST_TYPE_REJECT,                  ///< Confirmation type reject
-    CONFIRMATION_REQUEST_TYPE_CLOSE_ACCEPT,            ///< Confirmation type close due to accepted confirm
-    NUM_OF_CONFIRMATION_TYPE                           ///< Number of confirmation types
-} CONFIRMATION_REQUEST_TYPE_T;
-
 /// Structure for confirmation request.
 typedef struct
 {
     U32 requestID;                                      ///< Request ID
-    CONFIRMATION_REQUEST_TYPE_T requestType;            ///< Request Type
+    GENERIC_CONFIRM_COMMAND_T requestType;              ///< Request Type
     U32 timeStamp;                                      ///< Timestamp for request
     CONFIRMATION_REQUEST_STATUS_T status;               ///< Request status (pending, accepted, rejected)
 } CONFIRMATION_REQUEST_T;
@@ -844,8 +834,8 @@
 
 // MSG_ID_UI_CONFIRMATION_RESULT
 void handleUIConfirmationResponse( MESSAGE_T *message );
-CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( U32 request_id );
-U32 sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_T request_type, U32 reject_reason );
+CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id );
+GENERIC_CONFIRM_ID_T sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
 
 /**@}*/