Diff: TARGET_NUCLEO_L011K4/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_flash.h

Revision:

167:84c0a372a020

Parent:

157:e7ca05fa8600

--- a/TARGET_NUCLEO_L011K4/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_flash.h	Fri Apr 20 11:08:29 2018 +0100
+++ b/TARGET_NUCLEO_L011K4/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_flash.h	Fri May 11 16:51:14 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32l0xx_hal_flash.h
   * @author  MCD Application Team
-  * @version V1.7.0
-  * @date    31-May-2016
   * @brief   Header file of Flash HAL module.
   ******************************************************************************
   * @attention
@@ -32,12 +30,12 @@
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
-  ******************************************************************************
+  ******************************************************************************  
   */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32L0XX_HAL_FLASH_H
-#define __STM32L0XX_HAL_FLASH_H
+#ifndef __STM32L0xx_HAL_FLASH_H
+#define __STM32L0xx_HAL_FLASH_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -45,15 +43,38 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32l0xx_hal_def.h"
-
+   
 /** @addtogroup STM32L0xx_HAL_Driver
   * @{
   */
 
-/** @defgroup FLASH FLASH
+/** @addtogroup FLASH
+  * @{
+  */
+  
+/** @addtogroup FLASH_Private_Constants
+  * @{
+  */
+#define FLASH_TIMEOUT_VALUE      (50000U) /* 50 s */
+#define FLASH_SIZE_DATA_REGISTER FLASHSIZE_BASE
+/**
+  * @}
+  */
+
+/** @addtogroup FLASH_Private_Macros
   * @{
   */
 
+#define IS_FLASH_TYPEPROGRAM(_VALUE_)   ((_VALUE_) == FLASH_TYPEPROGRAM_WORD)
+
+#define IS_FLASH_LATENCY(__LATENCY__) (((__LATENCY__) == FLASH_LATENCY_0) || \
+                                       ((__LATENCY__) == FLASH_LATENCY_1))
+
+/**
+  * @}
+  */  
+
+/* Exported types ------------------------------------------------------------*/ 
 /** @defgroup FLASH_Exported_Types FLASH Exported Types
   * @{
   */  
@@ -63,90 +84,82 @@
   */
 typedef enum 
 {
-  FLASH_PROC_NONE = 0U, 
-  FLASH_PROC_PAGEERASE,
-  FLASH_PROC_PROGRAM
+  FLASH_PROC_NONE              = 0, 
+  FLASH_PROC_PAGEERASE         = 1,
+  FLASH_PROC_PROGRAM           = 2,
 } FLASH_ProcedureTypeDef;
 
-/**
- * @brief FLASH Erase structure definition
- */
- typedef struct
- {
-    uint32_t TypeErase;    /*!< TypeErase: Page Erase only.
-                             This parameter can be a value of @ref FLASHEx_Type_Erase */
-    
-    uint32_t PageAddress ; /*!< PageAddress : Initial FLASH address to be erased
-                             This parameter must be a value belonging to FLASH Programm address (depending on the devices) */
-    
-    uint32_t NbPages;      /*!< NbPages: Number of pages to be erased.
-                             This parameter must be a value between 1 and (max number of pages - value of Initial page)*/
-
- } FLASH_EraseInitTypeDef;
-
 /** 
   * @brief  FLASH handle Structure definition  
   */
 typedef struct
 {
-  __IO FLASH_ProcedureTypeDef ProcedureOnGoing;  /* Internal variable to indicate which procedure is ongoing or not in IT context */
-  
-  __IO uint32_t               NbPagesToErase;    /* Internal variable to save the remaining sectors to erase in IT context */
-  
-  __IO uint32_t               Page;              /* Internal variable to define the current sector which is erasing */
+  __IO FLASH_ProcedureTypeDef ProcedureOnGoing; /*!< Internal variable to indicate which procedure is ongoing or not in IT context */
   
-  __IO uint32_t               Address;           /* Internal variable to save address selected for program */
-  
-  HAL_LockTypeDef             Lock;              /* FLASH locking object */
+  __IO uint32_t               NbPagesToErase;   /*!< Internal variable to save the remaining sectors to erase in IT context*/
 
-  __IO uint32_t               ErrorCode;         /* FLASH error code */
+  __IO uint32_t               Address;          /*!< Internal variable to save address selected for program or erase */
 
-}FLASH_ProcessTypeDef;
-/**
-  * @}
-  */ 
+  __IO uint32_t               Page;             /*!< Internal variable to define the current page which is erasing */
 
