stm: Upgrade ST peripheral library from 1.1.0 to 1.3.0.

1 files changed, 41 insertions, 19 deletions

diff --git a/stm/lib/stm32f4xx_pwr.h b/stm/lib/stm32f4xx_pwr.h
index 0212501f8e..4ce588db6d 100644
--- a/stm/lib/stm32f4xx_pwr.h
+++ b/stm/lib/stm32f4xx_pwr.h
@@ -2,8 +2,8 @@
   ******************************************************************************

   * @file    stm32f4xx_pwr.h

   * @author  MCD Application Team

-  * @version V1.1.0

-  * @date    11-January-2013

+  * @version V1.3.0

+  * @date    08-November-2013

   * @brief   This file contains all the functions prototypes for the PWR firmware 

   *          library.

   ******************************************************************************

@@ -55,7 +55,6 @@
 /** @defgroup PWR_PVD_detection_level 

   * @{

   */ 

-

 #define PWR_PVDLevel_0                  PWR_CR_PLS_LEV0

 #define PWR_PVDLevel_1                  PWR_CR_PLS_LEV1

 #define PWR_PVDLevel_2                  PWR_CR_PLS_LEV2

@@ -77,34 +76,52 @@
 /** @defgroup PWR_Regulator_state_in_STOP_mode 

   * @{

   */

+#define PWR_MainRegulator_ON                        ((uint32_t)0x00000000)

+#define PWR_LowPowerRegulator_ON                    PWR_CR_LPDS

+

+/* --- PWR_Legacy ---*/

+#define PWR_Regulator_ON                            PWR_MainRegulator_ON

+#define PWR_Regulator_LowPower                      PWR_LowPowerRegulator_ON

+

+#define IS_PWR_REGULATOR(REGULATOR) (((REGULATOR) == PWR_MainRegulator_ON) || \

+                                     ((REGULATOR) == PWR_LowPowerRegulator_ON))

 

-#define PWR_Regulator_ON                ((uint32_t)0x00000000)

-#define PWR_Regulator_LowPower          PWR_CR_LPDS

-#define IS_PWR_REGULATOR(REGULATOR) (((REGULATOR) == PWR_Regulator_ON) || \

-                                     ((REGULATOR) == PWR_Regulator_LowPower))

 /**

   * @}

   */

 

-/** @defgroup PWR_STOP_mode_entry 

+/** @defgroup PWR_Regulator_state_in_UnderDrive_mode 

   * @{

   */

+#define PWR_MainRegulator_UnderDrive_ON               PWR_CR_MRUDS

+#define PWR_LowPowerRegulator_UnderDrive_ON           ((uint32_t)(PWR_CR_LPDS | PWR_CR_LPUDS))

+

+#define IS_PWR_REGULATOR_UNDERDRIVE(REGULATOR) (((REGULATOR) == PWR_MainRegulator_UnderDrive_ON) || \

+                                                ((REGULATOR) == PWR_LowPowerRegulator_UnderDrive_ON))

+

+/**

+  * @}

+  */

 

+/** @defgroup PWR_STOP_mode_entry 

+  * @{

+  */

 #define PWR_STOPEntry_WFI               ((uint8_t)0x01)

 #define PWR_STOPEntry_WFE               ((uint8_t)0x02)

 #define IS_PWR_STOP_ENTRY(ENTRY) (((ENTRY) == PWR_STOPEntry_WFI) || ((ENTRY) == PWR_STOPEntry_WFE))

+/**

+  * @}

+  */

 

 /** @defgroup PWR_Regulator_Voltage_Scale 

   * @{

   */

-

 #define PWR_Regulator_Voltage_Scale1    ((uint32_t)0x0000C000)

 #define PWR_Regulator_Voltage_Scale2    ((uint32_t)0x00008000)

 #define PWR_Regulator_Voltage_Scale3    ((uint32_t)0x00004000)

 #define IS_PWR_REGULATOR_VOLTAGE(VOLTAGE) (((VOLTAGE) == PWR_Regulator_Voltage_Scale1) || \

                                            ((VOLTAGE) == PWR_Regulator_Voltage_Scale2) || \

                                            ((VOLTAGE) == PWR_Regulator_Voltage_Scale3))

- 

 /**

   * @}

   */

@@ -112,26 +129,27 @@
 /** @defgroup PWR_Flag 

   * @{

   */

-

 #define PWR_FLAG_WU                     PWR_CSR_WUF

 #define PWR_FLAG_SB                     PWR_CSR_SBF

 #define PWR_FLAG_PVDO                   PWR_CSR_PVDO

 #define PWR_FLAG_BRR                    PWR_CSR_BRR

 #define PWR_FLAG_VOSRDY                 PWR_CSR_VOSRDY

+#define PWR_FLAG_ODRDY                  PWR_CSR_ODRDY

+#define PWR_FLAG_ODSWRDY                PWR_CSR_ODSWRDY

+#define PWR_FLAG_UDRDY                  PWR_CSR_UDSWRDY

 

-/** @defgroup PWR_Flag_Legacy 

-  * @{

-  */

+/* --- FLAG Legacy ---*/

 #define PWR_FLAG_REGRDY                  PWR_FLAG_VOSRDY               

-/**

-  * @}

-  */

 

 #define IS_PWR_GET_FLAG(FLAG) (((FLAG) == PWR_FLAG_WU) || ((FLAG) == PWR_FLAG_SB) || \

                                ((FLAG) == PWR_FLAG_PVDO) || ((FLAG) == PWR_FLAG_BRR) || \

-                               ((FLAG) == PWR_FLAG_VOSRDY))

+                               ((FLAG) == PWR_FLAG_VOSRDY) || ((FLAG) == PWR_FLAG_ODRDY) || \

+                               ((FLAG) == PWR_FLAG_ODSWRDY) || ((FLAG) == PWR_FLAG_UDRDY))

+

+

+#define IS_PWR_CLEAR_FLAG(FLAG) (((FLAG) == PWR_FLAG_WU) || ((FLAG) == PWR_FLAG_SB) || \

+                                 ((FLAG) == PWR_FLAG_UDRDY))

 

-#define IS_PWR_CLEAR_FLAG(FLAG) (((FLAG) == PWR_FLAG_WU) || ((FLAG) == PWR_FLAG_SB))

 /**

   * @}

   */

@@ -159,12 +177,16 @@ void PWR_WakeUpPinCmd(FunctionalState NewState);
 /* Main and Backup Regulators configuration functions *************************/ 

 void PWR_BackupRegulatorCmd(FunctionalState NewState);

 void PWR_MainRegulatorModeConfig(uint32_t PWR_Regulator_Voltage);

+void PWR_OverDriveCmd(FunctionalState NewState);

+void PWR_OverDriveSWCmd(FunctionalState NewState);

+void PWR_UnderDriveCmd(FunctionalState NewState);

 

 /* FLASH Power Down configuration functions ***********************************/ 

 void PWR_FlashPowerDownCmd(FunctionalState NewState);

 

 /* Low Power modes configuration functions ************************************/ 

 void PWR_EnterSTOPMode(uint32_t PWR_Regulator, uint8_t PWR_STOPEntry);

+void PWR_EnterUnderDriveSTOPMode(uint32_t PWR_Regulator, uint8_t PWR_STOPEntry);

 void PWR_EnterSTANDBYMode(void);

 

 /* Flags management functions *************************************************/