]> rtime.felk.cvut.cz Git - arc.git/blobdiff - arch/arm/arm_cr4/drivers/Can.c
Added an example of CAN communication for the TMS570LS31x HDK
[arc.git] / arch / arm / arm_cr4 / drivers / Can.c
index 6695a6fc8406f93c305b806a73bf7f36de30af1e..3f17ac90be9aefc49e5a4a7490308361774704d3 100644 (file)
@@ -1,8 +1,17 @@
-\r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Include Files                                                              */\r
-\r
+/* -------------------------------- Arctic Core ------------------------------\r
+ * Arctic Core - the open source AUTOSAR platform http://arccore.com\r
+ *\r
+ * Copyright (C) 2009  ArcCore AB <contact@arccore.com>\r
+ *\r
+ * This source code is free software; you can redistribute it and/or modify it\r
+ * under the terms of the GNU General Public License version 2 as published by the\r
+ * Free Software Foundation; See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.\r
+ *\r
+ * This program is distributed in the hope that it will be useful, but\r
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\r
+ * for more details.\r
+ * -------------------------------- Arctic Core ------------------------------*/\r
 \r
 \r
 #include "Can.h"\r
 #include "Dem.h"\r
 #endif\r
 #include "Det.h"\r
-//#include "Spi.h"\r
-//#include "EcuM_Cbk.h"\r
 #include "CanIf_Cbk.h"\r
-//#include "MemMap.h"\r
 #include "Os.h"\r
-#include "irq.h"\r
+#include "isr.h"\r
+#include "Mcu.h"\r
+#include "arc.h"\r
+\r
+#define DCAN1_MAX_MESSAGEBOXES 64\r
+#define DCAN2_MAX_MESSAGEBOXES 64\r
+#define DCAN3_MAX_MESSAGEBOXES 32\r
+\r
+#define CAN_TIMEOUT_DURATION   0xFFFFFFFF\r
+#define CAN_INSTANCE           0\r
 \r
+#define DCAN_IRQ_MASK          0x00000006\r
 \r
 \r
 #if !defined(USE_DEM)\r
+// If compiled without the DEM, calls to DEM are simply ignored.\r
 #define Dem_ReportErrorStatus(...)\r
 #endif\r
 \r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Variable Definition                                                        */\r
-\r
-static Can_RegisterType* CanBase[]=\r
+static sint8 IfRegId = 0;\r
+\r
+/* Macro for waiting until busy flag is 0 */\r
+#define DCAN_WAIT_UNTIL_NOT_BUSY(ControllerId, IfRegId) \\r
+    { \\r
+               uint32 ErrCounter = CAN_TIMEOUT_DURATION; \\r
+               while(CanRegs[ControllerId]->IFx[IfRegId].COM & 0x00008000) { \\r
+                       ErrCounter--; \\r
+                       if(ErrCounter == 0) { \\r
+                               Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED); \\r
+                               ErrCounter = CAN_TIMEOUT_DURATION; \\r
+                               return CAN_NOT_OK; \\r
+                       } \\r
+               } \\r
+    }\r
+\r
+/* Macro for waiting until busy flag is 0 */\r
+#define DCAN_WAIT_UNTIL_NOT_BUSY_NO_RV(ControllerId, IfRegId) \\r
+       { \\r
+               uint32 ErrCounter = CAN_TIMEOUT_DURATION; \\r
+               while(CanRegs[ControllerId]->IFx[IfRegId].COM & 0x00008000) { \\r
+                       ErrCounter--; \\r
+                       if(ErrCounter == 0) { \\r
+                               Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED); \\r
+                               ErrCounter = CAN_TIMEOUT_DURATION; \\r
+                               return; \\r
+                       } \\r
+               } \\r
+       }\r
+\r
+\r
+\r
+// Array for easy access to DCAN register definitions.\r
+static Can_RegisterType* CanRegs[]=\r
 {\r
-    Can0_Base,\r
-#ifdef Can1_Base\r
-    Can1_Base\r
-#endif\r
+       DCAN1_Base,\r
+       DCAN2_Base,\r
+       DCAN3_Base\r
 };\r
 \r
 typedef enum\r
@@ -42,23 +87,11 @@ typedef enum
     CAN_READY\r
 } Can_StateType;\r
 \r
