Lint fixes on PduR and CanIf

diff --git a/communication/CanIf/CanIf.c b/communication/CanIf/CanIf.c
index 8397b4ed4e7e2faa14e1696c872f117ae7fa3bad..78031f50b7fde9c36095534382941cb946f323c5 100644 (file)
--- a/communication/CanIf/CanIf.c
+++ b/communication/CanIf/CanIf.c
@@ -25,7 +25,7 @@
 \r
 #include "Can.h"\r
 #include "CanIf_Cbk.h"\r
-#include "string.h"\r
+#include <string.h>\r
 \r
 #include "debug.h"\r
 #include "PduR.h"\r
@@ -109,8 +109,9 @@ static CanIf_Arc_ChannelIdType CanIf_Arc_FindHrhChannel( Can_Arc_HRHType hrh )
     do\r
     {\r
       hrhConfig++;\r
-      if (hrhConfig->CanIfHrhIdSymRef == hrh)\r
+      if (hrhConfig->CanIfHrhIdSymRef == hrh){\r
         return hrhConfig->CanIfCanControllerHrhIdRef;\r
+      }\r
     } while(!hrhConfig->CanIf_Arc_EOL);\r
   } while(!hohConfig->CanIf_Arc_EOL);\r
 \r
@@ -244,8 +245,9 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
     switch (oldMode)\r
     {\r
       case CANIF_CS_SLEEP:\r
-        if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK)\r
+        if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK){\r
           return E_NOT_OK;\r
+        }\r
         CanIf_Global.channelData[channel].ControllerMode = CANIF_CS_STOPPED;\r
         break;\r
       default:\r
@@ -254,8 +256,9 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
     }\r
 \r
     CanIf_SetPduMode(channel, CANIF_SET_ONLINE);\r
-    if (Can_SetControllerMode(canControllerId, CAN_T_START) == CAN_NOT_OK)\r
+    if (Can_SetControllerMode(canControllerId, CAN_T_START) == CAN_NOT_OK){\r
       return E_NOT_OK;\r
+    }\r
     CanIf_Global.channelData[channel].ControllerMode = CANIF_CS_STARTED;\r
   }\r
   break;\r
@@ -264,8 +267,9 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
   {\r
     switch (oldMode) {\r
       case CANIF_CS_STARTED:\r
-        if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK)\r
+        if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK){\r
           return E_NOT_OK;\r
+        }\r
         CanIf_Global.channelData[channel].ControllerMode = CANIF_CS_STOPPED;\r
         break;\r
       default:\r
@@ -273,8 +277,9 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
         break;\r
     }\r
 \r
-    if (Can_SetControllerMode(canControllerId, CAN_T_SLEEP) == CAN_NOT_OK)\r
+    if (Can_SetControllerMode(canControllerId, CAN_T_SLEEP) == CAN_NOT_OK){\r
       return E_NOT_OK;\r
+    }\r
     CanIf_Global.channelData[channel].ControllerMode = CANIF_CS_SLEEP;\r
   }\r
 \r
@@ -283,8 +288,9 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
     switch (oldMode)\r
     {\r
       case CANIF_CS_SLEEP:\r
-        if (Can_SetControllerMode(canControllerId, CAN_T_WAKEUP) == CAN_NOT_OK)\r
+        if (Can_SetControllerMode(canControllerId, CAN_T_WAKEUP) == CAN_NOT_OK){\r
           return E_NOT_OK;\r
+        }\r
         break;\r
       default:\r
         // Just fall through for other cases\r
@@ -292,8 +298,9 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
     }\r
 \r
     CanIf_SetPduMode(channel, CANIF_SET_OFFLINE);\r
-    if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK)\r
+    if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK){\r
       return E_NOT_OK;\r
+    }\r
     CanIf_Global.channelData[channel].ControllerMode = CANIF_CS_STOPPED;\r
     break;\r
   }\r
