Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f)
@@ -1,34 +1,32 @@
-/**************************************************************************
- *
- *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- *
- *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
- *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
- *  @file MsgQueues.c
- *
- *  @date 08-Oct-2019
- *  @author S. Nash
- *
- *  @brief MsgQueues service module.  Provides message queue functionality. \n
- *  These queues are NOT thread safe.  However, these queue functions are \n
- *  intended to be called from the General Task thread so no thread safety \n
- *  is required.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file MsgQueues.c
+*
+* @author (last) Quang Nguyen
+* @date (last) 22-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 05-Nov-2019
+*
+***************************************************************************/
 
 #include "MsgQueues.h"
 
 // ********** private definitions **********
 
-#define MAX_MSG_QUEUE_SIZE          100      // messages
+#define MAX_MSG_QUEUE_SIZE          100                                             ///< Maximum message queue size
 
 // ********** private data **********
 
-static U32 msgQueueCounts[ NUM_OF_MSG_QUEUES ];
-static U32 msgQueueStarts[ NUM_OF_MSG_QUEUES ];
-static U32 msgQueueNexts[ NUM_OF_MSG_QUEUES ];
-static MESSAGE_WRAPPER_T msgQueues[ NUM_OF_MSG_QUEUES ][ MAX_MSG_QUEUE_SIZE ];
+static U32 msgQueueCounts[ NUM_OF_MSG_QUEUES ];                                     ///< Message queue count
+static U32 msgQueueStarts[ NUM_OF_MSG_QUEUES ];                                     ///< Start index of a queue
+static U32 msgQueueNexts[ NUM_OF_MSG_QUEUES ];                                      ///< Index to add new message to a queue
+static MESSAGE_WRAPPER_T msgQueues[ NUM_OF_MSG_QUEUES ][ MAX_MSG_QUEUE_SIZE ];      ///< Message queues
 
 // ********** private function prototypes **********
 
@@ -88,12 +86,12 @@
         }
         else // msg queue is full
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL )
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL )
         }
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -135,7 +133,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -164,7 +162,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -193,7 +191,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -245,6 +243,3 @@
     // set msg ID out of bounds in case blank message goes somewhere
     message->msg.hdr.msgID = 0xFFFF;
 }
-
-
-