-typedef enum\r
-{\r
-    INTERRUPT = 0x00000400,\r
-    POLLING   = 0x00000000\r
-} OpMode;\r
 \r
 typedef struct\r
 {\r
-    OpMode       BusOff;\r
-    OpMode       RxProc;\r
-    OpMode       TxProc;\r
-    OpMode       WakeupProc;\r
-    uint16       MessageBoxCount;\r
     uint16       MaxBoxes;\r
-    uint8        FirstHandle;\r
     uint32       WakeupSrc;\r
-    uint32      *MaskRefPtr;\r
     Can_PduType *PduPtr;\r
     uint8       *CancelPtr;\r
     uint8       *TxPtr;    \r
@@ -69,10 +102,10 @@ typedef struct
 /* Module is in uninitialized state */\r
 static Can_StateType            ModuleState = CAN_UNINIT;\r
 #endif\r
-static CanIf_ControllerModeType ControllerMode[CAN_CONTROLLER_COUNT];\r
+\r
+static CanIf_ControllerModeType ControllerMode[CAN_ARC_CTRL_CONFIG_CNT];\r
 \r
 /* Used to switch between IF1 and IF2 of DCAN */\r
-static uint8 IfRegId = 0;\r
 \r
 /* Used to order Data Bytes according to hardware registers in DCAN */\r
 static const uint8 ElementIndex[] = {3, 2, 1, 0, 7, 6, 5, 4};\r
@@ -81,188 +114,270 @@ static const uint8 ElementIndex[] = {3, 2, 1, 0, 7, 6, 5, 4};
 static const Can_ConfigType *CurConfig;\r
 \r
 /* To save the PduData of transmission objects */\r
-static Can_PduType PduInfoArray_0[MAX_MESSAGEBOXES_0];\r
+static Can_PduType PduInfoArray_1[DCAN1_MAX_MESSAGEBOXES];\r
 /* To save pending Cancel Requests of transmission objects */\r
-static uint8 CancelRqstArray_0[MAX_MESSAGEBOXES_0];\r
+static uint8 CancelRqstArray_1[DCAN1_MAX_MESSAGEBOXES];\r
 /* To save pending Transmit Requests of transmission objects */\r
-static uint8 TxRqstArray_0[MAX_MESSAGEBOXES_0];\r
-/* Array to save Filtermask references of MessageObjects */\r
-static uint32 FilterMaskRef_0[MESSAGEBOX_COUNT_0];\r
-\r
-#ifdef CanController_1\r
-static Can_PduType PduInfoArray_1[MAX_MESSAGEBOXES_1];\r
-static uint8 CancelRqstArray_1[MAX_MESSAGEBOXES_1];\r
-static uint8 TxRqstArray_1[MAX_MESSAGEBOXES_1];\r
-static uint32 FilterMaskRef_1[MESSAGEBOX_COUNT_1];\r
-#endif\r
+static uint8 TxRqstArray_1[DCAN1_MAX_MESSAGEBOXES];\r
+\r
+static Can_PduType PduInfoArray_2[DCAN2_MAX_MESSAGEBOXES];\r
+static uint8 CancelRqstArray_2[DCAN2_MAX_MESSAGEBOXES];\r
+static uint8 TxRqstArray_2[DCAN2_MAX_MESSAGEBOXES];\r
+\r
+static Can_PduType PduInfoArray_3[DCAN3_MAX_MESSAGEBOXES];\r
+static uint8 CancelRqstArray_3[DCAN3_MAX_MESSAGEBOXES];\r
+static uint8 TxRqstArray_3[DCAN3_MAX_MESSAGEBOXES];\r
+\r
 \r
 /* Holds the Controller specific configuration */ \r
 static Controller_PreConfigType ControllerConfig[] =\r
 {\r
-    {\r
-        BUSOFF_PROCESSING_0,\r
-        RX_PROCESSING_0,\r
-        TX_PROCESSING_0,\r
-        WAKEUP_PROCESSING_0,\r
-        MESSAGEBOX_COUNT_0,\r
-        MAX_MESSAGEBOXES_0,\r
-        FIRST_HANDLE_0,\r
-        WAKEUP_SRC_REF_0,\r
-        FilterMaskRef_0,\r
-        PduInfoArray_0,\r
-        CancelRqstArray_0,\r
-        TxRqstArray_0\r
+    { // DCAN1\r
+        .MaxBoxes = DCAN1_MAX_MESSAGEBOXES,\r
+        .WakeupSrc = 0,\r
+        .PduPtr = PduInfoArray_1,\r
+        .CancelPtr = CancelRqstArray_1,\r
+        .TxPtr = TxRqstArray_1\r
     },\r
-#ifdef CanController_1\r
-    {\r
-        BUSOFF_PROCESSING_1,\r
-        RX_PROCESSING_1,\r
-        TX_PROCESSING_1,\r
-        WAKEUP_PROCESSING_1,\r
-        MESSAGEBOX_COUNT_1,\r
-        MAX_MESSAGEBOXES_1,\r
-        FIRST_HANDLE_1,\r
-        WAKEUP_SRC_REF_1,\r
-        FilterMaskRef_1,\r
-        PduInfoArray_1,\r
-        CancelRqstArray_1,\r
-        TxRqstArray_1\r
-    }\r
-#endif\r
+    { // DCAN2\r
+        .MaxBoxes = DCAN2_MAX_MESSAGEBOXES,\r
+        .WakeupSrc = 1,\r
+        .PduPtr = PduInfoArray_2,\r
+        .CancelPtr = CancelRqstArray_2,\r
+        .TxPtr = TxRqstArray_2\r
+    },\r
+    { // DCAN3\r
+               .MaxBoxes = DCAN3_MAX_MESSAGEBOXES,\r
+               .WakeupSrc = 1,\r
+               .PduPtr = PduInfoArray_3,\r
+               .CancelPtr = CancelRqstArray_3,\r
+               .TxPtr = TxRqstArray_3\r
+       }\r
+\r
 };\r
 \r
 /* Shadow Buffer is used for buffering of received data */ \r
-static uint8 RxShadowBuf[8];\r
+static uint8 RxShadowBuf[CAN_ARC_CTRL_CONFIG_CNT][8];\r
 \r
 /* Driver must know how often Can_DisableControllerInterrupts() has been called */\r
-static uint32 IntDisableCount[CAN_CONTROLLER_COUNT];\r
+static uint32 IntDisableCount[CAN_ARC_CTRL_CONFIG_CNT];\r
+\r
+\r
+static inline const Can_HardwareObjectType * Can_FindTxHoh(Can_Arc_HTHType hth) {\r
+       for (int i = 0; i < CAN_ARC_CTRL_CONFIG_CNT; i++) {\r
+               const Can_HardwareObjectType * hoh = CanControllerConfigData[i].Can_Arc_Hoh;\r
+               hoh--;\r
+               do {\r
+                       hoh++;\r
+                       if (hoh->CanObjectType == CAN_OBJECT_TYPE_TRANSMIT && hoh->CanObjectId == hth) {\r
+                               return hoh;\r
+                       }\r
+               } while (!hoh->Can_Arc_EOL);\r
+       }\r
+       return 0;\r
+}\r
+\r
+static inline uint8 Can_FindControllerId(Can_Arc_HTHType hth) {\r
+       for (int i = 0; i < CAN_ARC_CTRL_CONFIG_CNT; i++) {\r
+               const Can_HardwareObjectType * hoh = CanControllerConfigData[i].Can_Arc_Hoh;\r
+               hoh--;\r
+               do {\r
+                       hoh++;\r
+                       if (hoh->CanObjectType == CAN_OBJECT_TYPE_TRANSMIT && hoh->CanObjectId == hth) {\r
+                               return i;\r
+                       }\r
+               } while (!hoh->Can_Arc_EOL);\r
+       }\r
+       return 0;\r
+}\r
+\r
+static inline const Can_HardwareObjectType * Can_FindRxHoh(CanControllerIdType Controller, uint8 msgNr) {\r
+       const Can_HardwareObjectType * hoh = CanControllerConfigData[Controller].Can_Arc_Hoh;\r
+       hoh--;\r
+       do {\r
+               hoh++;\r
+               if (hoh->CanObjectType == CAN_OBJECT_TYPE_RECEIVE\r
+                               && (hoh->Can_Arc_MbMask & (1 << (msgNr - 1))) ) {\r
+                       return hoh;\r
+               }\r
+       } while (!hoh->Can_Arc_EOL);\r
+       return 0;\r
+}\r
+\r
+#define DCAN_MC_NEWDAT 15\r
+#define DCAN_MC_EOB            7\r
+\r
+uint32 usedRxBoxes[64] = {0};\r
+uint32 usedTxBoxes[64] = {0};\r
+\r
+static inline Can_ReturnType handleRxMsgObject(uint8 MsgNr, const Can_HardwareObjectType *hoh, CanControllerIdType controller) {\r
+       uint32  MsgId;\r
+       uint8   MsgDlc;\r
+       uint8   DataByteIndex;\r
+       uint8  *SduPtr;\r
+\r
+       /* Wait until Busy Flag is 0 */\r
+       DCAN_WAIT_UNTIL_NOT_BUSY(controller, IfRegId);\r
 \r
+       // Read message control\r
+       uint32 mc = CanRegs[controller]->IFx[IfRegId].MC;\r
+       uint32 arb = CanRegs[controller]->IFx[IfRegId].ARB;\r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can1_InterruptHandler_0                                     */\r
-/* Description:   CAN Node 1 Level 0 Interrupt Service Routine                */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
+       // Is there a new message waiting?\r
+       if (!(mc & (1 << DCAN_MC_NEWDAT))) {\r
+               return CAN_NOT_OK; // Nothing more to be done.\r
+       }\r
 \r
-//#pragma INTERRUPT(CAN1_INTERRUPTHANDLER_0,IRQ)\r
+       // For debug\r
+       if (MsgNr == 0) {\r
+               usedRxBoxes[MsgNr]++;\r
+       } else {\r
+               usedRxBoxes[MsgNr]++;\r
+       }\r
+\r
+\r
+       /* Extended Id */\r
+       if(arb & 0x40000000) {\r
+               /* Bring Id to standardized format (MSB marks extended Id) */\r
+               MsgId = (arb & 0x1FFFFFFF) | 0x80000000;\r
+\r
+       } else { /* Standard Id */\r
+               /* Bring Id to standardized format (MSB marks extended Id) */\r
+               MsgId = (arb & 0x1FFC0000) >> 18;\r
+       }\r
+\r
+       /* DLC (Max 8) */\r
+       MsgDlc = mc & 0x000F;\r
+       if(MsgDlc > 8) {\r
+               MsgDlc = 8;\r
+       }\r
+\r
+       /* Let SduPtr point to Shadow Buffer */\r
+       SduPtr = RxShadowBuf[controller];\r
+\r
+       /* Copy Message Data to Shadow Buffer */\r
+       for(DataByteIndex = 0; DataByteIndex < MsgDlc; DataByteIndex++)\r
+       {\r
+               SduPtr[DataByteIndex] = CanRegs[controller]->IFx[IfRegId].DATx[ElementIndex[DataByteIndex]];\r
+       }\r
+\r
+       /* Indicate successful Reception */\r
+       CanIf_RxIndication(hoh->CanObjectId, MsgId, MsgDlc, SduPtr);\r
+\r
+       // Is this the last message object of the FIFO?\r
+       if (mc & (1 << DCAN_MC_EOB)) {\r
+               return CAN_NOT_OK;\r
+       }\r
+\r
+       return CAN_OK;\r
+}\r
 \r
-void CAN1_INTERRUPTHANDLER_0()\r
+\r
+void Can_InterruptHandler(CanControllerIdType controller)\r
 {\r
-    uint32  ErrCounter;\r
     uint32  MsgNr;\r
-    uint32  MsgId;\r
-    uint8   MsgDlc;\r
-    uint8   DataByteIndex;\r
-    uint8  *SduPtr;\r
 \r
-    //Can_DisableControllerInterrupts(0);\r
+    uint32 ir = CanRegs[controller]->IR;\r
 \r
-    ErrCounter = CAN_TIMEOUT_DURATION;\r
 \r
-    uint32 ir = CanBase[0]->IR;\r
+    if(ir == 0x8000) { // This is an error interrupt\r
 \r
-    if(ir == 0x8000)\r
-    {\r
-       uint32 sr = CanBase[0]->SR;\r
-        /* WakeUp Pending */\r
-        if(sr & 0x00000200) {\r
+       uint32 sr = CanRegs[controller]->SR;\r
+\r
+        if(sr & 0x00000200) { /* WakeUp Pending */\r
             /* Set Init Bit, so that Controller is in Stop state */\r
-            CanBase[0]->CTL |= 0x1;\r
+            CanRegs[controller]->CTL |= 0x1;\r
            // EcuM_CheckWakeUp(ControllerConfig[0].WakeupSrc);\r
 \r
         }\r
-        /* Bus Off */\r
-        if(sr & 0x00000080) {\r
-               Can_SetControllerMode(0, CAN_T_STOP); // CANIF272\r
+\r
+        if(sr & 0x00000080) { /* Bus Off */\r
+               Can_SetControllerMode(controller, CAN_T_STOP); // CANIF272\r
             //CanIf_ControllerBusOff(0); // Not implemented in Arctic Core\r
 \r
         }\r
-    }\r
-    else\r
-    {\r
+\r
+    } else if (ir > 0 && ir < 0x8000){ // This interrupt is from a message object.\r
         MsgNr = ir;\r
 \r
-        /* Read Arbitration, Control and Data Bits and clear IntPnd and NewDat*/\r
-        CanBase[0]->IFx[IfRegId].COM = 0x003F0000 | MsgNr;\r
+        /* Read Arbitration and control */\r
+               CanRegs[controller]->IFx[IfRegId].COM = 0x003F0000 | MsgNr;\r
 \r
-        /* Wait until Busy Flag is 0 */\r
-        while(CanBase[0]->IFx[IfRegId].COM & 0x8000)\r
-        {\r
-            ErrCounter--;\r
-            if(ErrCounter == 0)\r
-            {\r
-                Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                return;\r
-            }\r
-        }\r
+               /* Wait until Busy Flag is 0 */\r
+               DCAN_WAIT_UNTIL_NOT_BUSY_NO_RV(controller, IfRegId);\r
 \r
         /* Transmit Object */\r
-        if(CanBase[0]->IFx[IfRegId].ARB & 0x20000000)\r
+        if(CanRegs[controller]->IFx[IfRegId].ARB & 0x20000000)\r
         {\r
+               // For debug\r
+               if (MsgNr == 0) {\r
+                       usedTxBoxes[MsgNr]++;\r
+               } else {\r
+                       usedTxBoxes[MsgNr]++;\r
+               }\r
+\r
             /* Reset TxRqst-Array Element */\r
-            TxRqstArray_0[MsgNr - 1] = 0;\r
+               ControllerConfig[controller].TxPtr[MsgNr - 1] = 0;\r
             /* A Message was successfully transmitted */\r
-            CanIf_TxConfirmation(PduInfoArray_0[MsgNr - 1].swPduHandle);\r
-        }\r
+            CanIf_TxConfirmation(ControllerConfig[controller].PduPtr[MsgNr - 1].swPduHandle);\r
+\r
         /* Receive Object */\r
-        else\r
-        {\r
-            /* Extended Id */\r
-            if(CanBase[0]->IFx[IfRegId].ARB & 0x40000000)\r
-            {\r
-                /* Bring Id to standardized format (MSB marks extended Id) */\r
-                MsgId = (CanBase[0]->IFx[IfRegId].ARB & 0x1FFFFFFF) | 0x80000000;\r
-            }\r
-            /* Standard Id */\r
-            else\r
-            {\r
-                /* Bring Id to standardized format (MSB marks extended Id) */\r
-                MsgId = (CanBase[0]->IFx[IfRegId].ARB & 0x1FFC0000) >> 18;\r
-            }\r
-            /* DLC (Max 8) */\r
-            MsgDlc = CanBase[0]->IFx[IfRegId].MC & 0x000F;\r
-            if(MsgDlc > 8)\r
-            {\r
-                MsgDlc = 8;\r
-            }\r
-            /* Let SduPtr point to Shadow Buffer */\r
-            SduPtr = RxShadowBuf;\r
+        } else {\r
+\r
+               // Handle all of the message objects in this FIFO buffer.\r
+               const Can_HardwareObjectType *hoh = Can_FindRxHoh(controller, MsgNr);\r
+               for(; MsgNr < ControllerConfig[controller].MaxBoxes; MsgNr++) {\r
+                       if (!(hoh->Can_Arc_MbMask & (1 << (MsgNr - 1)))) {\r
+                               continue;\r
+                       }\r
+\r
+                       /* Read setup hardware to read arbitration, control and data Bits of the message object.\r
+                        * Clear IntPnd and Tx */\r
+                       if (MsgNr != ir) { // Don't do this the first time.\r
+                               CanRegs[controller]->IFx[IfRegId].COM = 0x003F0000 | MsgNr;\r
+                       }\r
+\r
+                       if (handleRxMsgObject(MsgNr, hoh, controller) == CAN_NOT_OK) {\r
+                               break; // We have parsed the last object of this FIFO.\r
+                       }\r
+                       }\r
 \r
-            /* Copy Message Data to Shadow Buffer */\r
-            for(DataByteIndex = 0; DataByteIndex < MsgDlc; DataByteIndex++)\r
-            {\r
-                RxShadowBuf[DataByteIndex] = CanBase[0]->IFx[IfRegId].DATx[ElementIndex[DataByteIndex]];\r
-            }\r
-            /* Indicate successful Reception */\r
-            CanIf_RxIndication(CurConfig->MessageBoxPtr[MsgNr - 1].ObjectId, MsgId, MsgDlc, SduPtr);\r
         }\r
     }\r
-    //Can_EnableControllerInterrupts(0);\r
 }\r
 \r
+void Can1_InterruptHandler() {\r
+       Can_InterruptHandler(DCAN1);\r
+}\r
+\r
+void Can2_InterruptHandler() {\r
+       Can_InterruptHandler(DCAN2);\r
+}\r
+\r
+void Can3_InterruptHandler() {\r
+       Can_InterruptHandler(DCAN3);\r
+}\r
+\r
+uint32 Can_CalculateBTR(uint8 Controller) {\r
+\r
+       uint32 clock = McuE_GetPeripheralClock(PERIPHERAL_CLOCK_CAN);\r
+       uint32 tq1 = CanControllerConfigData[Controller].CanControllerPropSeg + CanControllerConfigData[Controller].CanControllerSeg1;\r
+       uint32 tq2 = CanControllerConfigData[Controller].CanControllerSeg2;\r
+       uint32 ntq = tq1 + tq2 + 1 + 1 + 1;\r
+       uint32 brp = clock / (CanControllerConfigData[Controller].CanControllerBaudRate * 1000 * ntq) - 1;\r
+\r
+       uint32 retVal = (brp | (tq1 << 8) | (tq2 << 12));\r
+       return retVal;\r
+}\r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_Init                                                    */\r
-/* Service Id:    0x00                                                        */\r
-/* Execution:     Synchronous                                                 */\r
-/* Re-entrant:    No                                                          */\r
-/* Description:   Initialize Can Driver                                       */\r
-/* ConfigPtr:     Pointer to initialization data                              */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:                                                                   */\r
-/*                                                                            */\r
-void CAN_INIT(const Can_ConfigType *Config)\r
+void Can_Init(const Can_ConfigType *Config)\r
 {\r
     uint32                    Controller;\r
     uint8                     MsgNr;\r
     uint32                    ErrCounter;\r
-    Can_ControllerConfigType *CurControllerPtr;\r
-    Can_MessageObjectType    *MsgBoxPtr;\r
-    uint32                   *CurFilterMaskPtr;\r
     uint32                    Eob;\r
+    imask_t state;\r
 \r
 /* DET Error Check */\r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
@@ -277,161 +392,171 @@ void CAN_INIT(const Can_ConfigType *Config)
         return;\r
     }\r
 #endif \r
-     \r
+\r
+    Irq_Save(state);\r
+\r
+    // TODO This should be used instead of other variables in the Can_Lcfg file.\r
     CurConfig        = Config;\r
-    /* Set Pointer to ControllerConfig */\r
-    CurControllerPtr = Config->ControllerConfigPtr;    \r
-    /* Set Pointer to MessageObjects */\r
-    MsgBoxPtr        = CurConfig->MessageBoxPtr;\r
 \r
-    for(Controller = 0; Controller < CAN_CONTROLLER_COUNT; Controller++)\r
+    for(Controller = 0; Controller < CAN_ARC_CTRL_CONFIG_CNT; Controller++)\r
     {\r
         ErrCounter = CAN_TIMEOUT_DURATION;\r
 \r
-        /* Init, IE, AutomaticRetransmission, ConfChangeEnable, ABO Off,Parity On, SIE and EIE depending on ControllerConfig */\r
+        /* Init, IE, AutomaticRetransmission, ConfChangeEnable, ABO Off,Parity On, SIE and EIE depending on ControllerConfig, loopback */\r
 #if(CAN_WAKEUP_SUPPORT == STD_ON)\r
-        CanBase[Controller]->CTL = 0x02001643 | (ControllerConfig[Controller].WakeupProc >> 8) | (ControllerConfig[Controller].BusOff >> 7);\r
+        CanRegs[Controller]->CTL = 0x02001641 | DCAN_IRQ_MASK | (CanControllerConfigData[Controller].Can_Arc_Loopback << 7);// | (CanControllerConfigData[Controller].CanWakeupProcessing >> 8) | (CanControllerConfigData[Controller].CanBusOffProcessing >> 7);\r
 #else\r
-        CanBase[Controller]->CTL = 0x00001643 | (ControllerConfig[Controller].WakeupProc >> 8) | (ControllerConfig[Controller].BusOff >> 7);\r
+        CanRegs[Controller]->CTL = 0x00001641 | DCAN_IRQ_MASK | (CanControllerConfigData[Controller].Can_Arc_Loopback << 7);// | (CanControllerConfigData[Controller].CanWakeupProcessing >> 8) | (CanControllerConfigData[Controller].CanBusOffProcessing >> 7);\r
 #endif        \r
         /* LEC 7, TxOk, RxOk, PER */\r
-        CanBase[Controller]->SR  = 0x0000011F;\r
+        CanRegs[Controller]->SR  = 0x0000011F;\r
 \r
         /* Test Mode only for Development time: Silent Loopback */\r
-        //CanBase[Controller]->CTL |= 0x00000080;\r
-        //CanBase[Controller]->TR   = 0x00000018;\r
+        if (CanControllerConfigData[Controller].Can_Arc_Loopback) {\r
+               CanRegs[Controller]->TR   = 0x00000018;\r
+        }\r
             \r
-        for(MsgNr = 0; MsgNr < ControllerConfig[Controller].MaxBoxes; MsgNr++)\r
-        {\r
+\r
+        // Basic message object initialization\r
+        for(MsgNr = 0; MsgNr < ControllerConfig[Controller].MaxBoxes; MsgNr++) {\r
             /* Initialize the Arrays for Transmit and Cancellation handling */\r
             *(ControllerConfig[Controller].CancelPtr + MsgNr) = 0;\r
             *(ControllerConfig[Controller].TxPtr     + MsgNr) = 0;\r
             \r
-            /* Set the current FilterMaskPointer */\r
-            CurFilterMaskPtr = CurControllerPtr->FilterMaskPtr;\r
-            /* Wait until Busy Flag is 0 */\r
-            while(CanBase[Controller]->IFx[IfRegId].COM & 0x00008000)\r
-            {\r
-                ErrCounter--;\r
-                if(ErrCounter == 0)\r
-                {\r
-                    Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                    ErrCounter = CAN_TIMEOUT_DURATION;\r
-                    return;\r
-                }\r
-            }\r
-            /* Configure the post-build defined MessageObjects */\r
-            if(MsgNr < ControllerConfig[Controller].MessageBoxCount)\r
-            {   \r
-                /* Check, if the next message object has the same values as the current, and if it is the last one */             \r
-                if((MsgNr     < (ControllerConfig[Controller].MessageBoxCount - 1)) &&\r
-                   (MsgBoxPtr->Direction       == CAN_RECEIVE                     ) &&\r
-                   (MsgBoxPtr->Direction       == (MsgBoxPtr + 1)->Direction      ) &&\r
-                   (MsgBoxPtr->IdType          == (MsgBoxPtr + 1)->IdType         ) &&\r
-                   (MsgBoxPtr->IdValue         == (MsgBoxPtr + 1)->IdValue        ) &&\r
-                   (MsgBoxPtr->FilterMaskIndex == (MsgBoxPtr + 1)->FilterMaskIndex) &&\r
-                   (MsgBoxPtr->HandleType      == (MsgBoxPtr + 1)->HandleType     )\r
-                  )\r
-                {\r
-                    /* EndOfBlock Bit will not be set */\r
-                    Eob = 0x00000000;\r
-                }\r
-                else\r
-                {\r
-                    /* EndOfBlock Bit will be set */\r
-                    Eob = 0x00000080;\r
-                }\r
-                /* DLC=8, Use Mask only for receive, Set RxIE/TxIE depending on pre-config settings, Eob */\r
-                CanBase[Controller]->IFx[IfRegId].MC   = 0x00001008 | ControllerConfig[Controller].RxProc | (ControllerConfig[Controller].TxProc << 1) | Eob & ~(MsgBoxPtr->Direction >> 17);\r
-                \r
-                if(MsgBoxPtr->IdType == CAN_STANDARD)      /* Standard Identifiers */\r
-                {\r
-                    /* Only Standard-Ids are accepted, Set Mask */\r
-                    CanBase[Controller]->IFx[IfRegId].MASK = 0x80000000 | ((*(CurFilterMaskPtr + MsgBoxPtr->FilterMaskIndex)) & 0x1FFFFFFF);\r
-                    /* Message valid, Id, Direction */\r
-                    CanBase[Controller]->IFx[IfRegId].ARB  = 0x80000000 | ((MsgBoxPtr->IdValue & 0x7FF) << 18) | MsgBoxPtr->Direction;\r
-                }\r
-                else if(MsgBoxPtr->IdType == CAN_EXTENDED) /* Extended Identifiers */\r
-                {\r
-                    /* Only Extended-Ids are accepted, Set Mask */\r
-                    CanBase[Controller]->IFx[IfRegId].MASK = 0x80000000 | ((*(CurFilterMaskPtr + MsgBoxPtr->FilterMaskIndex)) & 0x1FFFFFFF);\r
-                    /* Message valid, Id, Direction */\r
-                    CanBase[Controller]->IFx[IfRegId].ARB  = 0xC0000000 | (MsgBoxPtr->IdValue & 0x1FFFFFFF) | MsgBoxPtr->Direction;    \r
-                }\r
-                else /* Mixed Identifiers */\r
-                {\r
-                    /* Standard- and Mixed-Ids are accepted, Set Mask */\r
-                    CanBase[Controller]->IFx[IfRegId].MASK = 0x00000000 | ((*(CurFilterMaskPtr + MsgBoxPtr->FilterMaskIndex)) & 0x1FFFFFF);\r
-                    /* Message valid, Id, Direction */\r
-                    CanBase[Controller]->IFx[IfRegId].ARB  = 0xC0000000 | (MsgBoxPtr->IdValue & 0x1FFFFFF) | MsgBoxPtr->Direction;\r
-                }\r
-                /* Start writing Mask, Arb, Control and Id bits */\r
-                CanBase[Controller]->IFx[IfRegId].COM  = 0x00F80000 | (MsgNr + 1);\r
-                \r
-                /* Save FilterMask reference of actual MessageObject */\r
-                *(ControllerConfig[Controller].MaskRefPtr + MsgNr) = MsgBoxPtr->FilterMaskIndex;\r
-\r
-                /* Increment Pointer to next MessageObject */\r
-                MsgBoxPtr++;\r
-            }\r
-            else /* Configure all other MessageObjects to not valid */\r
-            {\r
-                /* Valid = 0 */\r
-                CanBase[Controller]->IFx[IfRegId].ARB = 0x00000000;\r
-                /* Start writing Arbitration Bits */\r
-                CanBase[Controller]->IFx[IfRegId].COM = 0x00A80000 | (MsgNr + 1);\r
-            }\r
-            /* Use IFx[0] and IFx[1] alternating */\r
-            IfRegId ^= 1;\r
+            DCAN_WAIT_UNTIL_NOT_BUSY_NO_RV(Controller, IfRegId);\r
+\r
+            // Initialize all message objects for this controller to invalid state.\r
+            /* Valid = 0 */\r
+                       CanRegs[Controller]->IFx[IfRegId].ARB = 0x00000000;\r
+                       /* Start writing Arbitration Bits */\r
+                       CanRegs[Controller]->IFx[IfRegId].COM = 0x00A80000 | (MsgNr + 1);\r
+\r
+                       /* Use IFx[0] and IFx[1] alternating */\r
+                       IfRegId ^= 1;\r
+\r
         }\r
+\r
+               /* Configure the HOHs for this controller. */\r
+               const Can_HardwareObjectType* hoh;\r
+               hoh = CanControllerConfigData[Controller].Can_Arc_Hoh;\r
+               hoh--;\r
+               do {\r
+                       hoh++;\r
+                       uint64 mbMask = hoh->Can_Arc_MbMask;\r
+                       uint32 mbNr = 0;\r
+                       uint32 nProcessedMb = 0;\r
+\r
+                       // For every message object in this hoh\r
+                       for(; mbMask != 0; mbMask >>= 1) {\r
+                               mbNr++;\r
+                               if (!(mbMask & 1)) {\r
+                                       // This message object is not part of this hoh.\r
+                                       continue;\r
+                               }\r
+                               nProcessedMb++;\r
+\r
+                               // Check if this is the last message box for this hoh.\r
+                               if((mbMask != 1) &&\r
+                                  (hoh->CanObjectType == CAN_OBJECT_TYPE_RECEIVE)) {\r
+                                       /* EndOfBlock Bit will not be set */\r
+                                       Eob = 0x00000000;\r
+                               }\r
+                               else\r
+                               {\r
+                                       /* EndOfBlock Bit will be set */\r
+                                       Eob = 0x00000080;\r
+                               }\r
+\r
+                               /* DLC=8, Use Mask only for receive, Set RxIE/TxIE depending on pre-config settings, Eob */\r
+                               CanRegs[Controller]->IFx[IfRegId].MC =    0x00000008 // DLC = 8\r
+                                                                                                               | 0x00001000 // umask = ON\r
+                                                                                                               | CanControllerConfigData[Controller].CanRxProcessing // Rx interrupt enabled\r
+                                                                                                               | (CanControllerConfigData[Controller].CanTxProcessing << 1) // Tx confirmation interrupt enabled\r
+                                                                                                               | (Eob & ~(hoh->CanObjectType >> 22)); // Eob, only for Rx.\r
+\r
+                               //CanRegs[Controller]->IFx[IfRegId].MC = 0x00001008 | CanControllerConfigData[Controller].CanRxProcessing | (CanControllerConfigData[Controller].CanTxProcessing) | Eob & ~(hoh->CanObjectType >> 17);\r
+\r
+                               if(hoh->CanIdType == CAN_ID_TYPE_STANDARD)      /* Standard Identifiers */\r
+                               {\r
+                                       /* Only Standard-Ids are accepted, Set Mask */\r
+                                       CanRegs[Controller]->IFx[IfRegId].MASK = 0x80000000 | ((*(hoh->CanFilterMaskRef)) & 0x1FFFFFFF);\r
+                                       /* Message valid, Id, Direction */\r
+                                       CanRegs[Controller]->IFx[IfRegId].ARB  = 0x80000000 | ((hoh->CanIdValue & 0x7FF) << 18) | hoh->CanObjectType;\r
+                               }\r
+                               else if(hoh->CanIdType == CAN_ID_TYPE_EXTENDED) /* Extended Identifiers */\r
+                               {\r
+                                       /* Only Extended-Ids are accepted, Set Mask */\r
+                                       CanRegs[Controller]->IFx[IfRegId].MASK = 0x80000000 | ((*(hoh->CanFilterMaskRef)) & 0x1FFFFFFF);\r
+                                       /* Message valid, Id, Direction */\r
+                                       CanRegs[Controller]->IFx[IfRegId].ARB  = 0xC0000000 | (hoh->CanIdValue & 0x1FFFFFFF) | hoh->CanObjectType;\r
+                               }\r
+                               else /* Mixed Identifiers */\r
+                               {\r
+                                       /* Standard- and Mixed-Ids are accepted, Set Mask */\r
+                                       CanRegs[Controller]->IFx[IfRegId].MASK = 0x00000000 | ((*(hoh->CanFilterMaskRef)) & 0x1FFFFFF);\r
+                                       /* Message valid, Id, Direction */\r
+                                       CanRegs[Controller]->IFx[IfRegId].ARB  = 0xC0000000 | (hoh->CanIdValue & 0x1FFFFFF) | hoh->CanObjectType;\r
+                               }\r
+                               /* Start writing Mask, Arb, Control and Id bits */\r
+                               CanRegs[Controller]->IFx[IfRegId].COM  = 0x00F80000 | mbNr;\r
+\r
+                               /* Use IFx[0] and IFx[1] alternating */\r
+                               IfRegId ^= 1;\r
+\r
+                       }\r
+               } while (!hoh->Can_Arc_EOL);\r
+\r
+\r
         /* Set Bit Timing Register */\r
-        CanBase[Controller]->BTR  = CurControllerPtr->CanTimeRegister;\r
-        /* Reset CCE Bit */\r
-        CanBase[Controller]->CTL &= ~0x00000040;\r
+        CanRegs[Controller]->BTR = Can_CalculateBTR(Controller);\r
 \r
-        /* Switch Controller pointer to next ConfigSet */\r
-        CurControllerPtr++;\r
+        /* Reset CCE Bit */\r
+        CanRegs[Controller]->CTL &= ~0x00000040;\r
 \r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
         /* Switch Controller State to CANIF_CS_STOPPED */\r
         ControllerMode[Controller] = CANIF_CS_STOPPED;\r
 #endif\r
+\r
+        // Install interrupt handlers\r
+               if (CanControllerConfigData[Controller].CanControllerId == DCAN1) {\r
+                       ISR_INSTALL_ISR2("DCAN1Level0",Can1_InterruptHandler,CAN1_LEVEL_0,2,0);\r
+                       ISR_INSTALL_ISR2("DCAN1Level1",Can1_InterruptHandler,CAN1_LEVEL_1,2,0);\r
+\r
+               } else if (CanControllerConfigData[Controller].CanControllerId == DCAN2) {\r
+                       ISR_INSTALL_ISR2("DCAN2Level0",Can2_InterruptHandler,CAN2_LEVEL_0,2,0);\r
+                       ISR_INSTALL_ISR2("DCAN2Level1",Can2_InterruptHandler,CAN2_LEVEL_1,2,0);\r
+\r
+               } else if (CanControllerConfigData[Controller].CanControllerId == DCAN3) {\r
+                       ISR_INSTALL_ISR2("DCAN3Level0",Can3_InterruptHandler,CAN3_LEVEL_0,2,0);\r
+                       ISR_INSTALL_ISR2("DCAN3Level1",Can3_InterruptHandler,CAN3_LEVEL_1,2,0);\r
+\r
+               }\r
+\r
     }\r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
     /* Switch Module State to CAN_READY */\r
     ModuleState = CAN_READY;\r
 #endif\r
 \r
+    Irq_Restore(state);\r
 \r
-    // ARC INSTALL HANDLERS\r
-    TaskType tid;\r
-    tid = Os_Arc_CreateIsr(CAN1_INTERRUPTHANDLER_0, 2 ,"Can0Level0");\r
-    Irq_AttachIsr2(tid, NULL, 16);\r
+}\r
 \r
-    tid = Os_Arc_CreateIsr(CAN1_INTERRUPTHANDLER_0, 2, "Can0Level1");\r
-    Irq_AttachIsr2(tid, NULL, 29);\r
+// Unitialize the module\r
+void Can_DeInit()\r
+{\r
 \r
+  return;\r
 }\r
 \r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_InitController                                          */\r
-/* Service Id:    0x02                                                        */\r
-/* Execution:     Synchronous                                                 */\r
-/* Re-entrant:    No                                                          */\r
-/* Description:   Initializes only CAN cantroller specific settings           */\r
-/* Controller:    CAN controller to be initialized                            */\r
-/* Config:        Pointer to controller configuration                         */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
-void CAN_INITCONTROLLER(uint8 Controller, const Can_ControllerConfigType* Config)\r
+void Can_InitController(uint8 Controller, const Can_ControllerConfigType* Config)\r
 {\r
-    uint32 *CurMaskRef;\r
     uint8   MsgNr;\r
     uint32  ErrCounter;\r
+    imask_t state;\r
 \r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
     if(Config == NULL)\r
@@ -444,7 +569,7 @@ void CAN_INITCONTROLLER(uint8 Controller, const Can_ControllerConfigType* Config
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 2, CAN_E_UNINIT);\r
         return;\r
     }\r
-    if(Controller >= CAN_CONTROLLER_COUNT)\r
+    if(Controller >= CAN_ARC_CTRL_CONFIG_CNT)\r
     {\r
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 2, CAN_E_PARAM_CONTROLLER);\r
         return;\r
@@ -456,80 +581,55 @@ void CAN_INITCONTROLLER(uint8 Controller, const Can_ControllerConfigType* Config
     }\r
 #endif \r
 \r
-    CurMaskRef = ControllerConfig[Controller].MaskRefPtr;\r
+    Irq_Save(state);\r
+\r
     ErrCounter = CAN_TIMEOUT_DURATION;\r
     \r
-    for(MsgNr = 0; MsgNr < ControllerConfig[Controller].MessageBoxCount; MsgNr++)\r
-    {\r
-        /* Wait until Busy Flag is 0 */\r
-        while(CanBase[Controller]->IFx[IfRegId].COM & 0x00008000)\r
-        {\r
-            ErrCounter--;\r
-            if(ErrCounter == 0)\r
-            {\r
-                Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                return;\r
-            }\r
-        }\r
-        /* Read actual MaskRegister value of MessageObject */\r
-        CanBase[Controller]->IFx[IfRegId].COM = 0x004C0000 | (MsgNr + 1);\r
-\r
-        /* Wait until Busy Flag is 0 */\r
-        while(CanBase[Controller]->IFx[IfRegId].COM & 0x00008000)\r
-        {\r
-            ErrCounter--;\r
-            if(ErrCounter == 0)\r
-            {\r
-                Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                return;\r
-            }\r
-        }\r
-        CanBase[Controller]->IFx[IfRegId].MASK &= 0xD0000000;\r
+    //for(MsgNr = 0; MsgNr < ControllerConfig[Controller].MessageBoxCount; MsgNr++)\r
+       const Can_HardwareObjectType* hoh;\r
+       hoh = CanControllerConfigData[Controller].Can_Arc_Hoh;\r
+       uint64 mbMask = hoh->Can_Arc_MbMask;\r
+       uint32 nProcessedMb = 0;\r
+       MsgNr = 0;\r
+\r
+       // For every message object in this hoh\r
+       for(; mbMask != 0; mbMask >>= 1) {\r
+               MsgNr++;\r
+               if (!(mbMask & 1)) {\r
+                       // This message object is not part of this hoh.\r
+                       continue;\r
+               }\r
+               nProcessedMb++;\r
+\r
+               DCAN_WAIT_UNTIL_NOT_BUSY_NO_RV(Controller, IfRegId);\r
+\r
+               /* Read actual MaskRegister value of MessageObject */\r
+        CanRegs[Controller]->IFx[IfRegId].COM = 0x004C0000 | (MsgNr);\r
+\r
+        DCAN_WAIT_UNTIL_NOT_BUSY_NO_RV(Controller, IfRegId);\r
+\r
+        CanRegs[Controller]->IFx[IfRegId].MASK &= 0xD0000000;\r
         /* Set new Mask */\r
-        CanBase[Controller]->IFx[IfRegId].MASK |= *(Config->FilterMaskPtr + *CurMaskRef) & 0x1FFFFFFF;\r
+        CanRegs[Controller]->IFx[IfRegId].MASK |= (*(hoh->CanFilterMaskRef)) & 0x1FFFFFFF;\r
         /* Write new Mask to MaskRegister */\r
-        CanBase[Controller]->IFx[IfRegId].COM   = 0x00C80000 | (MsgNr + 1);       \r
-        \r
-        CurMaskRef++;\r
+        CanRegs[Controller]->IFx[IfRegId].COM   = 0x00C80000 | (MsgNr);\r
 \r
         IfRegId ^= 1;\r
     }\r
-    /* Wait until Busy Flag is 0 */\r
-    while(CanBase[Controller]->IFx[IfRegId].COM & 0x00008000)\r
-    {\r
-        ErrCounter--;\r
-        if(ErrCounter == 0)\r
-        {\r
-            Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-            ErrCounter = CAN_TIMEOUT_DURATION;\r
-            return;\r
-        }\r
-    }   \r
+\r
+       DCAN_WAIT_UNTIL_NOT_BUSY_NO_RV(Controller, IfRegId);\r
+\r
     /* Set CCE Bit to allow access to BitTiming Register (Init already set, in mode "stopped") */\r
-    CanBase[Controller]->CTL |= 0x00000040;\r
+    CanRegs[Controller]->CTL |= 0x00000040;\r
     /* Set Bit Timing Register */\r
-    CanBase[Controller]->BTR  = Config->CanTimeRegister;\r
+    CanRegs[Controller]->BTR = Can_CalculateBTR(Controller);\r
     /* Clear CCE Bit */\r
-    CanBase[Controller]->CTL &= ~0x00000040;\r
+    CanRegs[Controller]->CTL &= ~0x00000040;\r
 \r
+    Irq_Restore(state);\r
 }\r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_SetControllerMode                                       */\r
-/* Service Id:    0x03                                                        */\r
-/* Execution:     Asynchronous                                                */\r
-/* Re-entrant:    No                                                          */\r
-/* Descrpition:   Performs software triggered state transitions               */\r
-/* Controller:    CAN controller for which the status shall be changed        */\r
-/* Transition:    Transition to be done                                        */\r
-/* Return Value:  - CAN_OK: transition initiated                              */\r
-/*                - CAN_NOT_OK: error or wakeup during transition to 'sleep'  */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
 Can_ReturnType Can_SetControllerMode(uint8 Controller, Can_StateTransitionType Transition)\r
 {\r
     Can_ReturnType Status     = CAN_OK;\r
@@ -542,7 +642,7 @@ Can_ReturnType Can_SetControllerMode(uint8 Controller, Can_StateTransitionType T
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 3, CAN_E_UNINIT);\r
         return CAN_NOT_OK;\r
     }\r
-    if(Controller >= CAN_CONTROLLER_COUNT)\r
+    if(Controller >= CAN_ARC_CTRL_CONFIG_CNT)\r
     {\r
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 3, CAN_E_PARAM_CONTROLLER);\r
         return CAN_NOT_OK;\r
@@ -561,9 +661,9 @@ Can_ReturnType Can_SetControllerMode(uint8 Controller, Can_StateTransitionType T
     {\r
     case CAN_T_START:\r
         /* Clear Init Bit */\r
-        CanBase[Controller]->CTL  &= ~0x00000001;\r
+        CanRegs[Controller]->CTL  &= ~0x00000001;\r
         /* Clear Status Register */\r
-        CanBase[Controller]->SR    = 0x0000011F;\r
+        CanRegs[Controller]->SR    = 0x0000011F;\r
 \r
         ControllerMode[Controller] = CANIF_CS_STARTED;\r
         Can_EnableControllerInterrupts(Controller);\r
@@ -571,23 +671,23 @@ Can_ReturnType Can_SetControllerMode(uint8 Controller, Can_StateTransitionType T
 \r
     case CAN_T_STOP:\r
         /* Set Init Bit */\r
-        CanBase[Controller]->CTL  |=  0x00000001;\r
+        CanRegs[Controller]->CTL  |=  0x00000001;\r
         ControllerMode[Controller] = CANIF_CS_STOPPED;\r
         Can_DisableControllerInterrupts(Controller);\r
         break;\r
 \r
     case CAN_T_SLEEP:\r
         /* Set PDR  Bit */\r
-        CanBase[Controller]->CTL |=  0x01000000;\r
+        CanRegs[Controller]->CTL |=  0x01000000;\r
         /* Save actual Register status */\r
-        RegBuf = CanBase[Controller]->CTL;\r
+        RegBuf = CanRegs[Controller]->CTL;\r
         /* Disable Status Interrupts and WUBA */\r
-        CanBase[Controller]->CTL &= ~0x02000004;\r
+        CanRegs[Controller]->CTL &= ~0x02000004;\r
         /* Wait until Local Power Down Mode acknowledged */\r
-        while(!(CanBase[Controller]->SR & 0x00000400))\r
+        while(!(CanRegs[Controller]->SR & 0x00000400))\r
         {\r
             /* Check if a WakeUp occurs */\r
-            if(CanBase[Controller]->SR & 0x00000200)\r
+            if(CanRegs[Controller]->SR & 0x00000200)\r
             {\r
                 Status = CAN_NOT_OK;\r
                 break;\r
@@ -602,13 +702,13 @@ Can_ReturnType Can_SetControllerMode(uint8 Controller, Can_StateTransitionType T
             }\r
         }\r
         /* Reset Control Register */\r
-        CanBase[Controller]->CTL   = RegBuf;\r
+        CanRegs[Controller]->CTL   = RegBuf;\r
         ControllerMode[Controller] = CANIF_CS_SLEEP;\r
         break;\r
 \r
     case CAN_T_WAKEUP:\r
         /* Clear PDR Bit */\r
-        CanBase[Controller]->CTL  &= ~0x01000000;\r
+        CanRegs[Controller]->CTL  &= ~0x01000000;\r
         ControllerMode[Controller] = CANIF_CS_STOPPED;\r
         break;\r
 \r
@@ -625,17 +725,6 @@ Can_ReturnType Can_SetControllerMode(uint8 Controller, Can_StateTransitionType T
 }\r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_DisableControllerInterrupts                             */\r
-/* Service Id:    0x04                                                        */\r
-/* Execution:     Synchronous                                                 */\r
-/* Re-entrant:    Yes                                                         */\r
-/* Description:   Disables all interrupts for this controller                 */\r
-/* Controller:    CAN controller for which interrupts shall be disabled       */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
 void Can_DisableControllerInterrupts(uint8 Controller)\r
 {\r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
@@ -644,30 +733,18 @@ void Can_DisableControllerInterrupts(uint8 Controller)
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 4, CAN_E_UNINIT);\r
         return;\r
     }\r
-    if(Controller >= CAN_CONTROLLER_COUNT)\r
+    if(Controller >= CAN_ARC_CTRL_CONFIG_CNT)\r
     {\r
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 4, CAN_E_PARAM_CONTROLLER);\r
         return;\r
     }\r
 #endif \r
     /* Clear IE */\r
-    CanBase[Controller]->CTL &= ~0x00000002;\r
+    CanRegs[Controller]->CTL &= ~DCAN_IRQ_MASK;\r
     /* Increment Disable Counter */\r
     IntDisableCount[Controller]++;\r
 }\r
 \r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_EnableControllerInterrupts                              */\r
-/* Service Id:    0x05                                                        */\r
-/* Execution:     Synchronous                                                 */\r
-/* Re-entrant:    Yes                                                         */\r
-/* Description:   Enables all allowed interrupts for this controller          */\r
-/* Controller:    CAN controller for which interrupts shall be re-enabled     */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
 void Can_EnableControllerInterrupts(uint8 Controller)\r
 {\r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
@@ -676,7 +753,7 @@ void Can_EnableControllerInterrupts(uint8 Controller)
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 5, CAN_E_UNINIT);\r
         return;\r
     }\r
-    if(Controller >= CAN_CONTROLLER_COUNT)\r
+    if(Controller >= CAN_ARC_CTRL_CONFIG_CNT)\r
     {\r
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 5, CAN_E_PARAM_CONTROLLER);\r
         return;\r
@@ -687,37 +764,25 @@ void Can_EnableControllerInterrupts(uint8 Controller)
         if(IntDisableCount[Controller] == 1)\r
         {\r
             /* Set IE */\r
-            CanBase[Controller]->CTL |= 0x00000002;\r
+            CanRegs[Controller]->CTL |= DCAN_IRQ_MASK;\r
         }\r
         IntDisableCount[Controller]--;\r
     }\r
 }\r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_Cbk_CheckWakeup                                         */\r
-/* Service Id:    0x0b                                                        */\r
-/* Execution:     Synchronous                                                 */\r
-/* Re-entrant:    No                                                          */\r
-/* Description:   Checks if a wakeup has occurred for the given controller    */\r
-/* Controller:    CAN controller to be checked for wakeup                     */\r
-/* Return Value:  - E_OK: Wakeup was detected for given controller            */\r
-/*                - E_NOT_OK: No Wakeup was detected                          */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
 void Can_Cbk_CheckWakeup(uint8 Controller)\r
 {\r
-       /*\r
+       /* TODO not supported yet.\r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-    if(Controller >= CAN_CONTROLLER_COUNT)\r
+    if(Controller >= CAN_ARC_CTRL_CONFIG_CNT)\r
     {\r
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 0x0B, CAN_E_PARAM_CONTROLLER);\r
         return CAN_NOT_OK;\r
     }\r
 #endif\r
     // Check WakeUpPending\r
-    if(CanBase[Controller]->SR & 0x00000200)\r
+    if(CanRegs[Controller]->SR & 0x00000200)\r
     {\r
         return E_OK;\r
     }\r
@@ -729,39 +794,21 @@ void Can_Cbk_CheckWakeup(uint8 Controller)
 }\r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_Write                                                   */\r
-/* Service Id:    0x06                                                        */\r
-/* Execution:     Synchronous                                                 */\r
-/* Re-entrant:    Yes (thread-safe)                                           */\r
-/* Description:   --                                                          */\r
-/* Hth:           HW-transmit handle to be used for transmit                  */\r
-/* PduInfo:       Pointer to SDU user memory, DLC and Identifier              */\r
-/* Return Value:  - CAN_OK: Write command has been accepted                   */\r
-/*                - CAN_NOT_OK: Development error occured                     */\r
-/*                - CAN_BUSY: No TX hw buffer available or preemptive call    */ \r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
 Can_ReturnType Can_Write(Can_Arc_HTHType Hth, Can_PduType *PduInfo)\r
 {\r
-    uint32                 ErrCounter;\r
     uint8                  ControllerId;\r
     uint8                  MsgNr;\r
-    uint32                 CancelId;\r
-    uint8                  CancelNr;  \r
     uint32                 ArbRegValue;\r
     uint8                  DataByteIndex;\r
     uint8                 *CurSduPtr;\r
     Can_PduType           *CurPduArrayPtr;\r
     uint8                 *CurCancelRqstPtr;\r
     uint8                 *CurTxRqstPtr;\r
-    Can_MessageObjectType *CurMsgBoxPtr;\r
+    imask_t state;\r
 \r
     CurSduPtr       = PduInfo->sdu;\r
-    CurMsgBoxPtr    = CurConfig->MessageBoxPtr + Hth;\r
-    ErrCounter      = CAN_TIMEOUT_DURATION;\r
     \r
+\r
 /* DET Error Check */\r
 #if(CAN_DEV_ERROR_DETECT == STD_ON)\r
     if(PduInfo == NULL || PduInfo->sdu == NULL)\r
@@ -779,197 +826,78 @@ Can_ReturnType Can_Write(Can_Arc_HTHType Hth, Can_PduType *PduInfo)
         Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 6, CAN_E_PARAM_DLC);\r
         return CAN_NOT_OK;        \r
     }\r
-    if(CurMsgBoxPtr->Direction != CAN_TRANSMIT)\r
-    {\r
-        Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 6, CAN_E_PARAM_HANDLE);\r
-        return CAN_NOT_OK;\r
-    }      \r
 #endif\r
 \r
-    ControllerId     = CurMsgBoxPtr->Controller;\r
+    ControllerId = Can_FindControllerId(Hth);\r
     \r
-    MsgNr            = Hth - ControllerConfig[ControllerId].FirstHandle;\r
+    const Can_HardwareObjectType *hoh = Can_FindTxHoh(Hth);\r
 \r
-    CurPduArrayPtr   = ControllerConfig[ControllerId].PduPtr    + MsgNr;\r
-    CurCancelRqstPtr = ControllerConfig[ControllerId].CancelPtr + MsgNr;\r
-    CurTxRqstPtr     = ControllerConfig[ControllerId].TxPtr     + MsgNr;\r
+#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
+    if(hoh->CanObjectType != CAN_OBJECT_TYPE_TRANSMIT)\r
+       {\r
+               Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 6, CAN_E_PARAM_HANDLE);\r
+               return CAN_NOT_OK;\r
+       }\r
+#endif\r
+    uint64 mbMask = hoh->Can_Arc_MbMask;\r
+    MsgNr = 0;\r
+    for(; mbMask != 0; mbMask >>= 1) {\r
+       MsgNr++;\r
+               if (!(mbMask & 1)) {\r
+                       continue; // This message object is not part of this hoh.\r
+               }\r
+               /* Check if TxRqst Bit of MsgObject is set */\r
+               if(CanRegs[ControllerId]->TRx[MsgNr >> 5] & (1 << (MsgNr & 0x1F)))\r
+               {\r
+                       continue;\r
+               }\r
+               break;\r
+    }\r
+\r
+       /* Check if TxRqst Bit of MsgObject is set */\r
+       if(CanRegs[ControllerId]->TRx[MsgNr >> 5] & (1 << (MsgNr & 0x1F)))\r
+       {\r
+               return CAN_BUSY;\r
+       }\r
+\r
+    CurPduArrayPtr   = ControllerConfig[ControllerId].PduPtr    + (MsgNr - 1);\r
+    CurCancelRqstPtr = ControllerConfig[ControllerId].CancelPtr + (MsgNr - 1);\r
+    CurTxRqstPtr     = ControllerConfig[ControllerId].TxPtr     + (MsgNr - 1);\r
     \r
     /* Bring Id Value to appropriate format and set ArbRegValue */\r
-    if(PduInfo->id & 0x80000000)\r
-    {\r
+    if( hoh->CanIdType == CAN_ID_TYPE_EXTENDED ) {\r
         /* MsgVal, Ext, Transmit, Extended Id */ \r
-        ArbRegValue = 0xD0000000 | (PduInfo->id & 0x1FFFFFFF);\r
-    }\r
-    else\r
-    {\r
+        ArbRegValue = 0xE0000000 | (PduInfo->id & 0x1FFFFFFF);\r
+    } else {\r
         /* MsgVal, Std, Transmit, Standard Id */ \r
         ArbRegValue = 0xA0000000 | ((PduInfo->id & 0x7FF) << 18);\r
     }\r
 \r
-    /* Check if TxRqst Bit of MsgObject is set */\r
-    if(CanBase[ControllerId]->TRx[MsgNr >> 5] & (1 << (MsgNr & 0x1F)))\r
-    {\r
-\r
-#if(CAN_MULTIPLEXED_TRANSMISSION == STD_ON)\r
-\r
-        CancelId = ArbRegValue & 0x1FFFFFFF;\r
-        CancelNr = MsgNr;\r
-\r
-        for(MsgNr = ControllerConfig[ControllerId].MessageBoxCount; MsgNr < ControllerConfig[ControllerId].MaxBoxes; MsgNr++)\r
-        {\r
-            /* Read actual MessageObject status: Data, Arbitration, Control */\r
-            CanBase[ControllerId]->IFx[IfRegId].COM = 0x00330000 | (MsgNr + 1);       \r
-            /* Wait until Busy Flag is 0 */\r
-            while(CanBase[ControllerId]->IFx[IfRegId].COM & 0x00008000)\r
-            {\r
-                ErrCounter--;\r
-                if(ErrCounter == 0)\r
-                {\r
-                    Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                    ErrCounter = CAN_TIMEOUT_DURATION;\r
-                    return CAN_NOT_OK;\r
-                }\r
-            }\r
-\r
-            /* If MessageObject is free, use it */\r
-            if(!(CanBase[ControllerId]->IFx[IfRegId].MC & 0x00000100))\r
-            {\r
-                CurPduArrayPtr   = ControllerConfig[ControllerId].PduPtr + MsgNr;\r
-                break;\r
-            }\r
-            /* Check if Id of MessageObject is higher */\r
-            if((CanBase[ControllerId]->IFx[IfRegId].ARB & 0x1FFFFFFF) > CancelId )\r
-            {\r
-                /* Save the highest ID (low priority) */\r
-                CancelId = CanBase[ControllerId]->IFx[IfRegId].ARB & 0x1FFFFFFF;\r
-                /* and corresponding message number */\r
-                CancelNr = MsgNr;\r
-            }\r
-        }\r
-        if(MsgNr == ControllerConfig[ControllerId].MaxBoxes)\r
-        {\r
-#if(CAN_HW_TRANSMIT_CANCELLATION == STD_ON)\r
-             /* Clear TxRqst */\r
-            CanBase[ControllerId]->IFx[IfRegId].MC  &= ~0x00000100;\r
-            /* Transfer Control bits to MessageObject */\r
-            CanBase[ControllerId]->IFx[IfRegId].COM  =  0x90000000 | (CancelNr + 1);\r
-                        \r
-            if(ControllerConfig[ControllerId].TxProc == INTERRUPT)\r
-            {\r
-                /* Set CurPduPtr to Pdu of object to cancel */             \r
-                CurPduArrayPtr  = ControllerConfig[ControllerId].PduPtr + CancelNr;\r
-                /* Wait until Busy Flag is 0 */\r
-                while(CanBase[ControllerId]->IFx[IfRegId].COM & 0x00008000)\r
-                {\r
-                    ErrCounter--;\r
-                    if(ErrCounter == 0)\r
-                    {\r
-                        Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                        ErrCounter = CAN_TIMEOUT_DURATION;\r
-                        return CAN_NOT_OK;\r
-                    }\r
-                }\r
-                /* Notification about cancellation of object */\r
-                CanIf_CancelTxConfirmation((const Can_PduType *)CurPduArrayPtr);\r
-            }\r
-            else\r
-            {\r
-                /* Set CancelPointer to Position of cancelled Object */\r
-                CurCancelRqstPtr = ControllerConfig[ControllerId].CancelPtr + CancelNr;\r
-                /* Set Arrayelement to 1 to indicate cancellation request */\r
-                *CurCancelRqstPtr = 1;\r
-            }\r
-#endif\r
-        }\r
-#elif(CAN_HW_TRANSMIT_CANCELLATION == STD_ON)\r
-    \r
-        /* Wait until Busy Flag is 0 */\r
-        while(CanBase[ControllerId]->IFx[IfRegId].COM & 0x00008000)\r
-        {\r
-            ErrCounter--;\r
-            if(ErrCounter == 0)\r
-            {\r
-                Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                return CAN_NOT_OK;\r
-            }\r
-        }\r
 \r
-        /* Read actual MessageObject status: Data, Arbitration, Control */\r
-        CanBase[ControllerId]->IFx[IfRegId].COM = 0x00330000 | (MsgNr + 1);\r
+    DCAN_WAIT_UNTIL_NOT_BUSY(ControllerId, IfRegId);\r
 \r
-        /* Wait until Busy Flag is 0 */\r
-        while(CanBase[ControllerId]->IFx[IfRegId].COM & 0x00008000)\r
-        {\r
-            ErrCounter--;\r
-            if(ErrCounter == 0)\r
-            {\r
-                Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                return CAN_NOT_OK;\r
-            }\r
-        }  \r
-          \r
-        /* Check if actual message has higher priority */\r
-        if((ArbRegValue & 0x1FFFFFFF) < (CanBase[ControllerId]->IFx.ARB & 0x1FFFFFFF))\r
-        {\r
-            /* Clear TxRqst */\r
-            CanBase[ControllerId]->IFx[IfRegId].MC  &= ~0x00000100;\r
-            /* Transfer Control bits to MessageObject */\r
-            CanBase[ControllerId]->IFx[IfRegId].COM  =  0x90000000 | (MsgNr + 1);\r
-            \r
-            if(ControllerConfig[ControllerId].TxProc == INTERRUPT)\r
-            {\r
-                /* Wait until Busy Flag is 0 */\r
-                while(CanBase[ControllerId]->IFx[IfRegId].COM & 0x00008000)\r
-                {\r
-                    ErrCounter--;\r
-                    if(ErrCounter == 0)\r
-                    {\r
-                        Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                        ErrCounter = CAN_TIMEOUT_DURATION;\r
-                        return CAN_NOT_OK;\r
-                    }\r
-                } \r
-                /* Notification about cancellation of object */\r
-                CanIf_CancelTxConfirmation((const Can_PduType *)CurPduArrayPtr);\r
-            }\r
-            else\r
-            {\r
-                /* Set Arrayelement to 1 to indicate cancellation request */\r
-                *CurCancelRqstPtr = 1;\r
-            }\r
-        }\r
-#endif\r
-        return CAN_BUSY;\r
-    }\r
+    // We cannot allow an interrupt or other task to play with the COM, MC and ARB registers here.\r
+    Irq_Save(state);\r
 \r
-    /* Wait until Busy Flag is 0 */\r
-    while(CanBase[ControllerId]->IFx[IfRegId].COM & 0x00008000)\r
-    {\r
-        ErrCounter--;\r
-        if(ErrCounter == 0)\r
-        {\r
-            Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-            ErrCounter = CAN_TIMEOUT_DURATION;\r
-            return CAN_NOT_OK;\r
-        }\r
-    }\r
 \r
     /* Set NewDat, TxIE (dep on ControllerConfig), TxRqst, EoB and DLC */\r
-    CanBase[ControllerId]->IFx[IfRegId].MC = 0x00000180 | (0x000F & PduInfo->length) | (ControllerConfig[ControllerId].TxProc << 1);\r
+    CanRegs[ControllerId]->IFx[IfRegId].MC =     0x00000100 // Tx request\r
+                                                                                       | 0x00000080 // Eob should be set to one for tx\r
+                                                                                       | (0x000F & PduInfo->length) // Set DLC\r
+                                                                                       | (CanControllerConfigData[ControllerId].CanTxProcessing << 1); // Tx confirmation interrupt enabled\r
 \r
     /* Set ArbitrationRegister */\r
-    CanBase[ControllerId]->IFx[IfRegId].ARB = ArbRegValue;\r
+    CanRegs[ControllerId]->IFx[IfRegId].ARB = ArbRegValue;\r
+\r
 \r
     /* Set Databytes */\r
     for(DataByteIndex = 0; DataByteIndex < PduInfo->length; DataByteIndex++)\r
     {\r
-        CanBase[ControllerId]->IFx[IfRegId].DATx[ElementIndex[DataByteIndex]] = *CurSduPtr++;\r
+        CanRegs[ControllerId]->IFx[IfRegId].DATx[ElementIndex[DataByteIndex]] = *CurSduPtr++;\r
     }\r
 \r
     /* Start transmission to MessageRAM */\r
-    CanBase[ControllerId]->IFx[IfRegId].COM = 0x00BF0000 | (MsgNr + 1);\r
+    CanRegs[ControllerId]->IFx[IfRegId].COM = 0x00BF0000 | MsgNr;\r
     \r
     /* Save the PduInfo in PduArray, so that messages can be identified later */\r
     *CurPduArrayPtr = *PduInfo;\r
@@ -978,341 +906,29 @@ Can_ReturnType Can_Write(Can_Arc_HTHType Hth, Can_PduType *PduInfo)
     \r
     IfRegId ^= 1;\r
        \r
+    Irq_Restore(state);\r
     return CAN_OK;\r
 }\r
 \r
 \r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_MainFunction_Write                                      */\r
-/* Service Id:    0x01                                                        */\r
-/* Timing:        FIXED_CYCLIC                                                */\r
-/* Description:   Polling of TX confirmation and TX cancellation confirmation */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
-void CAN_MAINFUNCTION_WRITE()\r
+void Can_MainFunction_Write()\r
 {\r
-#if 0\r
-    uint8        Controller;\r
-    uint8        MsgNr;\r
-    Can_PduType *CurPduPtr;\r
-\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-    if(ModuleState == CAN_UNINIT)\r
-    {\r
-        Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 1, CAN_E_UNINIT);\r
-        return;\r
-    }\r
-#endif       \r
-    /* Check all controllers */\r
-    for(Controller = 0; Controller < CAN_CONTROLLER_COUNT; Controller++)\r
-    {\r
-        /* Check all MessageObjects */\r
-        for(MsgNr = 0; MsgNr < ControllerConfig[Controller].MaxBoxes; MsgNr++)\r
-        {\r
-            /* Check if a transmission was initiated for this MessageObject */\r
-            if(*(ControllerConfig[Controller].TxPtr + MsgNr) == 1)\r
-            {\r
-                /* Check if TxRqst Bit has already been reset */\r
-                if(!(CanBase[Controller]->TRx[MsgNr >> 5] & (1 << (MsgNr & 0x1F))))\r
-                {\r
-                    /* Reset swTxRqst */\r
-                    *(ControllerConfig[Controller].TxPtr + MsgNr) = 0;\r
-                    \r
-                    CurPduPtr = ControllerConfig[Controller].PduPtr + MsgNr;\r
-                    /* A Message was successfully transmitted */\r
-                    CanIf_TxConfirmation(CurPduPtr->swPduHandle);\r
-                }\r
-            }\r
-            /* Check if a cancellation was initiated for this MessageObject */\r
-            if(*(ControllerConfig[Controller].CancelPtr + MsgNr) == 1)\r
-            {\r
-                /* Check if TxRqst Bit has already been reset */\r
-                if(!(CanBase[Controller]->TRx[MsgNr >> 5] & (1 << (MsgNr & 0x1F))))\r
-                {\r
-                    /* Reset swCancelRqst */\r
-                    *(ControllerConfig[Controller].CancelPtr + MsgNr) = 0;\r
-                    \r
-                    CurPduPtr = ControllerConfig[Controller].PduPtr + MsgNr;\r
-                    /* A Message was successfully transmitted */\r
-                     CanIf_CancelTxConfirmation(CurPduPtr);     \r
-                }\r
-            }\r
-        }\r
-    }\r
-#endif\r
+       // Not supported\r
 }\r
 \r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_MainFunction_Read                                       */\r
