Removed compilation warnings.

diff --git a/arch/arm/arm_cm3/drivers/Dio.c b/arch/arm/arm_cm3/drivers/Dio.c
index 14eb34ec6f15f074fd9d5d5133f873c35c0c3008..7ca8cad35a78fe381dc22c4ff9084c901029f3db 100644 (file)
--- a/arch/arm/arm_cm3/drivers/Dio.c
+++ b/arch/arm/arm_cm3/drivers/Dio.c
@@ -107,7 +107,10 @@ Dio_PortLevelType Dio_ReadPort(Dio_PortType portId)
 \r
        level = GPIO_ReadInputData(GPIO_ports[portId]);\r
 \r
-       cleanup: return level;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return level;\r
 }\r
 \r
 void Dio_WritePort(Dio_PortType portId, Dio_PortLevelType level)\r
@@ -116,7 +119,10 @@ void Dio_WritePort(Dio_PortType portId, Dio_PortLevelType level)
 \r
        GPIO_Write(GPIO_ports[portId], level);\r
 \r
-    cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return;\r
 }\r
 \r
 Dio_LevelType Dio_ReadChannel(Dio_ChannelType channelId)\r
@@ -133,7 +139,10 @@ Dio_LevelType Dio_ReadChannel(Dio_ChannelType channelId)
                level = STD_LOW;\r
        }\r
 \r
-       cleanup: return (level);\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return (level);\r
 }\r
 \r
 void Dio_WriteChannel(Dio_ChannelType channelId, Dio_LevelType level)\r
@@ -151,7 +160,10 @@ void Dio_WriteChannel(Dio_ChannelType channelId, Dio_LevelType level)
 \r
        Dio_WritePort(DIO_GET_PORT_FROM_CHANNEL_ID(channelId), portVal);\r
 \r
-       cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return;\r
 }\r
 \r
 \r
@@ -167,7 +179,10 @@ Dio_PortLevelType Dio_ReadChannelGroup(
        // Shift down\r
        level = level >> channelGroupIdPtr->offset;\r
 \r
-       cleanup: return level;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return level;\r
 }\r
 \r
 void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,\r
@@ -186,7 +201,10 @@ void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,
 \r
        Dio_WritePort(channelGroupIdPtr->port, portVal);\r
 \r
-       cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return;\r
 }\r
 \r
 \r

diff --git a/arch/arm/arm_cm3/drivers/Port.c b/arch/arm/arm_cm3/drivers/Port.c
index 89ef9766fa624585f16ea2f26d3baff18a32883b..c2ad9c2c83cd4fae4203e4221c3be29291089d36 100644 (file)
--- a/arch/arm/arm_cm3/drivers/Port.c
+++ b/arch/arm/arm_cm3/drivers/Port.c
@@ -70,6 +70,7 @@ static Port_ConfigType * _configPtr = NULL;
 #define VALIDATE_PARAM_PIN(_api)\r
 #endif\r
 \r
+#if (PORT_VERSION_INFO_API == STD_ON)\r
 static Std_VersionInfoType _Port_VersionInfo =\r
 { .vendorID = (uint16)1, .moduleID = (uint16) MODULE_ID_PORT,\r
         .instanceID = (uint8)1,\r
@@ -79,6 +80,7 @@ static Std_VersionInfoType _Port_VersionInfo =
         .ar_major_version = (uint8)PORT_AR_MAJOR_VERSION,\r
         .ar_minor_version = (uint8)PORT_AR_MINOR_VERSION,\r
         .ar_patch_version = (uint8)PORT_AR_PATCH_VERSION, };\r
+#endif\r
 \r
 /** @req PORT140 */\r
 /** @req PORT041 Comment: To reduce flash usage the configuration tool can disable configuration of some ports  */\r

diff --git a/arch/arm/arm_cr4/drivers/Dio.c b/arch/arm/arm_cr4/drivers/Dio.c
index 74bd21185fbdf99b31983ecb2cdacfd25e135f07..44c5db75f54f614ff2299be0c278e9e2d54fa510 100644 (file)
--- a/arch/arm/arm_cr4/drivers/Dio.c
+++ b/arch/arm/arm_cr4/drivers/Dio.c
@@ -102,7 +102,10 @@ Dio_PortLevelType Dio_ReadPort(Dio_PortType portId)
 \r
        level = (uint8)GPIO_ports[portId]->DIN;\r
 \r
-       cleanup: return level;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return level;\r
 }\r
 \r
 void Dio_WritePort(Dio_PortType portId, Dio_PortLevelType level)\r