-/** @addtogroup FLASH_Private
-  * @{
-  */  
+  HAL_LockTypeDef             Lock;             /*!< FLASH locking object                */
 
-/**
-  * @brief  Variable used for Program/Erase sectors under interruption.
-  *     Put as extern as used also in flash_ex.c. 
-  */
-extern FLASH_ProcessTypeDef ProcFlash;   
+  __IO uint32_t               ErrorCode;        /*!< FLASH error code                    
+                                                     This parameter can be a value of @ref FLASH_Error_Codes  */
+} FLASH_ProcessTypeDef;
 
-
-#define FLASH_TIMEOUT_VALUE        ((uint32_t)50000U) /* 50 s */
-#define FLASH_SIZE_DATA_REGISTER   ((uint32_t)0x1FF8007CU)
 /**
   * @}
   */
 
+/* Exported constants --------------------------------------------------------*/
+/** @defgroup FLASH_Exported_Constants FLASH Exported Constants
+  * @{
+  */  
 
-/** @defgroup FLASH_Exported_Constants FLASH Public Constants
+/** @defgroup FLASH_Error_Codes FLASH Error Codes
   * @{
   */
-  
-  /**
-  * @brief  FLASH size information
-  */
-#define FLASH_SIZE                 (uint32_t)(*((uint16_t *)FLASH_SIZE_DATA_REGISTER) * 1024U)
-#define FLASH_PAGE_SIZE            ((uint32_t)128U)
 
-/** @defgroup FLASH_Type_Program FLASH Type Program
-  * @{
-  */
-#define FLASH_TYPEPROGRAM_WORD     ((uint32_t)0x02U) /*!<Program a word (32-bit) at a specified address.*/
+#define HAL_FLASH_ERROR_NONE      0x00U  /*!< No error */
+#define HAL_FLASH_ERROR_PGA       0x01U  /*!< Programming alignment error */
+#define HAL_FLASH_ERROR_WRP       0x02U  /*!< Write protection error */
+#define HAL_FLASH_ERROR_OPTV      0x04U  /*!< Option validity error */
+#define HAL_FLASH_ERROR_SIZE      0x08U  /*!<  */
+#define HAL_FLASH_ERROR_RD        0x10U  /*!< Read protected error */
+#define HAL_FLASH_ERROR_FWWERR    0x20U  /*!< FLASH Write or Erase operation aborted */
+#define HAL_FLASH_ERROR_NOTZERO   0x40U  /*!< FLASH Write operation is done in a not-erased region */
+
 /**
   * @}
   */
 
-/** @defgroup FLASH_Latency FLASH Latency 
+/** @defgroup FLASH_Page_Size FLASH size information
   * @{
   */ 
-#define FLASH_LATENCY_0            ((uint8_t)0x00U)   /*!< FLASH Zero Latency cycle */
-#define FLASH_LATENCY_1            ((uint8_t)0x01U)   /*!< FLASH One Latency cycle */
+
+#define FLASH_SIZE                (uint32_t)((*((uint32_t *)FLASHSIZE_BASE)&0xFFFF) * 1024U)
+#define FLASH_PAGE_SIZE           ((uint32_t)128U)  /*!< FLASH Page Size in bytes */
+
+/**
+  * @}
+  */
+
+/** @defgroup FLASH_Type_Program FLASH Type Program
+  * @{
+  */ 
+#define FLASH_TYPEPROGRAM_WORD       ((uint32_t)0x02U)  /*!<Program a word (32-bit) at a specified address.*/
+
+/**
+  * @}
+  */
+
+/** @defgroup FLASH_Latency FLASH Latency
+  * @{
+  */ 
+#define FLASH_LATENCY_0            ((uint32_t)0x00000000U)    /*!< FLASH Zero Latency cycle */
+#define FLASH_LATENCY_1            FLASH_ACR_LATENCY         /*!< FLASH One Latency cycle */
+
 /**
   * @}
   */
@@ -154,6 +167,7 @@
 /** @defgroup FLASH_Interrupts FLASH Interrupts 
   * @{
   */
+
 #define FLASH_IT_EOP               FLASH_PECR_EOPIE  /*!< End of programming interrupt source */
 #define FLASH_IT_ERR               FLASH_PECR_ERRIE  /*!< Error interrupt source */
 /**
@@ -163,55 +177,43 @@
 /** @defgroup FLASH_Flags FLASH Flags 
   * @{
   */ 