-/* Service Id:    0x08                                                        */\r
-/* Timing:        FIXED_CYCLIC                                                */\r
-/* Description:   Polling of RX indications                                   */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
-void CAN_MAINFUNCTION_READ()\r
+void Can_MainFunction_Read()\r
 {\r
-#if 0\r
-    uint8                  Controller;\r
-    uint8                  MsgNr;\r
-    Can_MessageObjectType *CurMsgBoxPtr;\r
-    uint8                  MsgDlc;\r
-    uint32                 Identifier;\r
-    uint8                  DataByteIndex;\r
-    uint8                 *SduPtr;\r
-    uint32                 ErrCounter;    \r
-   \r
-\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-    if(ModuleState == CAN_UNINIT)\r
-    {\r
-        Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 8, CAN_E_UNINIT);\r
-        return;\r
-    }\r
-#endif\r
-\r
-    CurMsgBoxPtr = CurConfig->MessageBoxPtr;\r
-    \r
-    for(Controller = 0; Controller < CAN_CONTROLLER_COUNT; Controller++)\r
-    {\r
-        for(MsgNr = 0; MsgNr < ControllerConfig[Controller].MessageBoxCount; MsgNr++)\r
-        {\r
-            /* Check if NewDat Bit is set and if MessageObject is Receive Object */\r
-            if((CanBase[Controller]->NDx[MsgNr >> 5] & (1 << (MsgNr & 0x1F))) && (CurMsgBoxPtr->Direction == RECEIVE))\r
-            {\r
-            \r
-                /* Read Arbitration, Control and Data Bits and clear IntPnd and NewDat*/\r
-                CanBase[Controller]->IFx[IfRegId].COM = 0x003F0000 | (MsgNr + 1);\r
-                \r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                /* Wait until Busy Flag is 0 */\r
-                while(CanBase[Controller]->IFx[IfRegId].COM & 0x8000)\r
-                {\r
-                    ErrCounter--;\r
-                    if(ErrCounter == 0)\r
-                    {\r
-                        Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                        return;\r
-                    }\r
-                }\r
-                /* Extended Id */\r
-                if(CanBase[0]->IFx[IfRegId].ARB & 0x40000000)\r
-                {\r
-                    /* Bring Id to standardized format (MSB marks extended Id) */\r
-                    Identifier = (CanBase[0]->IFx[IfRegId].ARB & 0x1FFFFFFF) | 0x80000000;\r
-                }\r
-                /* Standard Id */\r
-                else\r
-                {\r
-                    /* Bring Id to standardized format (MSB marks extended Id) */\r
-                    Identifier = (CanBase[0]->IFx[IfRegId].ARB & 0x1FFC0000) >> 18;\r
-                }\r
-                /* DLC (Max 8) */\r
-                MsgDlc = CanBase[0]->IFx[IfRegId].MC & 0x000F;\r
-                if(MsgDlc > 8)\r
-                {\r
-                    MsgDlc = 8;\r
-                }\r
-                /* Let SduPtr point to Shadow Buffer */\r
-                SduPtr = RxShadowBuf;\r
-\r
-                /* Copy Message Data to Shadow Buffer */\r
-                for(DataByteIndex = 0; DataByteIndex < MsgDlc; DataByteIndex++)\r
-                {\r
-                    RxShadowBuf[DataByteIndex] = CanBase[0]->IFx[IfRegId].DATx[ElementIndex[DataByteIndex]];\r
-                }\r
-                /* Indicate successful Reception */\r
-                CanIf_RxIndication(MsgNr, Identifier, MsgDlc, SduPtr);\r
-            }     \r
-            CurMsgBoxPtr++;\r
-        }\r
-    }\r
-#endif\r
+       // Not supported\r
 }\r
 \r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_MainFunction_BusOff                                     */\r
