Splitting of Adc to eQADC and Adc_560x......continued....now for all architectures...

diff --git a/arch/arm/arm_cm3/drivers/Adc.c b/arch/arm/arm_cm3/drivers/Adc.c
index 338d188e7dca007f00a19382012aef7d870b7cd5..0559027963f725b807b08e8489e8b37b5a6446e1 100644 (file)
--- a/arch/arm/arm_cm3/drivers/Adc.c
+++ b/arch/arm/arm_cm3/drivers/Adc.c
@@ -43,23 +43,20 @@ static const Adc_ConfigType *AdcConfigPtr;
 \r
 \r
 #if (ADC_DEINIT_API == STD_ON)\r
-Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)\r
+void Adc_DeInit ()\r
 {\r
-       if (E_OK == Adc_CheckDeInit(adcState, ConfigPtr))\r
+       if (E_OK == Adc_CheckDeInit(adcState, AdcConfigPtr))\r
        {\r
          DMA_DeInit(DMA1_Channel1);\r
          ADC_DeInit(ADC1);\r
 \r
          adcState = ADC_UNINIT;\r
        }\r
-\r
-    return (E_OK);\r
 }\r
 #endif\r
 \r
-Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)\r
+void Adc_Init (const Adc_ConfigType *ConfigPtr)\r
 {\r
-  Std_ReturnType returnValue;\r
   Adc_GroupType group;\r
 \r
   ADC_InitTypeDef ADC_InitStructure;\r
@@ -130,14 +127,7 @@ Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)
 \r
     /* Move on to INIT state. */\r
     adcState = ADC_INIT;\r
-    returnValue = E_OK;\r
   }\r
-  else\r
-  {\r
-    returnValue = E_NOT_OK;\r
-  }\r
-\r
-  return (returnValue);\r
 }\r
 \r
 Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *bufferPtr)\r
@@ -145,7 +135,7 @@ Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *b
   Std_ReturnType returnValue;\r
 \r
   /* Check for development errors. */\r
-  if (E_OK == Adc_CheckSetupResultBuffer (AdcConfigPtr, group))\r
+  if (E_OK == Adc_CheckSetupResultBuffer (adcState, AdcConfigPtr, group))\r
   {\r
     AdcConfigPtr->groupConfigPtr[group].status->resultBufferPtr = bufferPtr;\r
     DMA_Cmd(DMA1_Channel1, DISABLE);\r

diff --git a/arch/hc1x/hcs12d/drivers/Adc.c b/arch/hc1x/hcs12d/drivers/Adc.c
index a8e95da61b571637c0dfa6ca6a082c4b7d3e7f0a..a861b8eaa52396e720f0c1360825fb7754b97b02 100644 (file)
--- a/arch/hc1x/hcs12d/drivers/Adc.c
+++ b/arch/hc1x/hcs12d/drivers/Adc.c
@@ -76,22 +76,19 @@ static const Adc_ConfigType *AdcConfigPtr;
 \r
 \r
 #if (ADC_DEINIT_API == STD_ON)\r
-Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)\r
+void Adc_DeInit ()\r
 {\r
-       if (E_OK == Adc_CheckDeInit(adcState, ConfigPtr))\r
+       if (E_OK == Adc_CheckDeInit(adcState, AdcConfigPtr))\r
        {\r
            /* Clean internal status. */\r
            AdcConfigPtr = (Adc_ConfigType *)NULL;\r
            adcState = ADC_UNINIT;\r
        }\r
-\r
-        return (E_OK);\r
 }\r
 #endif\r
 \r
-Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)\r
+void Adc_Init (const Adc_ConfigType *ConfigPtr)\r
 {\r
-  Std_ReturnType returnValue;\r
   Adc_GroupType group;\r
 \r
   if (E_OK == Adc_CheckInit(adcState, ConfigPtr))\r
@@ -118,14 +115,7 @@ Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)
 \r
     /* Move on to INIT state. */\r
     adcState = ADC_INIT;\r
-    returnValue = E_OK;\r
   }\r
-  else\r
-  {\r
-    returnValue = E_NOT_OK;\r
-  }\r
-\r
-  return (returnValue);\r
 }\r
 \r
 Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *bufferPtr)\r
@@ -133,7 +123,7 @@ Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *b
   Std_ReturnType returnValue;\r
 \r
   /* Check for development errors. */\r