-#define FLASH_FLAG_BSY             FLASH_SR_BSY             /*!< FLASH Busy flag */
-#define FLASH_FLAG_EOP             FLASH_SR_EOP             /*!< FLASH End of Programming flag */
-#define FLASH_FLAG_ENDHV           FLASH_SR_HVOFF           /*!< FLASH End of High Voltage flag */
-#define FLASH_FLAG_READY           FLASH_SR_READY           /*!< FLASH Ready flag after low power mode */
-#define FLASH_FLAG_WRPERR          FLASH_SR_WRPERR          /*!< FLASH Write protected error flag */
-#define FLASH_FLAG_PGAERR          FLASH_SR_PGAERR          /*!< FLASH Programming Alignment error flag */
-#define FLASH_FLAG_SIZERR          FLASH_SR_SIZERR          /*!< FLASH Size error flag  */
-#define FLASH_FLAG_OPTVERR         FLASH_SR_OPTVERR         /*!< FLASH Option Validity error flag (not valid with STM32L031xx/STM32L041xx) */
-#define FLASH_FLAG_RDERR           FLASH_SR_RDERR           /*!< FLASH Read protected error flag */
-#define FLASH_FLAG_FWWERR          FLASH_SR_FWWERR          /*!< FLASH Write or Errase operation aborted */
-#define FLASH_FLAG_NOTZEROERR      FLASH_SR_NOTZEROERR      /*!< FLASH Read protected error flag */
+
+#define FLASH_FLAG_BSY             FLASH_SR_BSY        /*!< FLASH Busy flag */
+#define FLASH_FLAG_EOP             FLASH_SR_EOP        /*!< FLASH End of Programming flag */
+#define FLASH_FLAG_ENDHV           FLASH_SR_HVOFF      /*!< FLASH End of High Voltage flag */
+#define FLASH_FLAG_READY           FLASH_SR_READY      /*!< FLASH Ready flag after low power mode */
+#define FLASH_FLAG_WRPERR          FLASH_SR_WRPERR     /*!< FLASH Write protected error flag */
+#define FLASH_FLAG_PGAERR          FLASH_SR_PGAERR     /*!< FLASH Programming Alignment error flag */
+#define FLASH_FLAG_SIZERR          FLASH_SR_SIZERR     /*!< FLASH Size error flag  */
+#define FLASH_FLAG_OPTVERR         FLASH_SR_OPTVERR    /*!< FLASH Option Validity error flag  */
+#define FLASH_FLAG_RDERR           FLASH_SR_RDERR      /*!< FLASH Read protected error flag */
+#define FLASH_FLAG_FWWERR          FLASH_SR_FWWERR     /*!< FLASH Write or Errase operation aborted */
+#define FLASH_FLAG_NOTZEROERR      FLASH_SR_NOTZEROERR /*!< FLASH Read protected error flag */
+
 /**
   * @}
   */ 
 
-/** @defgroup FLASH_Error_Code Flash Error Code
-  * @{
-  */
-#define HAL_FLASH_ERROR_NONE    0x00U
-#define HAL_FLASH_ERROR_RD      0x01U
-#define HAL_FLASH_ERROR_SIZE    0x02U
-#define HAL_FLASH_ERROR_PGA     0x04U
-#define HAL_FLASH_ERROR_WRP     0x08U
-#define HAL_FLASH_ERROR_OPTV    0x10U
-#define HAL_FLASH_ERROR_FWWERR  0x20U
-#define HAL_FLASH_ERROR_NOTZERO 0x40U
-/**
-  * @}
-  */
-
 /** @defgroup FLASH_Keys FLASH Keys 
   * @{
   */ 
+
 #define FLASH_PDKEY1               ((uint32_t)0x04152637U) /*!< Flash power down key1 */
 #define FLASH_PDKEY2               ((uint32_t)0xFAFBFCFDU) /*!< Flash power down key2: used with FLASH_PDKEY1 
-                                                               to unlock the RUN_PD bit in FLASH_ACR */
+                                                              to unlock the RUN_PD bit in FLASH_ACR */
 
 #define FLASH_PEKEY1               ((uint32_t)0x89ABCDEFU) /*!< Flash program erase key1 */
 #define FLASH_PEKEY2               ((uint32_t)0x02030405U) /*!< Flash program erase key: used with FLASH_PEKEY2
