diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-19 17:40:35 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-19 17:40:35 +0000 |
| commit | b2ebb161d494864cdbee05ee8b74a775845e238e (patch) | |
| tree | 26b91e9c0570fc1ff94ee89221e62fec828458e5 /stm/lib/stm32f4xx_exti.c | |
| parent | 127775381282c854031302173eedbd5046eb1601 (diff) | |
stm: Upgrade ST peripheral library from 1.1.0 to 1.3.0.
Diffstat (limited to 'stm/lib/stm32f4xx_exti.c')
| -rw-r--r-- | stm/lib/stm32f4xx_exti.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/stm/lib/stm32f4xx_exti.c b/stm/lib/stm32f4xx_exti.c index 6160cbd7b..4eb676417 100644 --- a/stm/lib/stm32f4xx_exti.c +++ b/stm/lib/stm32f4xx_exti.c @@ -2,8 +2,8 @@ ******************************************************************************
* @file stm32f4xx_exti.c
* @author MCD Application Team
- * @version V1.1.0
- * @date 11-January-2013
+ * @version V1.3.0
+ * @date 08-November-2013
* @brief This file provides firmware functions to manage the following
* functionalities of the EXTI peripheral:
* + Initialization and Configuration
@@ -65,7 +65,6 @@ */
/* Includes ------------------------------------------------------------------*/
-#include "stm32f4xx_conf.h"
#include "stm32f4xx_exti.h"
/** @addtogroup STM32F4xx_StdPeriph_Driver
@@ -264,13 +263,11 @@ void EXTI_ClearFlag(uint32_t EXTI_Line) */
ITStatus EXTI_GetITStatus(uint32_t EXTI_Line)
{
- ITStatus bitstatus = RESET;
- uint32_t enablestatus = 0;
+ FlagStatus bitstatus = RESET;
/* Check the parameters */
assert_param(IS_GET_EXTI_LINE(EXTI_Line));
- enablestatus = EXTI->IMR & EXTI_Line;
- if (((EXTI->PR & EXTI_Line) != (uint32_t)RESET) && (enablestatus != (uint32_t)RESET))
+ if ((EXTI->PR & EXTI_Line) != (uint32_t)RESET)
{
bitstatus = SET;
}
@@ -279,6 +276,7 @@ ITStatus EXTI_GetITStatus(uint32_t EXTI_Line) bitstatus = RESET;
}
return bitstatus;
+
}
/**
|