WebSVN - NaviCtrl - Diff - Rev 1 and 196 - /tags/V0.20c/libstr91x/src/91x

-/******************** (C) COPYRIGHT 2006 STMicroelectronics ********************
+/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
 * File Name          : 91x_adc.c
 * Author             : MCD Application Team
+* Version            : V2.1
-* Date First Issued  : 05/18/2006 : Version 1.0
+* Date               : 12/22/2008
-* Description        : This file provides all the ADC software functions.
+* Description        : This file provides all the ADC firmware functions.
-********************************************************************************
-* History:
-* 05/22/2007 : Version 1.2
-* 05/24/2006 : Version 1.1
-* 05/18/2006 : Version 1.0
 ********************************************************************************
 * THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS WITH
 * CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME. AS
 * A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT
 * OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void ADC_ClearFlag(u16 ADC_Flag)
+{
+  vu16 tmp=0;
   /* Clear the correspondent flag */
+   if (ADC_Flag==ADC_FLAG_ORD)
+   tmp = ADC->DDR;
+   else
-  ADC->CR |= (1<<(ADC_Flag & ADC_FLAG_MASK));
+   ADC->CR |= (1<<(ADC_Flag & ADC_FLAG_MASK));
+}
 /*******************************************************************************
 * Function Name  : ADC_GetConversionValue
 * Output         : None
 * Return         : The state of the comparision (SET or RESET).
 *******************************************************************************/
 FlagStatus ADC_GetAnalogWatchdogResult(u16 ADC_Channel)
+{
-  if (ADC->CRR & (1<<ADC_Channel) != RESET)
+  if ((ADC->CRR & (1<<ADC_Channel)) != RESET)
+  {
       return SET;
+  }
   else
+  {
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void ADC_ITConfig(u16 ADC_IT, FunctionalState ADC_NewState)
+{
-  if (ADC_NewState == ENABLE)
+ if (ADC_IT==ADC_IT_ORD)
+  {
+   if (ADC_NewState == ENABLE)
     /* Enable the interrupt */
-    ADC->CR |= ADC_IT;
+     ADC->CR2 |= ADC_IT;
+  else
+    /* Disable the interrupt */
+    ADC->CR2 &= ~ADC_IT;
+  }
+  else{
+   if (ADC_NewState == ENABLE)
+    /* Enable the interrupt */
+    ADC->CR |= ADC_IT;
   else
-  {
     /* Disable the interrupt */
     ADC->CR &= ~ADC_IT;
+  }
+  }
-}
 /*******************************************************************************
 * Function Name  : ADC_StandbyModeCmd
 * Description    : Enable or disable the standby mode.
+  {
     /* Stop the ADC conversion */
     ADC->CR &= ADC_Conversion_Stop;
+  }
+}
+/*******************************************************************************
+* Function Name  : ADC_ExternalTrigConfig
+* Description    : source and edge selection of external trigg
+* Input          : -ADC_ExtTrig_Src
+*                  This parameter can be one of the following values:
+*                     ADC_PWM_Trig    : PWM Trigger
+*                     ADC_TIM_Trig    : Timer Trigger
+*                     ADC_PIN_Trig    : External Trigger Pin
+*
+*                  -ADC_ExtTrig_Edge
+*                   This parameter can be one of the following values:
+*                   Falling_ETE        :Falling edge
+*                   Rising_ETE         :Rising edge
+* Output         : None
+* Return         : None
+*******************************************************************************/
+void ADC_ExternalTrigConfig(u16 ADC_ExtTrig_Src ,  u16 ADC_ExtTrig_Edge)
+  {
+   ADC->CR2 &= 0x3C;
+   ADC->CR2 |= ADC_ExtTrig_Src;
+   if (ADC_ExtTrig_Edge== Falling_ETE)
+   ADC->CR2 |= 0x20;
+   else
+   ADC->CR2 &=~0x20; ;
+  }
+/*******************************************************************************
+* Function Name  :  ADC_ExternalTrigCmd
+* Description    : Enable or disable the external trigg feature.
+* Input          : ADC_NewState:  Can be ENABLE or DISABLE
+* Output         : None
+* Return         : None
+*******************************************************************************/
+void ADC_ExternalTrigCmd(FunctionalState ADC_NewState)
+{
+if (ADC_NewState==ENABLE)
+  ADC->CR2 |= 0x04;
+  else
+  ADC->CR2  &=~0x04;
+}
+/*******************************************************************************
+* Function Name  : ADC_DMACmd
+* Description    : Enable or disable the DMA request for ADC
+* Input          : ADC_NewState:  Can be ENABLE or DISABLE
+* Output         : None
+* Return         : None
+*******************************************************************************/
+void ADC_DMACmd(FunctionalState ADC_NewState)
+{
+if (ADC_NewState==ENABLE)
+  ADC->CR2 |= 0x08;
+  else
+  ADC->CR2  &=~0x08;
+}
+/*******************************************************************************
+* Function Name  : ADC_AutomaticClockGatedCmd
+* Description    : Enables or disables the Automatic clock gated mode for Fast
+*                  Trigger mode (only in Rev H).
+* Input          : ADC_NewState:  Can be ENABLE or DISABLE
+* Output         : None
+* Return         : None
+*******************************************************************************/
+void ADC_AutomaticClockGatedCmd(FunctionalState ADC_NewState)
+{
+if (ADC_NewState==ENABLE)
+  SCU->GPIOANA |= 0x100;
+  else
+  SCU->GPIOANA  &=~0x100;
+}

Subversion Repositories NaviCtrl

(root)/tags/V0.20c/libstr91x/src/91x_adc.c @ 560 - Rev 1 → 196