Solved ticket #94

Removed compiler warnings.

diff --git a/communication/CanIf/CanIf.c b/communication/CanIf/CanIf.c
index 4f39bcc97f8c17467fa8fd310eb42df72a814ce5..b7f0243e01dee0cbc501265fa2803ac0ab39c1b6 100644 (file)
--- a/communication/CanIf/CanIf.c
+++ b/communication/CanIf/CanIf.c
@@ -67,6 +67,7 @@
 #else\r
 #define VALIDATE(_exp,_api,_err )\r
 #define VALIDATE_NO_RV(_exp,_api,_err )\r
+#undef DET_REPORTERROR\r
 #define DET_REPORTERROR(_x,_y,_z,_q)\r
 #endif\r
 \r
@@ -147,30 +148,17 @@ void CanIf_Init(const CanIf_ConfigType *ConfigPtr)
 /*\r
  * Controller :: CanIf_Arc_ChannelIdType (CanIf-specific id to abstract from Can driver/controllers)\r
  * ConfigurationIndex :: CanIf_Arc_ConfigurationIndexType\r
- *   /tojo\r
  */\r
 void CanIf_InitController(uint8 Controller, uint8 ConfigurationIndex)\r
 {\r
   // We call this a CanIf channel. Hopefully makes it easier to follow.\r
   CanIf_Arc_ChannelIdType channel = Controller;\r
+  CanIf_ControllerModeType mode;\r
 \r
   VALIDATE_NO_RV(CanIf_Global.initRun, CANIF_INIT_CONTROLLER_ID, CANIF_E_UNINIT );\r
   VALIDATE_NO_RV(channel < CANIF_CHANNEL_CNT, CANIF_INIT_CONTROLLER_ID, CANIF_E_PARAM_CONTROLLER);\r
   VALIDATE_NO_RV(ConfigurationIndex < CANIF_CHANNEL_CONFIGURATION_CNT, CANIF_INIT_CONTROLLER_ID, CANIF_E_PARAM_POINTER);\r
 \r
-#if (CANIF_DEV_ERROR_DETECT == STD_ON)\r
-  CanIf_ControllerModeType mode;\r
-\r
-  if (CanIf_GetControllerMode(channel, &mode) == E_OK)\r
-  {\r
-    VALIDATE_NO_RV((mode != CANIF_CS_UNINIT), CANIF_INIT_CONTROLLER_ID, CANIF_E_PARAM_CONTROLLER_MODE );\r
-  }\r
-  else\r
-  {\r
-    VALIDATE_NO_RV(FALSE, CANIF_INIT_CONTROLLER_ID, CANIF_E_PARAM_CONTROLLER_MODE);\r
-  }\r
-#endif\r
-\r
   if (CanIf_GetControllerMode(channel, &mode) == E_OK)\r
   {\r
     if (mode == CANIF_CS_STARTED)\r
@@ -180,7 +168,11 @@ void CanIf_InitController(uint8 Controller, uint8 ConfigurationIndex)
     else if (mode != CANIF_CS_STOPPED)\r
     {\r
       VALIDATE_NO_RV(FALSE, CANIF_INIT_CONTROLLER_ID, CANIF_E_PARAM_CONTROLLER_MODE); // CANIF092\r
-   }\r
+    }\r
+  }\r
+  else\r
+  {\r
+    VALIDATE_NO_RV(FALSE, CANIF_INIT_CONTROLLER_ID, CANIF_E_PARAM_CONTROLLER_MODE);\r
   }\r
 \r
   // CANIF293: ..Subsequently the CAN Interface calls the corresponding\r
@@ -859,8 +851,10 @@ void CanIf_ControllerBusOff(uint8 Controller)
 \r
 void CanIf_SetWakeupEvent(uint8 Controller)\r
 {\r
+#if  ( CANIF_DEV_ERROR_DETECT == STD_ON )\r
   // We call this a CanIf channel. Hopefully makes it easier to follow.\r
   CanIf_Arc_ChannelIdType channel = Controller;\r
+#endif\r
 \r
   VALIDATE_NO_RV(FALSE, CANIF_SETWAKEUPEVENT_ID, CANIF_E_NOK_NOSUPPORT);\r
   VALIDATE_NO_RV( CanIf_Global.initRun, CANIF_SETWAKEUPEVENT_ID, CANIF_E_UNINIT );\r
@@ -871,8 +865,10 @@ void CanIf_SetWakeupEvent(uint8 Controller)
 \r
 void CanIf_Arc_Error(uint8 Controller, Can_Arc_ErrorType Error)\r
 {\r
+#if  ( CANIF_DEV_ERROR_DETECT == STD_ON )\r
   // We call this a CanIf channel. Hopefully makes it easier to follow.\r
   CanIf_Arc_ChannelIdType channel = Controller;\r
+#endif\r
 \r
   VALIDATE_NO_RV( CanIf_Global.initRun, CANIF_ARCERROR_ID, CANIF_E_UNINIT );\r
   VALIDATE_NO_RV( channel < CANIF_CHANNEL_CNT, CANIF_ARCERROR_ID, CANIF_E_PARAM_CONTROLLER );\r