@@ -374,18 +381,22 @@ Std_ReturnType CanIf_Transmit(PduIdType CanTxPduId,
   CanIf_Arc_ChannelIdType channel = txEntry->CanIfCanTxPduHthRef->CanIfCanControllerIdRef;\r
 \r
   // Get and verify the controller mode\r
-  if (CanIf_GetControllerMode(channel, &csMode) == E_NOT_OK)\r
+  if (CanIf_GetControllerMode(channel, &csMode) == E_NOT_OK){\r
     return E_NOT_OK;\r
+  }\r
 \r
-  if (csMode != CANIF_CS_STARTED)  // CANIF_161\r
+  if (csMode != CANIF_CS_STARTED){  // CANIF_161\r
     return E_NOT_OK;\r
+  }\r
 \r
   // Get and verify the PDU channel mode control\r
-  if (CanIf_GetPduMode(channel, &pduMode) == E_NOT_OK)\r
+  if (CanIf_GetPduMode(channel, &pduMode) == E_NOT_OK){\r
     return E_NOT_OK;\r
+  }\r
 \r
-  if ((pduMode != CANIF_GET_TX_ONLINE) && (pduMode != CANIF_GET_ONLINE))\r
+  if ((pduMode != CANIF_GET_TX_ONLINE) && (pduMode != CANIF_GET_ONLINE)){\r
     return E_NOT_OK;\r
+  }\r
 \r
   canPdu.id = txEntry->CanIfCanTxPduIdCanId;\r
 \r
@@ -395,8 +406,9 @@ Std_ReturnType CanIf_Transmit(PduIdType CanTxPduId,
 \r
   Can_ReturnType rVal = Can_Write(txEntry->CanIfCanTxPduHthRef->CanIfHthIdSymRef, &canPdu);\r
 \r
-  if (rVal == CAN_NOT_OK)\r
+  if (rVal == CAN_NOT_OK){\r
     return E_NOT_OK;\r
+  }\r
 \r
   if (rVal == CAN_BUSY)  // CANIF 082, CANIF 161\r
   {\r
@@ -484,46 +496,50 @@ Std_ReturnType CanIf_SetPduMode(uint8 Controller,
     CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE;\r
     break;\r
   case CANIF_SET_RX_OFFLINE:\r
-    if (oldMode == CANIF_GET_RX_ONLINE)\r
+    if (oldMode == CANIF_GET_RX_ONLINE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE;\r
-    else if (oldMode == CANIF_GET_ONLINE)\r
+    } else if (oldMode == CANIF_GET_ONLINE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_TX_ONLINE;\r
-    else if (oldMode == CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE_ACTIVE;\r
+    }\r
 \r
     // Other oldmodes don't care\r
     break;\r
   case CANIF_SET_RX_ONLINE:\r
-    if (oldMode == CANIF_GET_OFFLINE)\r
+    if (oldMode == CANIF_GET_OFFLINE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_RX_ONLINE;\r
-    else if (oldMode == CANIF_GET_TX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_TX_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_ONLINE;\r
-    else if (oldMode == CANIF_GET_OFFLINE_ACTIVE)\r
+    } else if (oldMode == CANIF_GET_OFFLINE_ACTIVE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE;\r
+    }\r
 \r
     // Other oldmodes don't care\r
     break;\r
   case CANIF_SET_TX_OFFLINE:\r
-    if (oldMode == CANIF_GET_TX_ONLINE)\r
+    if (oldMode == CANIF_GET_TX_ONLINE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE;\r
-    else if (oldMode == CANIF_GET_ONLINE)\r
+    } else if (oldMode == CANIF_GET_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_RX_ONLINE;\r
-    else if (oldMode == CANIF_GET_OFFLINE_ACTIVE)\r
+    } else if (oldMode == CANIF_GET_OFFLINE_ACTIVE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE;\r
-    else if (oldMode == CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_RX_ONLINE;\r
+    }\r
 \r
     // Other oldmodes don't care\r
     break;\r
   case CANIF_SET_TX_ONLINE:\r
-    if (oldMode == CANIF_GET_OFFLINE)\r
+    if (oldMode == CANIF_GET_OFFLINE){\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_TX_ONLINE;\r
-    else if (oldMode == CANIF_GET_RX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_RX_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_ONLINE;\r
-    else if (oldMode == CANIF_GET_OFFLINE_ACTIVE)\r
+    } else if (oldMode == CANIF_GET_OFFLINE_ACTIVE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_TX_ONLINE;\r
-    else if (oldMode == CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_ONLINE;\r
+    }\r
 \r
     // Other oldmodes don't care\r
     break;\r
@@ -532,14 +548,15 @@ Std_ReturnType CanIf_SetPduMode(uint8 Controller,
     break;\r
 \r
   case CANIF_SET_TX_OFFLINE_ACTIVE:\r
-    if (oldMode == CANIF_GET_OFFLINE)\r
+    if (oldMode == CANIF_GET_OFFLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE_ACTIVE;\r
-    else if (oldMode == CANIF_GET_RX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_RX_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE;\r
-    else if (oldMode == CANIF_GET_TX_ONLINE)\r
+    } else if (oldMode == CANIF_GET_TX_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE_ACTIVE;\r
-    else if (oldMode == CANIF_GET_ONLINE)\r
+    } else if (oldMode == CANIF_GET_ONLINE) {\r
       CanIf_Global.channelData[channel].PduMode = CANIF_GET_OFFLINE_ACTIVE_RX_ONLINE;\r
+    }\r
 \r
     // Other oldmodes don't care\r
     break;\r
@@ -588,8 +605,8 @@ void CanIf_SetDynamicTxId(PduIdType CanTxPduId, Can_IdType CanId)
   }\r
 \r
   // Check that this is an extended or standard id\r
-  if (((CanId & 0x80000000) && (txEntry->CanIfTxPduIdCanIdType == ARC_CAN_ID_TYPE_29)) ||\r
-      (((CanId & 0x80000000) == 0) && (txEntry->CanIfTxPduIdCanIdType == ARC_CAN_ID_TYPE_11)))\r
+  if (((CanId & U0x80000000) && (txEntry->CanIfTxPduIdCanIdType == ARC_CAN_ID_TYPE_29)) ||\r
+      (((CanId & U0x80000000) == 0) && (txEntry->CanIfTxPduIdCanIdType == ARC_CAN_ID_TYPE_11)))\r
   {\r
     // Update the CanID\r
     //txEntry->CanIfCanTxPduIdCanId = CanId;  // TODO How do we fix this from a const pointer\r
@@ -715,8 +732,8 @@ void CanIf_RxIndication(uint8 Hrh, Can_IdType CanId, uint8 CanDlc,
 \r
   if (CanIf_GetPduMode(channel, &mode) == E_OK)\r
   {\r
-    if (mode == CANIF_GET_OFFLINE || mode == CANIF_GET_TX_ONLINE ||\r
-        mode == CANIF_GET_OFFLINE_ACTIVE)\r
+    if ( (mode == CANIF_GET_OFFLINE) || (mode == CANIF_GET_TX_ONLINE) ||\r
+        (mode == CANIF_GET_OFFLINE_ACTIVE) )\r
     {\r
       // Receiver path is disabled so just drop it\r
       return;\r

diff --git a/communication/CanTp/CanTp.c b/communication/CanTp/CanTp.c
index c4b819f147906194d20cc7597ea3bf1ec3849738..255a436090d72747fd532f81565e1e0a2ebcba83 100644 (file)
--- a/communication/CanTp/CanTp.c
+++ b/communication/CanTp/CanTp.c
@@ -994,7 +994,7 @@ static INLINE Std_ReturnType sendSingleFrame(const CanTp_TxNSduType *txConfig,
        if (txConfig->CanTpAddressingMode == CANTP_EXTENDED) { /** @req CANTP094 *//** @req CANTP095 */\r
                sduData[indexCount++] = (uint8) txConfig->CanTpNTa->CanTpNTa; // Target address.\r
        }\r
-       sduData[indexCount++] = ISO15765_TPCI_SF | txRuntime->transferTotal;\r
+       sduData[indexCount++] = ISO15765_TPCI_SF | txRuntime->transferTotal; // 734 PC-lint: Okej att casta till uint8?\r
        for (int i = 0; i < txRuntime->transferTotal; i++) {\r
                sduData[indexCount++] = txRuntime->pdurBuffer->SduDataPtr[i];\r
        }\r

diff --git a/communication/PduR/PduR.c b/communication/PduR/PduR.c
index 0028bb46416affd01be7d36884e46d75742ebb67..19586a3c5e019819a17d20908a7a31179e1a302f 100644 (file)
--- a/communication/PduR/PduR.c
+++ b/communication/PduR/PduR.c
@@ -36,7 +36,7 @@
 /*\r
  * The state of the PDU router.\r
  */\r
-PduR_StateType PduRState = PDUR_UNINIT;\r
+PduR_StateType PduRState = PDUR_UNINIT; // 960, 31 LINT: Borde åtgärdas\r
 \r
 const PduR_PBConfigType * PduRConfig;\r
 \r
@@ -190,12 +190,14 @@ void PduR_BufferFlush(PduRTxBuffer_type *Buffer) {
 \r
 uint8 PduR_BufferIsFull(PduRTxBuffer_type *Buffer) {\r
        imask_t state = McuE_EnterCriticalSection();\r
+       uint8 rv = 0;\r
        if (Buffer->NrItems < Buffer->Depth) {\r
-               return 0;\r
+               rv = 0;\r
        } else {\r
-               return 1;\r
+               rv = 1;\r
        }\r
        McuE_ExitCriticalSection(state);\r
+       return rv;\r
 }\r
 \r
 \r

diff --git a/communication/PduR/PduR_If.c b/communication/PduR/PduR_If.c
index 1b801b94e7c05b0666642583b187f3bc9e5613f8..08f67e5cd71ad9496033d7e860af4e9462f360f1 100644 (file)
--- a/communication/PduR/PduR_If.c
+++ b/communication/PduR/PduR_If.c
@@ -49,7 +49,7 @@ void PduR_LoIfRxIndication(PduIdType PduId, const uint8* SduPtr) {
        } else if ( (route->PduR_GatewayMode == 1) && (route->PduRDestPdu.DataProvision == PDUR_NO_PROVISION) ) {\r
                // This is a gateway request, but without any data provision (buffer usage).\r
                PduInfoType PduInfo = {\r
-                       .SduDataPtr = (uint8 *)SduPtr,\r
+                       .SduDataPtr = (uint8 *)SduPtr, // 926, 960 PC-Lint: Beror på att funktion PduR_LoIfRxIndication(...) fel-definerad TICKET 130\r
                        .SduLength = route->SduLength\r
                };\r
                route->FctPtrs.TargetTransmitFctPtr(route->PduRDestPdu.DestPduId, &PduInfo); // Send PDU to next receptor.\r

diff --git a/diagnostic/Det/Det.c b/diagnostic/Det/Det.c
index aefa929657ca59750aab875bc54b2671b686b452..d7866521e95e7c5ac505e04a2fbbbdaeffc42188 100644 (file)
--- a/diagnostic/Det/Det.c
+++ b/diagnostic/Det/Det.c
@@ -117,7 +117,7 @@ void Det_ReportError(uint16 ModuleId, uint8 InstanceId, uint8 ApiId, uint8 Error
     if (_detState == DET_STARTED) // No action is taken if the module is not started\r
     {\r
 #if ( DET_ENABLE_CALLBACKS == STD_ON )\r
-        uint32 old1;\r
+        uint32 old1; // 586 LINT OK: fattar inte att den används i macrot.\r
         Irq_Save(old1);\r
 \r
         for (uint32 i=0; i<DET_NUMBER_OF_CALLBACKS; i++)\r

diff --git a/include/Can.h b/include/Can.h
index f8cf9d5a66c59660f152430c5500cb2ad4541e1a..99abdbd0effbf9cadddb5e0d2a8e0ce75be1af00 100644 (file)
--- a/include/Can.h
+++ b/include/Can.h
@@ -93,7 +93,7 @@ typedef enum {
 typedef enum {\r
        CAN_OK,\r
        CAN_NOT_OK,\r
-       CAN_BUSY,\r
+       CAN_BUSY\r
 //     CAN_WAKEUP,             // Removed in 3.0\r
 } Can_ReturnType;\r
 \r
@@ -120,7 +120,7 @@ typedef union {
 #include "Can_Cfg.h"\r
 \r
 void Can_Init( const Can_ConfigType *Config );\r
-void Can_DeInit();\r
+void Can_DeInit(void);\r
 \r
 #if ( CAN_VERSION_INFO_API == STD_ON )\r
 #define Can_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,CAN)\r

diff --git a/include/CanIf_Types.h b/include/CanIf_Types.h
index 9115e66ec136ab9d6630ef6b70c4ce5fefe70325..30714bd3867e9dcaa6b2d08069c0dfe6228c9d0d 100644 (file)
--- a/include/CanIf_Types.h
+++ b/include/CanIf_Types.h
@@ -69,7 +69,7 @@ typedef enum {
         *  SLEEP mode and can be woken up by request of the\r
         *  CAN driver or by a network event (must be supported\r
         *  by CAN hardware) */\r
-       CANIF_CS_SLEEP,\r
+       CANIF_CS_SLEEP\r
 } CanIf_ControllerModeType;\r
 \r
 /** Status of the PDU channel group. Current mode of the channel defines its\r
@@ -105,7 +105,7 @@ typedef enum {
         *  shall be set to the offline active mode\r
         *  => notifications are processed but transmit\r
         *  requests are blocked. */\r
-       CANIF_SET_TX_OFFLINE_ACTIVE,\r
+       CANIF_SET_TX_OFFLINE_ACTIVE\r
 } CanIf_ChannelSetModeType;\r
 \r
 \r
@@ -137,7 +137,7 @@ typedef enum {
        CANIF_NO_NOTIFICATION = 0,      \r
        /** The requested Rx/Tx CAN L-PDU was\r
         *  successfully transmitted or received. */\r
-       CANIF_TX_RX_NOTIFICATION,\r
+       CANIF_TX_RX_NOTIFICATION\r
        \r
 } CanIf_NotifStatusType;\r
 \r

diff --git a/include/Com_Sched.h b/include/Com_Sched.h
index cbea8132287d4f44379692701535642115db2d4c..ebd232bcb97c672a27a157ca5dd851a9e2329d27 100644 (file)
--- a/include/Com_Sched.h
+++ b/include/Com_Sched.h
@@ -25,8 +25,8 @@
 \r
 #include "Com.h"\r
 \r
-void Com_MainFunctionRx();\r
-void Com_MainFunctionTx();\r
+void Com_MainFunctionRx(void);\r
+void Com_MainFunctionTx(void);\r
 \r
 // Not supported in this version.\r
 //void Com_MainFunctionRouteSignals();\r

diff --git a/include/PduR.h b/include/PduR.h
index 701497b8f5a47dee2fa582d9038804d30df7c7c3..11aa0c9eb3843656893fcf4e8e7a2d06dd9f7922 100644 (file)
--- a/include/PduR.h
+++ b/include/PduR.h
@@ -59,7 +59,7 @@
 /* Contain the current state of the PDU router. The router is uninitialized\r
  * until PduR_Init has been run.\r
  */\r
-PduR_StateType PduRState; // 960, 31 LINT: konstigt...\r
+PduR_StateType PduRState; // 960, 31 LINT: Borde åtgärdas\r
 \r
 extern const PduR_PBConfigType *PduRConfig;\r
 \r
@@ -110,10 +110,14 @@ void PduR_Init(const PduR_PBConfigType* ConfigPtr);
 void PduR_GetVersionInfo(Std_VersionInfoType* versionInfo);\r
 uint32 PduR_GetConfigurationId(void);\r
 \r
+void PduR_BufferInc(PduRTxBuffer_type *Buffer, uint8 **ptr);\r
 void PduR_BufferQueue(PduRTxBuffer_type *Buffer, const uint8 * SduPtr);\r
 void PduR_BufferDeQueue(PduRTxBuffer_type *Buffer, uint8 *SduPtr);\r
 void PduR_BufferFlush(PduRTxBuffer_type *Buffer);\r
 uint8 PduR_BufferIsFull(PduRTxBuffer_type *Buffer);\r
+void PduR_LoIfRxIndication(PduIdType PduId, const uint8* SduPtr);\r
+void PduR_LoIfTxConfirmation(PduIdType PduId);\r
+void PduR_LoIfTriggerTransmit(PduIdType PduId, uint8* SduPtr);\r
 \r
 /*\r
  * Macros\r