Last lint fixes in CanSm.

diff --git a/communication/CanSM/CanSM.c b/communication/CanSM/CanSM.c
index 54beb32eb044feb8234675b472c429ce68108d69..1a7a3c2d4eee37daf8bef6e703ef982f3d6a4a07 100644 (file)
--- a/communication/CanSM/CanSM.c
+++ b/communication/CanSM/CanSM.c
@@ -50,17 +50,23 @@ void CanSM_Init( const CanSM_ConfigType* ConfigPtr ) {
        CANSM_VALIDATE_POINTER(ConfigPtr, CANSM_SERVICEID_INIT);  /**< @req CANSM179 */\r
 \r
        CanSM_Config = ConfigPtr;\r
+       Std_ReturnType status = E_OK;\r
+       Std_ReturnType totalStatus = E_OK;\r
 \r
        for (uint8 i = 0; i < CANSM_NETWORK_COUNT; ++i) {\r
-               CanSM_Internal_RequestComMode(i, COMM_NO_COMMUNICATION);  /**< @req CANSM211 */\r
+               status = CanSM_Internal_RequestComMode(i, COMM_NO_COMMUNICATION);  /**< @req CANSM211 */\r
+               if (status > totalStatus) {\r
+                       totalStatus = status;\r
+               }\r
        }\r
 \r
-       CanSM_Internal.InitStatus = CANSM_STATUS_INIT;\r
+       if (totalStatus == E_OK) {\r
+               CanSM_Internal.InitStatus = CANSM_STATUS_INIT;\r
+       } else {\r
+               // TODO report error?\r
+       }\r
 }\r
 \r
-void CanSM_GetVersionInfo( Std_VersionInfoType* VersionInfo ) {\r
-       CANSM_VALIDATE_INIT(CANSM_SERVICEID_GETVERSIONINFO);\r
-}\r
 \r
 /** @req CANSM181  @req CANSM183  @req CANSM182.partially  @req CANSM184 */\r
 Std_ReturnType CanSM_RequestComMode( NetworkHandleType NetworkHandle, ComM_ModeType ComM_Mode ) {\r
@@ -88,18 +94,19 @@ Std_ReturnType CanSM_Internal_RequestComMode( NetworkHandleType NetworkHandle, C
                overallStatus = status;\r
        }\r
 \r
-       if (status == E_OK) {\r
+       if (overallStatus == E_OK) {\r
                NetworkInternal->CurrentMode = ComM_Mode;\r
                ComM_BusSM_ModeIndication(NetworkHandle, ComM_Mode);                 /**< @req CANSM089 */\r
        }\r
 \r
-       return status;\r
+       return overallStatus;\r
 }\r
 \r
 /** @req CANSM039  @req CANSM044 */\r
 Std_ReturnType CanSM_Internal_RequestCanIfMode( NetworkHandleType NetworkHandle, ComM_ModeType ComM_Mode ) {\r
        const CanSM_NetworkType* Network = &CanSM_Config->Networks[NetworkHandle];\r
-       CanIf_ControllerModeType CanIf_Mode;\r
+       CanIf_ControllerModeType CanIf_Mode = CANIF_CS_STARTED;\r
+       Std_ReturnType totalStatus = E_OK;\r
 \r
        switch (ComM_Mode) {\r
                case COMM_NO_COMMUNICATION:\r
@@ -116,17 +123,18 @@ Std_ReturnType CanSM_Internal_RequestCanIfMode( NetworkHandleType NetworkHandle,
                        CanIf_Mode = CANIF_CS_STARTED;\r
                        break;\r
                default:\r
-                       return E_NOT_OK;\r
+                       totalStatus = E_NOT_OK;\r
                        break;\r
        }\r
 \r
-       Std_ReturnType totalStatus = E_OK;\r
-       for (int i = 0; i < Network->ControllerCount; ++i) {\r
-               const CanSM_ControllerType* Controller = &Network->Controllers[i];\r
-               Std_ReturnType status =\r
-                               CanIf_SetControllerMode(Controller->CanIfControllerId, CanIf_Mode);\r
-               if (status > totalStatus) {\r
-                       totalStatus = status;\r
+       if (totalStatus == E_OK) {\r
+               for (uint8 i = 0; i < Network->ControllerCount; ++i) {\r
+                       const CanSM_ControllerType* Controller = &Network->Controllers[i];\r
+                       Std_ReturnType status =\r
+                                       CanIf_SetControllerMode(Controller->CanIfControllerId, CanIf_Mode);\r
+                       if (status > totalStatus) {\r
+                               totalStatus = status;\r
+                       }\r
                }\r
        }\r
        return totalStatus;\r
@@ -135,6 +143,7 @@ Std_ReturnType CanSM_Internal_RequestCanIfMode( NetworkHandleType NetworkHandle,
 /** @req CANSM173 */\r
 Std_ReturnType CanSM_Internal_RequestComGroupMode( NetworkHandleType NetworkHandle, ComM_ModeType ComM_Mode ) {\r
        const CanSM_NetworkType* Network = &CanSM_Config->Networks[NetworkHandle];\r
+       Std_ReturnType status = E_OK;\r
 \r
        switch (ComM_Mode) {\r
                case COMM_NO_COMMUNICATION:\r
@@ -150,10 +159,10 @@ Std_ReturnType CanSM_Internal_RequestComGroupMode( NetworkHandleType NetworkHand
                        Com_IpduGroupStart(Network->ComTxPduGroupId, FALSE);\r
                        break;\r
                default:\r
-                       return E_NOT_OK;\r
+                       status = E_NOT_OK;\r
                        break;\r
        }\r
-       return E_OK;\r
+       return status;\r
 }\r
 \r
 /** @req CANSM090  @req CANSM185  @req CANSM187  @req CANSM186  @req CANSM188 */\r
@@ -165,7 +174,7 @@ Std_ReturnType CanSM_GetCurrentComMode( NetworkHandleType NetworkHandle, ComM_Mo
 \r
        const CanSM_NetworkType* Network = &CanSM_Config->Networks[NetworkHandle];\r
        Std_ReturnType totalStatus = E_OK;\r
-       for (int i = 0; i < Network->ControllerCount; ++i) {\r
+       for (uint8 i = 0; i < Network->ControllerCount; ++i) {\r
                const CanSM_ControllerType* Controller = &Network->Controllers[i];\r
                CanIf_ControllerModeType CanIf_Mode;\r
                Std_ReturnType status =\r

diff --git a/include/CanSM.h b/include/CanSM.h
index 3c7a2161e2732c5e635d38bb12e7dfdc55f83956..9a42658906846c4d47b97147c8bdcf0878d617e8 100644 (file)
--- a/include/CanSM.h
+++ b/include/CanSM.h
@@ -68,7 +68,7 @@ typedef enum {
        CANSM_BOR_CHECK_L1, /**<  Bus-off recovery level 1 state, TX enabled again */\r
        CANSM_BOR_TXOFF_L2, /**<  Bus-off recovery level 2 state, TX disabled */\r
        CANSM_BOR_CHECK_L2 /**<  Bus-off recovery level 2 state, TX enabled again */\r
-};\r
+} CanSM_BusOffRecoveryStateType; /** @req CANSM169 */\r
 \r
 /** @req CANSM037 */\r
 \r