-                                                                to unlock the write access to the FLASH_PECR register and
-                                                                data EEPROM */
+                                                               to unlock the write access to the FLASH_PECR register and
+                                                               data EEPROM */
 
 #define FLASH_PRGKEY1              ((uint32_t)0x8C9DAEBFU) /*!< Flash program memory key1 */
-#define FLASH_PRGKEY2              ((uint32_t)0x13141516u) /*!< Flash program memory key2: used with FLASH_PRGKEY2
-                                                                to unlock the program memory */
+#define FLASH_PRGKEY2              ((uint32_t)0x13141516U) /*!< Flash program memory key2: used with FLASH_PRGKEY2
+                                                               to unlock the program memory */
 
 #define FLASH_OPTKEY1              ((uint32_t)0xFBEAD9C8U) /*!< Flash option key1 */
 #define FLASH_OPTKEY2              ((uint32_t)0x24252627U) /*!< Flash option key2: used with FLASH_OPTKEY1 to
-                                                                unlock the write access to the option byte block */
+                                                              unlock the write access to the option byte block */
 /**
   * @}
   */
@@ -224,71 +226,75 @@
 
 /**
   * @}
-  */ 
+  */  
+  
+/* Exported macro ------------------------------------------------------------*/
 
 /** @defgroup FLASH_Exported_Macros FLASH Exported Macros
-  * @{
-  */  
+ *  @brief macros to control FLASH features 
+ *  @{
+ */
+ 
 
-/** @defgroup FLASH_Macro_Interrupt Macros to handle FLASH interrupts
-  * @brief Enable and disable the specified FLASH interrupt.
-  * @{
-  */  
+/** @defgroup FLASH_Interrupt FLASH Interrupts
+ *  @brief macros to handle FLASH interrupts
+ * @{
+ */ 
 
 /**
   * @brief  Enable the specified FLASH interrupt.
-  * @param  __INTERRUPT__ : FLASH interrupt 
-  *   This parameter can be any combination of the following values:
-  *     @arg FLASH_IT_EOP: End of FLASH Operation Interrupt
-  *     @arg FLASH_IT_ERR: Error Interrupt    
+  * @param  __INTERRUPT__  FLASH interrupt 
+  *         This parameter can be any combination of the following values:
+  *     @arg @ref FLASH_IT_EOP End of FLASH Operation Interrupt
+  *     @arg @ref FLASH_IT_ERR Error Interrupt    
   * @retval none
-  */ 
-#define __HAL_FLASH_ENABLE_IT(__INTERRUPT__)   ((FLASH->PECR) |= (__INTERRUPT__))
+  */  
+#define __HAL_FLASH_ENABLE_IT(__INTERRUPT__)  SET_BIT((FLASH->PECR), (__INTERRUPT__))
 
 /**
   * @brief  Disable the specified FLASH interrupt.
-  * @param  __INTERRUPT__ : FLASH interrupt 
-  *   This parameter can be any combination of the following values:
-  *     @arg FLASH_IT_EOP: End of FLASH Operation Interrupt
-  *     @arg FLASH_IT_ERR: Error Interrupt    
+  * @param  __INTERRUPT__  FLASH interrupt 
+  *         This parameter can be any combination of the following values:
+  *     @arg @ref FLASH_IT_EOP End of FLASH Operation Interrupt
+  *     @arg @ref FLASH_IT_ERR Error Interrupt    
   * @retval none
-  */ 
-#define __HAL_FLASH_DISABLE_IT(__INTERRUPT__)  ((FLASH->PECR) &= ~(uint32_t)(__INTERRUPT__))
+  */  
+#define __HAL_FLASH_DISABLE_IT(__INTERRUPT__)  CLEAR_BIT((FLASH->PECR), (uint32_t)(__INTERRUPT__))
 
 /**
   * @brief  Get the specified FLASH flag status. 
-  * @param  __FLAG__: specifies the FLASH flag to check.
-  *   This parameter can be one of the following values:
-  *            @arg FLASH_FLAG_BSY   :              FLASH Busy flag
-  *     @arg FLASH_FLAG_EOP:         FLASH End of Operation flag
-  *     @arg FLASH_FLAG_READY:       FLASH Ready flag after low power mode
-  *     @arg FLASH_FLAG_ENDHV:       FLASH End of high voltage flag
-  *     @arg FLASH_FLAG_WRPERR:      FLASH Write protected error flag 
-  *     @arg FLASH_FLAG_PGAERR:      FLASH Programming Alignment error flag (not valid with STM32L031xx/STM32L041xx)
-  *     @arg FLASH_FLAG_SIZERR:      FLASH Size error flag
-  *     @arg FLASH_FLAG_OPTVERR:     FLASH Option validity error flag (not valid with STM32L031xx/STM32L041xx)
-  *     @arg FLASH_FLAG_RDERR:       FLASH Read protected error flag
-  *     @arg FLASH_FLAG_FWWERR:      FLASH Fetch While Write Error flag
-  *     @arg FLASH_FLAG_NOTZEROERR:  Not Zero area error flag  
+  * @param  __FLAG__ specifies the FLASH flag to check.
+  *          This parameter can be one of the following values:
+  *            @arg @ref FLASH_FLAG_BSY         FLASH Busy flag
+  *            @arg @ref FLASH_FLAG_EOP         FLASH End of Operation flag 
+  *            @arg @ref FLASH_FLAG_ENDHV       FLASH End of High Voltage flag
+  *            @arg @ref FLASH_FLAG_READY       FLASH Ready flag after low power mode
+  *            @arg @ref FLASH_FLAG_PGAERR      FLASH Programming Alignment error flag
+  *            @arg @ref FLASH_FLAG_SIZERR      FLASH Size error flag
+  *            @arg @ref FLASH_FLAG_OPTVERR     FLASH Option validity error flag (not valid with STM32L031xx/STM32L041xx)
+  *            @arg @ref FLASH_FLAG_RDERR       FLASH Read protected error flag
+  *            @arg @ref FLASH_FLAG_WRPERR      FLASH Write protected error flag 
+  *            @arg @ref FLASH_FLAG_FWWERR      FLASH Fetch While Write Error flag
+  *            @arg @ref FLASH_FLAG_NOTZEROERR  Not Zero area error flag  
   * @retval The new state of __FLAG__ (SET or RESET).
   */
 #define __HAL_FLASH_GET_FLAG(__FLAG__)   (((FLASH->SR) & (__FLAG__)) == (__FLAG__))
 
 /**
   * @brief  Clear the specified FLASH flag.
-  * @param  __FLAG__: specifies the FLASH flags to clear.
-  *   This parameter can be any combination of the following values:
-  *     @arg FLASH_FLAG_EOP:          FLASH End of Operation flag
-  *     @arg FLASH_FLAG_WRPERR:       FLASH Write protected error flag 
-  *     @arg FLASH_FLAG_PGAERR:       FLASH Programming Alignment error flag (not valid with STM32L031xx/STM32L041xx)
-  *     @arg FLASH_FLAG_SIZERR:       FLASH size error flag    
-  *     @arg FLASH_FLAG_OPTVERR:      FLASH Option validity error flag (not valid with STM32L031xx/STM32L041xx)
-  *     @arg FLASH_FLAG_RDERR:        FLASH Read protected error flag
-  *     @arg FLASH_FLAG_FWWERR:       FLASH Fetch While Write Error flag
-  *     @arg FLASH_FLAG_NOTZEROERR:   Not Zero area error flag  
-  * @retval None
+  * @param  __FLAG__ specifies the FLASH flags to clear.
+  *          This parameter can be any combination of the following values:
+  *            @arg @ref FLASH_FLAG_EOP         FLASH End of Operation flag 
+  *            @arg @ref FLASH_FLAG_PGAERR      FLASH Programming Alignment error flag
+  *            @arg @ref FLASH_FLAG_SIZERR      FLASH Size error flag
+  *            @arg @ref FLASH_FLAG_OPTVERR     FLASH Option validity error flag (not valid with STM32L031xx/STM32L041xx)
+  *            @arg @ref FLASH_FLAG_RDERR       FLASH Read protected error flag
+  *            @arg @ref FLASH_FLAG_WRPERR      FLASH Write protected error flag 
+  *            @arg @ref FLASH_FLAG_FWWERR      FLASH Fetch While Write Error flag
+  *            @arg @ref FLASH_FLAG_NOTZEROERR  Not Zero area error flag  
+  * @retval none
   */
-#define __HAL_FLASH_CLEAR_FLAG(__FLAG__)   (FLASH->SR = (__FLAG__)) 
+#define __HAL_FLASH_CLEAR_FLAG(__FLAG__)   ((FLASH->SR) = (__FLAG__))
 
 /**
   * @}
@@ -298,101 +304,73 @@
   * @}
   */ 
 
-/* Include FLASH HAL Extension module */
-#include "stm32l0xx_hal_flash_ex.h"
-#include "stm32l0xx_hal_flash_ramfunc.h"
+/* Include FLASH HAL Extended module */
+#include "stm32l0xx_hal_flash_ex.h"  
+#include "stm32l0xx_hal_flash_ramfunc.h"  
 
-/* Exported functions ------------------------------------------------------- */
-
-/** @defgroup FLASH_Exported_Functions  FLASH Exported functions
+/* Exported functions --------------------------------------------------------*/
+/** @addtogroup FLASH_Exported_Functions
   * @{
   */
-
-/** @defgroup FLASH_Exported_Functions_Group1 Programming operation functions 
+  
+/** @addtogroup FLASH_Exported_Functions_Group1
   * @{
   */
-
-/** 
-  * @brief  FLASH memory functions that can be executed from FLASH.  
-  */  
-/* Program operation functions  ***********************************************/
+/* IO operation functions *****************************************************/
 HAL_StatusTypeDef HAL_FLASH_Program(uint32_t TypeProgram, uint32_t Address, uint32_t Data);
 HAL_StatusTypeDef HAL_FLASH_Program_IT(uint32_t TypeProgram, uint32_t Address, uint32_t Data);
 
-/* FLASH IRQ handler function   ***********************************************/
-void HAL_FLASH_IRQHandler(void);
+/* FLASH IRQ handler function */
+void       HAL_FLASH_IRQHandler(void);
+/* Callbacks in non blocking modes */ 
+void       HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue);
+void       HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue);
 
