Index: App/Services/Interrupts.c
===================================================================
diff -u -r0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00 -r4e49b5f4036964295a7f8341a860023d319569cc
--- App/Services/Interrupts.c	(.../Interrupts.c)	(revision 0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00)
+++ App/Services/Interrupts.c	(.../Interrupts.c)	(revision 4e49b5f4036964295a7f8341a860023d319569cc)
@@ -19,13 +19,13 @@
 #include "sci.h"
 #include "sys_dma.h"
 
+#include "Comm.h"
 #include "Interrupts.h"
 #include "FPGA.h"
 #include "SystemComm.h"
 
 // ********** private definitions **********
 
-#define DMA_CH_STATUS_BIT(ch)       ((U32)1U << (ch))
 
 // ********** private data **********
 
@@ -119,177 +119,3 @@
     }
 }
 
-/*************************************************************************
- * @brief setSCI1DMAReceiveInterrupt
- * The setSCI1DMAReceiveInterrupt function enables DMA receive interrupts \n
- * for the SCI1 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA receive interrupt is enabled.
- * @param none
- * @return none
- *************************************************************************/
-void setSCI1DMAReceiveInterrupt( void )
-{
-    sciREG->SETINT = SCI_DMA_RECEIVE_INT;
-}
-
-/*************************************************************************
- * @brief setSCI1DMATransmitInterrupt
- * The setSCI1DMATransmitInterrupt function enables DMA transmit interrupts \n
- * for the SCI1 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA transmit interrupt is enabled.
- * @param none
- * @return none
- *************************************************************************/
-void setSCI1DMATransmitInterrupt( void )
-{
-    sciREG->SETINT = SCI_DMA_TRANSMIT_INT;
-}
-
-/*************************************************************************
- * @brief clearSCI1DMAReceiveInterrupt
- * The clearSCI1DMAReceiveInterrupt function disables DMA receive interrupts \n
- * for the SCI1 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA receive interrupt is disabled.
- * @param none
- * @return none
- *************************************************************************/
-void clearSCI1DMAReceiveInterrupt( void )
-{
-    sciREG->CLEARINT = SCI_DMA_RECEIVE_INT;
-}
-
-/*************************************************************************
- * @brief clearSCI1DMATransmitInterrupt
- * The clearSCI1DMATransmitInterrupt function disables DMA transmit interrupts \n
- * for the SCI1 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA transmit interrupt is disabled.
- * @param none
- * @return none
- *************************************************************************/
-void clearSCI1DMATransmitInterrupt( void )
-{
-    sciREG->CLEARINT = SCI_DMA_TRANSMIT_INT;
-}
-
-/*************************************************************************
- * @brief setSCI2DMAReceiveInterrupt
- * The setSCI2DMAReceiveInterrupt function enables DMA receive interrupts \n
- * for the SCI2 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA receive interrupt is enabled.
- * @param none
- * @return none
- *************************************************************************/
-void setSCI2DMAReceiveInterrupt( void )
-{
-    scilinREG->SETINT = SCI_DMA_RECEIVE_INT;
-}
-
-/*************************************************************************
- * @brief setSCI2DMATransmitInterrupt
- * The setSCI2DMATransmitInterrupt function enables DMA transmit interrupts \n
- * for the SCI2 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA transmit interrupt is enabled.
- * @param none
- * @return none
- *************************************************************************/
-void setSCI2DMATransmitInterrupt( void )
-{
-    scilinREG->SETINT = SCI_DMA_TRANSMIT_INT;
-}
-
-/*************************************************************************
- * @brief clearSCI2DMAReceiveInterrupt
- * The clearSCI2DMAReceiveInterrupt function disables DMA receive interrupts \n
- * for the SCI2 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA receive interrupt is disabled.
- * @param none
- * @return none
- *************************************************************************/
-void clearSCI2DMAReceiveInterrupt( void )
-{
-    scilinREG->CLEARINT = SCI_DMA_RECEIVE_INT;
-}
-
-/*************************************************************************
- * @brief clearSCI2DMATransmitInterrupt
- * The clearSCI2DMATransmitInterrupt function disables DMA transmit interrupts \n
- * for the SCI2 peripheral.
- * @details
- * Inputs : none
- * Outputs : DMA transmit interrupt is disabled.
- * @param none
- * @return none
- *************************************************************************/
-void clearSCI2DMATransmitInterrupt( void )
-{
-    scilinREG->CLEARINT = SCI_DMA_TRANSMIT_INT;
-}
-
-/*************************************************************************
- * @brief isSCI1DMATransmitInProgress
- * The isSCI2DMATransmitInProgress function determines whether a DMA transmit \n
- * is in progress on the SCI1 peripheral.
- * @details
- * Inputs : status registers
- * Outputs : none
- * @param none
- * @return TRUE if a transmit is in progress, FALSE if not
- *************************************************************************/
-BOOL isSCI1DMATransmitInProgress( void )
-{
-    BOOL transmitterBusy = ( ( sciREG->FLR & (U32)SCI_TX_INT ) == 0U ? TRUE : FALSE );
-    BOOL dmaTransmitterBusy = ( ( dmaREG->PEND & DMA_CH_STATUS_BIT(DMA_CH3) ) != 0U ? TRUE : FALSE );
-
-
-    return ( ( transmitterBusy == TRUE ) || ( dmaTransmitterBusy == TRUE ) ? TRUE : FALSE );
-}
-
-/*************************************************************************
- * @brief isSCI2DMATransmitInProgress
- * The isSCI2DMATransmitInProgress function determines whether a DMA transmit \n
- * is in progress on the SCI2 peripheral.
- * @details
- * Inputs : status registers
- * Outputs : none
- * @param none
- * @return TRUE if a transmit is in progress, FALSE if not
- *************************************************************************/
-BOOL isSCI2DMATransmitInProgress( void )
-{
-    BOOL transmitterBusy = ( ( scilinREG->FLR & (U32)SCI_TX_INT ) == 0U ? TRUE : FALSE );
-    BOOL dmaTransmitterBusy = ( ( dmaREG->PEND & DMA_CH_STATUS_BIT(DMA_CH2) ) != 0U ? TRUE : FALSE );
-
-    return ( ( transmitterBusy == TRUE ) || ( dmaTransmitterBusy == TRUE ) ? TRUE : FALSE );
-}
-
-/*************************************************************************
- * @brief isCAN1TransmitInProgress
- * The isCAN1TransmitInProgress function determines whether a transmit \n
- * is in progress on the CAN1 peripheral.
- * @details
- * Inputs : status registers
- * Outputs : none
- * @param none
- * @return TRUE if a transmit is in progress, FALSE if not
- *************************************************************************/
-BOOL isCAN1TransmitInProgress( void )
-{
-    BOOL result = ( ( canREG1->TXRQx[0] != 0 ) || ( canREG1->TXRQx[1] != 0 ) ? TRUE : FALSE );
-
-    return result;
-}
-