-  if (E_OK == Adc_CheckSetupResultBuffer (AdcConfigPtr, group))\r
+  if (E_OK == Adc_CheckSetupResultBuffer (adcState, AdcConfigPtr, group))\r
   {\r
     AdcConfigPtr->groupConfigPtr[group].status->resultBufferPtr = bufferPtr;\r
     returnValue = E_OK;\r

diff --git a/arch/ppc/mpc55xx/drivers/Adc_560x.c b/arch/ppc/mpc55xx/drivers/Adc_560x.c
index e60f6e709c4ddf20484d9a0308bfea967bf1e278..d8d75823465852fbdfeda54317a7c43e75ac541f 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Adc_560x.c
+++ b/arch/ppc/mpc55xx/drivers/Adc_560x.c
@@ -54,11 +54,9 @@ static const Adc_ConfigType *AdcConfigPtr;      /* Pointer to configuration stru
 \r
 \r
 #if (ADC_DEINIT_API == STD_ON)\r
-Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)\r
+void Adc_DeInit ()\r
 {\r
-  (void)ConfigPtr;\r
-\r
-  if (E_OK == Adc_CheckDeInit(adcState, ConfigPtr))\r
+  if (E_OK == Adc_CheckDeInit(adcState, AdcConfigPtr))\r
   {\r
     for(Adc_GroupType group = (Adc_GroupType)ADC_GROUP0; group < AdcConfigPtr->nbrOfGroups; group++)\r
     {\r
@@ -80,12 +78,10 @@ Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)
     AdcConfigPtr = (Adc_ConfigType *)NULL;\r
     adcState = ADC_UNINIT;\r
   }\r
-\r
-  return (E_OK);\r
 }\r
 #endif\r
 \r
-Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)\r
+void Adc_Init (const Adc_ConfigType *ConfigPtr)\r
 {\r
   if (E_OK == Adc_CheckInit(adcState, ConfigPtr))\r
   {\r
@@ -99,11 +95,6 @@ Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)
 \r
             /* Move on to INIT state. */\r
             adcState = ADC_INIT;\r
-            return E_OK;\r
-  }\r
-  else\r
-  {\r
-    return E_NOT_OK;\r
   }\r
 }\r
 \r
@@ -112,7 +103,7 @@ Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *b
   Std_ReturnType returnValue = E_NOT_OK;\r
 \r
   /* Check for development errors. */\r
-  if (E_OK == Adc_CheckSetupResultBuffer (AdcConfigPtr, group))\r
+  if (E_OK == Adc_CheckSetupResultBuffer (adcState, AdcConfigPtr, group))\r
   {\r
     AdcConfigPtr->groupConfigPtr[group].status->resultBufferPtr = bufferPtr;\r
     \r

diff --git a/arch/ppc/mpc55xx/drivers/Adc_eQADC.c b/arch/ppc/mpc55xx/drivers/Adc_eQADC.c
index def15f967d94536541106a2acaceae9946bcb5d3..1865ceb757be62f7949a507a08cd32a8df17ed5d 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Adc_eQADC.c
+++ b/arch/ppc/mpc55xx/drivers/Adc_eQADC.c
@@ -208,15 +208,13 @@ static Adc_StateType adcState = ADC_UNINIT;
 static const Adc_ConfigType *AdcConfigPtr;      /* Pointer to configuration structure. */\r
 \r
 #if (ADC_DEINIT_API == STD_ON)\r
-Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)\r
+void Adc_DeInit ()\r
 {\r
-  (void)ConfigPtr;\r
-\r
   Adc_eQADCQueueType queue;\r
   Adc_GroupType group;\r
   boolean queueStopped;\r
 \r
-  if (E_OK == Adc_CheckDeInit(adcState, ConfigPtr))\r
+  if (E_OK == Adc_CheckDeInit(adcState, AdcConfigPtr))\r
   {\r
     /* Stop all queues. */\r
     for (queue = ADC_EQADC_QUEUE_0; queue < ADC_EQADC_NBR_OF_QUEUES; queue++)\r
@@ -288,13 +286,11 @@ Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)
     AdcConfigPtr = (Adc_ConfigType *)NULL;\r
     adcState = ADC_UNINIT;\r
   }\r
-  return (E_OK);\r
 }\r
 #endif\r
 \r
-Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)\r
+void Adc_Init (const Adc_ConfigType *ConfigPtr)\r
 {\r
-  Std_ReturnType returnValue;\r
   Adc_InternalChannelIdType channel;\r
   Adc_InternalChannelIdType channelId;\r
   Adc_GroupType group;\r
@@ -370,14 +366,7 @@ Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr)
 \r
     /* Move on to INIT state. */\r
     adcState = ADC_INIT;\r