-/* Service Id:    0x09                                                        */\r
-/* Timing:        FIXED_CYCLIC                                                */\r
-/* Description:   Polling of bus-off events                                   */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
-void CAN_MAINFUNCTION_BUSOFF()\r
+void Can_MainFunction_BusOff()\r
 {\r
-    uint8  Controller;\r
-\r
-/* DET Error Check */\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-    if(ModuleState == CAN_UNINIT)\r
-    {\r
-        Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 9, CAN_E_UNINIT);\r
-        return;\r
-    }    \r
-#endif\r
-    \r
-    for(Controller = 0 ; Controller < CAN_CONTROLLER_COUNT; Controller++)\r
-    {\r
-        /* Bus Off */\r
-        if(CanBase[Controller]->SR & 0x00000080)\r
-        {\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-            ControllerMode[Controller] = CANIF_CS_STOPPED;\r
-#endif\r
-            CanIf_ControllerBusOff(Controller);\r
-        }\r
-    }\r
+  // Not supported\r
 }\r
 \r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can_MainFunction_Wakeup                                     */\r
-/* Service Id:    0x0a                                                        */\r
-/* Timing:        FIXED_CYCLIC                                                */\r
-/* Description:   Polling of wake-up events                                   */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-\r
-void CAN_MAINFUNCTION_WAKEUP()\r
+void Can_MainFunction_Wakeup()\r
 {\r
-    uint8 Controller;\r
-\r
-/* DET Error Check */\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-    if(ModuleState == CAN_UNINIT)\r
-    {\r
-        Det_ReportError(CAN_MODULE_ID, CAN_INSTANCE, 0xA, CAN_E_UNINIT);\r
-        return;\r
-    }    \r
-#endif\r
-\r
-    for(Controller = 0 ; Controller < CAN_CONTROLLER_COUNT; Controller++)\r
-    {\r
-        /* Check WakeUp Pending */\r
-        if(CanBase[Controller]->SR & 0x200)\r
-        {\r
-            /* Set Init Bit, so that Controller is in Stop state */\r
-            CanBase[Controller]->CTL |= 0x1;\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-            ControllerMode[Controller] = CANIF_CS_STOPPED;\r
-#endif\r
-            //EcuM_CheckWakeUp(ControllerConfig[Controller].WakeupSrc);\r
-        }\r
-    }\r
+   // Not supported\r
 }\r
 \r
 \r