@@ -111,7 +114,10 @@ void Dio_WritePort(Dio_PortType portId, Dio_PortLevelType level)
 \r
        GPIO_ports[portId]->DOUT = (uint32)level;\r
 \r
-    cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return;\r
 }\r
 \r
 Dio_LevelType Dio_ReadChannel(Dio_ChannelType channelId)\r
@@ -128,7 +134,10 @@ Dio_LevelType Dio_ReadChannel(Dio_ChannelType channelId)
                level = STD_LOW;\r
        }\r
 \r
-       cleanup: return (level);\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return (level);\r
 }\r
 \r
 void Dio_WriteChannel(Dio_ChannelType channelId, Dio_LevelType level)\r
@@ -168,7 +177,10 @@ Dio_PortLevelType Dio_ReadChannelGroup(
        // Shift down\r
        level = level >> channelGroupIdPtr->offset;\r
 \r
-       cleanup: return level;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return level;\r
 }\r
 \r
 void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,\r
@@ -187,7 +199,10 @@ void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,
 \r
        Dio_WritePort(channelGroupIdPtr->port, portVal);\r
 \r
-       cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+       cleanup:\r
+#endif\r
+       return;\r
 }\r
 \r
 \r

diff --git a/arch/ppc/mpc55xx/drivers/Dio.c b/arch/ppc/mpc55xx/drivers/Dio.c
index 9de43cb38cceda6405f8da88d3ee6feaf7c4fd72..ab437be466e85abbec089c4d9c2bebf47ea7de48 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Dio.c
+++ b/arch/ppc/mpc55xx/drivers/Dio.c
@@ -115,7 +115,10 @@ Dio_LevelType Dio_ReadChannel(Dio_ChannelType channelId)
   {\r
     level = STD_LOW;\r
   }\r
-  cleanup: return (level);\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+  cleanup:\r
+#endif\r
+  return (level);\r
 }\r
 \r
 void Dio_WriteChannel(Dio_ChannelType channelId, Dio_LevelType level)\r
@@ -123,7 +126,10 @@ void Dio_WriteChannel(Dio_ChannelType channelId, Dio_LevelType level)
   VALIDATE_CHANNEL(channelId, DIO_WRITECHANNEL_ID);\r
   // Write level to SIU.\r
   SIU.GPDO [channelId].R = level;\r
-  cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+  cleanup:\r
+#endif\r
+  return;\r
 }\r
 \r
 Dio_PortLevelType Dio_ReadPort(Dio_PortType portId)\r
@@ -137,7 +143,10 @@ Dio_PortLevelType Dio_ReadPort(Dio_PortType portId)
   vuint16_t *ptr = (vuint16_t *)&SIU.PGPDI0; // The GPDI 0-3 is organized in 32bit chunks but we want to step them in 16bit port-widths\r
 #endif\r
   level = ptr[portId]; // Read the bit pattern (16bits) to the port\r
-  cleanup: return level;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+  cleanup:\r
+#endif\r
+  return level;\r
 }\r
 \r
 void Dio_WritePort(Dio_PortType portId, Dio_PortLevelType level)\r
@@ -151,7 +160,10 @@ void Dio_WritePort(Dio_PortType portId, Dio_PortLevelType level)
   vuint16_t *ptr = (vuint16_t *)&SIU.PGPDO0; // The GPDO 0-3 is organized in 32bit chunks but we want to step them in 16bit port-widths\r
 #endif\r
   ptr[portId] = level; // Write the bit pattern (16bits) to the port\r
-  cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+  cleanup:\r
+#endif\r
+  return;\r
 }\r
 \r
 Dio_PortLevelType Dio_ReadChannelGroup(\r
@@ -172,7 +184,10 @@ Dio_PortLevelType Dio_ReadChannelGroup(
 \r
   // Shift down\r
   level<<=channelGroupIdPtr->offset;\r
-  cleanup: return level;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+  cleanup:\r
+#endif\r
+  return level;\r
 }\r
 \r
 void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,\r
@@ -186,7 +201,10 @@ void Dio_WriteChannelGroup(const Dio_ChannelGroupType *channelGroupIdPtr,
   // Build the 32 bits Mask_Valule, and write to masked output register\r
   ptr[channelGroupIdPtr->port] = (channelGroupIdPtr->mask << 16)&((level\r
       <<channelGroupIdPtr->offset)|0xFFFF);\r
-  cleanup: return;\r
+#if ( DIO_DEV_ERROR_DETECT == STD_ON )\r
+  cleanup:\r
+#endif\r
+  return;\r
 #else\r
   return;\r
 #endif\r