-    returnValue = E_OK;\r
   }\r
-  else\r
-  {\r
-    returnValue = E_NOT_OK;\r
-  }\r
-\r
-  return (returnValue);  \r
 }\r
 \r
 Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *bufferPtr)\r
@@ -385,7 +374,7 @@ Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *b
   Std_ReturnType returnValue = E_NOT_OK;\r
 \r
   /* Check for development errors. */\r
-  if (E_OK == Adc_CheckSetupResultBuffer (AdcConfigPtr, group))\r
+  if (E_OK == Adc_CheckSetupResultBuffer (adcState, AdcConfigPtr, group))\r
   {\r
     AdcConfigPtr->groupConfigPtr[group].status->resultBufferPtr = bufferPtr;\r
     \r

diff --git a/drivers/Adc_Internal.c b/drivers/Adc_Internal.c
index de0c52c96216d62582080aca81991e3e40e946e2..fc352186f227ca8dfade964a71a75df4f5f62c86 100644 (file)
--- a/drivers/Adc_Internal.c
+++ b/drivers/Adc_Internal.c
@@ -279,12 +279,13 @@ Std_ReturnType Adc_CheckDeInit (Adc_StateType adcState, const Adc_ConfigType *Co
 }\r
 #endif\r
 \r
-Std_ReturnType Adc_CheckSetupResultBuffer (const Adc_ConfigType *ConfigPtr, Adc_GroupType group)\r
+Std_ReturnType Adc_CheckSetupResultBuffer (Adc_StateType adcState, const Adc_ConfigType *ConfigPtr, Adc_GroupType group)\r
 {\r
   Std_ReturnType returnValue = E_OK;\r
 \r
 #if ( ADC_DEV_ERROR_DETECT == STD_ON )\r
-  if(ValidateGroup(ConfigPtr, group, ADC_SETUPRESULTBUFFER_ID) == E_NOT_OK)\r
+  if( (ValidateInit(adcState, ADC_SETUPRESULTBUFFER_ID) == E_NOT_OK) ||\r
+           (ValidateGroup(ConfigPtr, group, ADC_SETUPRESULTBUFFER_ID) == E_NOT_OK))\r
   {\r
          returnValue = E_NOT_OK;\r
   }\r

diff --git a/drivers/Adc_Internal.h b/drivers/Adc_Internal.h
index 51a56855fc2867857a82f008b56406770fbf37d7..c94b52e04275e0dc269d124a67263d0a26000961 100644 (file)
--- a/drivers/Adc_Internal.h
+++ b/drivers/Adc_Internal.h
@@ -39,7 +39,7 @@ Std_ReturnType Adc_CheckInit (Adc_StateType adcState, const Adc_ConfigType *Conf
 #if (ADC_DEINIT_API == STD_ON)\r
 Std_ReturnType Adc_CheckDeInit (Adc_StateType adcState, const Adc_ConfigType *ConfigPtr);\r
 #endif\r
-Std_ReturnType Adc_CheckSetupResultBuffer (const Adc_ConfigType *ConfigPtr, Adc_GroupType group);\r
+Std_ReturnType Adc_CheckSetupResultBuffer (Adc_StateType adcState, const Adc_ConfigType *ConfigPtr, Adc_GroupType group);\r
 Std_ReturnType Adc_CheckGetStreamLastPointer (Adc_StateType adcState, const Adc_ConfigType *ConfigPtr, Adc_GroupType group);\r
 \r
 #endif /* ADC_INTERNAL_H_ */\r

diff --git a/include/Adc.h b/include/Adc.h
index a803fc9a31be5cc8af21b1ec70d0fbf7672d55a1..066cc93c7c352693df47dbc5af31481d3753be1e 100644 (file)
--- a/include/Adc.h
+++ b/include/Adc.h
@@ -117,10 +117,10 @@ typedef enum
 \r
 /* Function interface. */\r
 /** Initializes the ADC hardware units and driver. */\r
-Std_ReturnType Adc_Init (const Adc_ConfigType *ConfigPtr);\r
+void Adc_Init (const Adc_ConfigType *ConfigPtr);\r
 #if (ADC_DEINIT_API == STD_ON)\r
 /** Returns all ADC HW Units to a state comparable to their power on reset state. */\r
-Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr);\r
+void Adc_DeInit ();\r
 #endif\r
 /** Sets up the result buffer for a group. */\r
 Std_ReturnType Adc_SetupResultBuffer (Adc_GroupType group, Adc_ValueGroupType *bufferPtr);\r