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

-/******************** (C) COPYRIGHT 2006 STMicroelectronics ********************
+/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
 * File Name          : 91x_wdg.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 WDG software functions.
+* Description        : This file provides all the WDG 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
 /* Private variables ---------------------------------------------------------*/
 /* Registers reset value */
 /* Private function prototypes -----------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
-/******************************************************************************
-* Function Name  : WDG_DeInit
-* Description    : Deinitializes the WDG peripheral registers to their default
-*                  reset values.
-* Input          : None
-* Output         : None
-* Return         : None
-*******************************************************************************/
-void WDG_DeInit(void)
-{
-  SCU_APBPeriphReset(__WDG, ENABLE);  /*WDG peripheral under Reset */
-  SCU_APBPeriphReset(__WDG, DISABLE);  /*WDG peripheral Reset off*/
-}
 /*******************************************************************************
 * Function Name  : WDG_StructInit
 * Description    : Fills the WDG_InitTypeDef structure member with its reset
 *                  value.
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void WDG_StructInit(WDG_InitTypeDef *WDG_InitStruct)
+{
-  /* Select the Watchdog running mode*/
-  WDG_InitStruct->WDG_Mode = WDG_Mode_Timer;
   /* Select the source clock */
   WDG_InitStruct-> WDG_ClockSource = WDG_ClockSource_Apb;
+  {
     /* Select the RTC clock as source */
     WDG->CR |= WDG_ClockSource_Rtc ;
+  }
   /* Configure WDG Prescaler register value */
   WDG->PR = WDG_InitStruct->WDG_Prescaler;
-  /* Configure WDG Pre-load register value */
-  WDG->VR = WDG_InitStruct->WDG_Preload ;
-  if(WDG_InitStruct->WDG_Mode == WDG_Mode_Timer)
-  {
-    /* Select Timer mode */
-    WDG->CR &= WDG_Mode_Timer;
-  }
-  else
-  {
-    /* Select WDG mode */
-    WDG->CR |= WDG_Mode_Wdg ;
   /* Configure WDG Pre-load register value */
   WDG->VR = WDG_InitStruct->WDG_Preload ;
 }
 /*******************************************************************************
-* Function Name  : WDG_Cmd
+* Function Name  : WDG_TimerModeCmd
-* Description    : Enables or disables the WDG peripheral.
+* Description    : Enables or disables the WDG timer mode
 * Input          : NewState: new state of the WDG peripheral (Newstate can be
 *                  ENABLE or DISABLE)
 * Output         : None
-* Return         : None
-*******************************************************************************/
-void WDG_Cmd(FunctionalState NewState )
 * Return         : None
-  if((WDG->CR & WDG_Mode_Wdg) == 0)
+*******************************************************************************/
 void WDG_TimerModeCmd(FunctionalState NewState)
     /* Timer mode */
     if(NewState == ENABLE)
+    {
       /* Start timer by setting SC bit in Control register */
       WDG->CR |= WDG_Counter_Start;
+    }
     else
     {
-      /* Stop timer by clearning SC bit in Control register */
-      WDG->CR &= WDG_Counter_Stop;
+      /* Stop timer by clearning SC bit in Control register */
+      WDG->CR &= WDG_Counter_Stop;
+    }
-    }
+}
+/*******************************************************************************
-  }
+* Function Name  : WDG_StartWatchdogMode
+* Description    : Starts the watchdog mode
+* Input          : None
-  else
+* Output         : None
+* Return         : None
-  {
+*******************************************************************************/
-    /* Watchdog mode */
+void WDG_StartWatchdogMode(void)
-    if(NewState == ENABLE)
-    {
+{
+   /*reload watchdog*/
+   WDG->KR = WDG_KeyValue1;
-      WDG->KR = WDG_KeyValue1;
+   WDG->KR = WDG_KeyValue2;
       WDG->KR = WDG_KeyValue2;
    /*start watchdog*/
    WDG->CR |= WDG_Mode_Wdg;
 u16 WDG_GetCounter(void)
+{
    return WDG->CNT;
+}
 /*******************************************************************************
 * Function Name  : WDG_GetITStatus
 * Description    : Checks whether the WDG End of Count(EC) interrupt is occured or not.
 * Input          : None
 void WDG_ClearFlag(void)
+{
  /* Clear the EC Flag */
-  WDG->SR &= ~WDG_FLAG_EC;
   WDG->SR &= ~WDG_FLAG_EC;
-}
+}
 /*******************************************************************************
 * Function Name  : WDG_GetFlagStatus
 * Description    : Checks whether the WDG End of Count(EC) flag is set or not.
+  {
     return RESET;
+  }
+}
+/*******************************************************************************
+* Function Name  : WDG_Reload
+* Description    : reloads the watchdog counter in watchdog mode
+* Input          : None
+* Output         : None
+* Return         : none
+*******************************************************************************/
+void WDG_Reload(void)
+{
+  WDG->KR = WDG_KeyValue1;
+  WDG->KR = WDG_KeyValue2;
+}

Subversion Repositories NaviCtrl

(root)/tags/V0.26f/libstr91x/src/91x_wdg.c @ 347 - Rev 1 → 196