Bug fixes.

diff --git a/arch/arm/arm_cr4/drivers/Can.c b/arch/arm/arm_cr4/drivers/Can.c
index eb6d369fc1b593281e1ce267b1215f04a6b38bc7..5e08c9685240571051872bea419cb1e27259f636 100644 (file)
--- a/arch/arm/arm_cr4/drivers/Can.c
+++ b/arch/arm/arm_cr4/drivers/Can.c
@@ -212,7 +212,7 @@ void Can_InterruptHandler(CanControllerIdType controller)
     uint8   DataByteIndex;\r
     uint8  *SduPtr;\r
 \r
-    Can_DisableControllerInterrupts(controller);\r
+    //Can_DisableControllerInterrupts(controller);\r
 \r
     uint32 ir = CanRegs[controller]->IR;\r
 \r
@@ -294,7 +294,7 @@ void Can_InterruptHandler(CanControllerIdType controller)
 \r
         }\r
     }\r
-    Can_EnableControllerInterrupts(controller);\r
+    //Can_EnableControllerInterrupts(controller);\r
 }\r
 \r
 void Can1_InterruptHandler() {\r
@@ -799,13 +799,10 @@ Can_ReturnType Can_Write(Can_Arc_HTHType Hth, Can_PduType *PduInfo)
     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
@@ -823,7 +820,6 @@ Can_ReturnType Can_Write(Can_Arc_HTHType Hth, Can_PduType *PduInfo)
     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].CanRxProcessing\r
                                                                                        | (CanControllerConfigData[ControllerId].CanTxProcessing << 1); // Tx confirmation interrupt enabled\r
 \r
 \r