-/* Callbacks in non blocking modes   ******************************************/
-void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue);
-void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue); 
-  
 /**
   * @}
-  */ 
-
-/** @defgroup FLASH_Exported_Functions_Group2 Peripheral Control functions 
-  * @{
   */
 
-/* FLASH Memory Programming functions *****************************************/   
+/** @addtogroup FLASH_Exported_Functions_Group2
+  * @{
+  */
+/* Peripheral Control functions ***********************************************/
 HAL_StatusTypeDef HAL_FLASH_Unlock(void);
 HAL_StatusTypeDef HAL_FLASH_Lock(void);
-
-/* Option Bytes Programming functions *****************************************/
 HAL_StatusTypeDef HAL_FLASH_OB_Unlock(void);
 HAL_StatusTypeDef HAL_FLASH_OB_Lock(void);
 HAL_StatusTypeDef HAL_FLASH_OB_Launch(void);
 
 /**
   * @}
-  */ 
+  */
 
-/** @defgroup FLASH_Exported_Functions_Group3 Peripheral State and Errors functions 
+/** @addtogroup FLASH_Exported_Functions_Group3
   * @{
   */
-/* Peripheral State methods  **************************************************/
+/* Peripheral State and Error functions ***************************************/
 uint32_t HAL_FLASH_GetError(void);
 
 /**
   * @}
-  */ 
-
-/**
-  * @}
-  */ 
-
-/** @addtogroup FLASH_Private
-  * @{
-  */
-
-#define IS_FLASH_TYPEPROGRAM(VALUE) ((VALUE) == FLASH_TYPEPROGRAM_WORD)
-
-#define IS_FLASH_LATENCY(__LATENCY__) (((__LATENCY__) == FLASH_LATENCY_0) || \
-                                   ((__LATENCY__) == FLASH_LATENCY_1))
-
-/** 
-  * @brief  Function used internally by HAL FLASH driver. 
-  */  
-HAL_StatusTypeDef FLASH_WaitForLastOperation(uint32_t Timeout);
-void              FLASH_ErasePage(uint32_t Page_Address);
-/**
-  * @}
-  */ 
-
-/* Define the private group ***********************************/
-/**************************************************************/
-/** @defgroup FLASH_Private FLASH Private
-  * @{
   */
 
 /**
   * @}
   */
-/**************************************************************/
+
+/* Private function -------------------------------------------------*/
+/** @addtogroup FLASH_Private_Functions
+ * @{
+ */
+HAL_StatusTypeDef       FLASH_WaitForLastOperation(uint32_t Timeout);
 
 /**
   * @}
-  */ 
+  */
+
+/**
+  * @}
+  */
 
 /**
   * @}
@@ -402,7 +380,7 @@
 }
 #endif
 
-#endif /* __STM32L0XX_HAL_FLASH_H */
+#endif /* __STM32L0xx_HAL_FLASH_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/