-\r
-\r
-/*----------------------------------------------------------------------------*/\r
-/* Function Name: Can2_InterruptHandler_0                                     */\r
-/* Description:   CAN Node 2 Level 0 Interrupt Service Routine                */\r
-/* Return Value:  None                                                        */\r
-/* Remarks:       -/-                                                         */\r
-/*                                                                            */\r
-#ifdef CanController_1\r
-//#pragma INTERRUPT(CAN2_INTERRUPTHANDLER_0,IRQ)\r
-\r
-void CAN2_INTERRUPTHANDLER_0()\r
-{\r
-\r
-    uint32  ErrCounter;\r
-    uint32  MsgNr;\r
-    uint32  MsgId;\r
-    uint8   MsgDlc;\r
-    uint8   DataByteIndex;\r
-    uint8  *SduPtr; \r
-\r
-    ErrCounter = CAN_TIMEOUT_DURATION;\r
-    \r
-    if(CanBase[1]->IR == 0x8000)\r
-    {\r
-        /* WakeUp Pending */\r
-        if(CanBase[1]->SR & 0x200)\r
-        {\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-            ControllerMode[1] = CANIF_CS_STOPPED;\r
-#endif\r
-            /* Set Init Bit, so that Controller is in Stop state */\r
-            CanBase[1]->CTL |= 0x1;\r
-          //  EcuM_CheckWakeUp(ControllerConfig[1].WakeupSrc);\r
-        }\r
-        /* Bus Off */\r
-        if(CanBase[1]->SR & 0x080)\r
-        {\r
-#if(CAN_DEV_ERROR_DETECT == STD_ON)\r
-            ControllerMode[1] = CANIF_CS_STOPPED;\r
-#endif\r
-            CanIf_ControllerBusOff(1);\r
-        }\r
-    }\r
-    else\r
-    {\r
-        MsgNr = CanBase[1]->IR;\r
-        \r
-        /* Read Arbitration, Control and Data Bits and clear IntPnd */\r
-        CanBase[1]->IFx[IfRegId].COM = 0x003F0000 | MsgNr;\r
-        \r
-        /* Wait until Busy Flag is 0 */\r
-        while(CanBase[1]->IFx[IfRegId].COM & 0x8000)\r
-        {\r
-            ErrCounter--;\r
-            if(ErrCounter == 0)\r
-            {\r
-                Dem_ReportErrorStatus(CAN_E_TIMEOUT, DEM_EVENT_STATUS_FAILED);\r
-                ErrCounter = CAN_TIMEOUT_DURATION;\r
-                return;\r
-            }\r
-        }\r
-        \r
-        /* Transmit Object */\r
-        if(CanBase[1]->IFx[IfRegId].ARB & 0x20000000)\r
-        {\r
-            /* Reset TxRqst-Array Element */\r
-            TxRqstArray_1[MsgNr - 1] = 0;\r
-            /* A Message was successfully transmitted */\r
-            CanIf_TxConfirmation(PduInfoArray_1[MsgNr - 1].swPduHandle);\r
-        }        \r
-        /* Receive Object */\r
-        else\r
-        {\r
-            /* Extended Id */\r
-            if(CanBase[1]->IFx[IfRegId].ARB & 0x40000000)\r
-            {\r
-                /* Bring Id to standardized format (MSB marks extended Id) */\r
-                MsgId = (CanBase[1]->IFx[IfRegId].ARB & 0x1FFFFFFF) | 0x80000000;\r
-            }\r
-            /* Standard Id */\r
-            else\r
-            {\r
-                /* Bring Id to standardized format (MSB marks extended Id) */\r
-                MsgId = (CanBase[1]->IFx[IfRegId].ARB & 0x1FFC0000) >> 18;\r
-            }\r
-            /* DLC (Max 8) */\r
-            MsgDlc = CanBase[1]->IFx[IfRegId].MC & 0x000F;\r
-            if(MsgDlc > 8)\r
-            {\r
-                MsgDlc = 8;\r
-            }\r
-            /* Let SduPtr point to Shadow Buffer */\r
-            SduPtr = RxShadowBuf;\r
-\r
-            /* Copy Message Data to Shadow Buffer */\r
-            for(DataByteIndex = 0; DataByteIndex < MsgDlc; DataByteIndex++)\r
-            {\r
-                RxShadowBuf[DataByteIndex] = CanBase[1]->IFx[IfRegId].DATx[ElementIndex[DataByteIndex]];\r
-            }\r
-            /* Indicate successful Reception */\r
-            CanIf_RxIndication(MsgNr - 1, MsgId, MsgDlc, SduPtr);\r
-        }\r
-    }\r
-\r
-}\r
-#endif\r