WebSVN – DashDisplay – Diff – /branches/Dashboard_L152_v2/Drivers/STM32L1xx_HAL_Driver/Src/stm32l1xx_hal_flash.c

 /**
   ******************************************************************************
   * @file    stm32l1xx_hal_flash.c
   * @author  MCD Application Team
-  * @version V1.2.0
-  * @date    01-July-2016
   * @brief   FLASH HAL module driver.
   *          This file provides firmware functions to manage the following
   *          functionalities of the internal FLASH memory:
   *           + Program operations functions
   *           + Memory Control functions
   @endverbatim
   ******************************************************************************
   * @attention
+  *
-  * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
-  * Redistribution and use in source and binary forms, with or without modification,
+  * This software component is licensed by ST under BSD 3-Clause license,
-  * are permitted provided that the following conditions are met:
+  * the "License"; You may not use this file except in compliance with the
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
+  * License. You may obtain a copy of the License at:
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
+  *                        opensource.org/licenses/BSD-3-Clause
-  *      without specific prior written permission.
+  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * 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.
-  *
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
 #include "stm32l1xx_hal.h"
   * @note   To correctly run this function, the HAL_FLASH_Unlock() function
   *         must be called before.
   *         Call the HAL_FLASH_Lock() to disable the flash memory access
   *         (recommended to protect the FLASH memory against possible unwanted operation).
+  *
-  * @param  TypeProgram:  Indicate the way to program at a specified address.
+  * @param  TypeProgram   Indicate the way to program at a specified address.
   *                       This parameter can be a value of @ref FLASH_Type_Program
-  * @param  Address:      Specifies the address to be programmed.
+  * @param  Address       Specifie the address to be programmed.
-  * @param  Data:         Specifies the data to be programmed
+  * @param  Data          Specifie the data to be programmed
+  *
   * @retval HAL_StatusTypeDef HAL Status
   */
 HAL_StatusTypeDef HAL_FLASH_Program(uint32_t TypeProgram, uint32_t Address, uint32_t Data)
+{
+}
 /**
   * @brief   Program word at a specified address  with interrupt enabled.
+  *
-  * @param  TypeProgram: Indicate the way to program at a specified address.
+  * @param  TypeProgram  Indicate the way to program at a specified address.
   *                      This parameter can be a value of @ref FLASH_Type_Program
-  * @param  Address:     Specifies the address to be programmed.
+  * @param  Address      Specifie the address to be programmed.
-  * @param  Data:        Specifies the data to be programmed
+  * @param  Data         Specifie the data to be programmed
+  *
   * @retval HAL_StatusTypeDef HAL Status
   */
 HAL_StatusTypeDef HAL_FLASH_Program_IT(uint32_t TypeProgram, uint32_t Address, uint32_t Data)
+{
   * @brief This function handles FLASH interrupt request.
   * @retval None
   */
 void HAL_FLASH_IRQHandler(void)
+{
-  uint32_t addresstmp = 0;
+  uint32_t addresstmp = 0U;
   /* Check FLASH operation error flags */
   if( __HAL_FLASH_GET_FLAG(FLASH_FLAG_WRPERR)     ||
       __HAL_FLASH_GET_FLAG(FLASH_FLAG_PGAERR)     ||
       __HAL_FLASH_GET_FLAG(FLASH_FLAG_SIZERR)     ||
+      {
         /* Nb of pages to erased can be decreased */
         pFlash.NbPagesToErase--;
         /* Check if there are still pages to erase */
-        if(pFlash.NbPagesToErase != 0)
+        if(pFlash.NbPagesToErase != 0U)
+        {
           addresstmp = pFlash.Page;
           /*Indicate user which sector has been erased */
           HAL_FLASH_EndOfOperationCallback(addresstmp);
+  }
+}
 /**
   * @brief  FLASH end of operation interrupt callback
-  * @param  ReturnValue: The value saved in this parameter depends on the ongoing procedure
+  * @param  ReturnValue The value saved in this parameter depends on the ongoing procedure
   *                 - Pages Erase: Address of the page which has been erased
   *                    (if 0xFFFFFFFF, it means that all the selected pages have been erased)
   *                 - Program: Address which was selected for data program
   * @retval none
   */
    */
+}
 /**
   * @brief  FLASH operation error interrupt callback
-  * @param  ReturnValue: The value saved in this parameter depends on the ongoing procedure
+  * @param  ReturnValue The value saved in this parameter depends on the ongoing procedure
   *                 - Pages Erase: Address of the page which returned an error
   *                 - Program: Address which was selected for data program
   * @retval none
   */
 __weak void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
     /* Unlocking FLASH_PECR register access*/
     if(HAL_IS_BIT_SET(FLASH->PECR, FLASH_PECR_PELOCK))
+    {
       WRITE_REG(FLASH->PEKEYR, FLASH_PEKEY1);
       WRITE_REG(FLASH->PEKEYR, FLASH_PEKEY2);
+      /* Verify that PELOCK is unlocked */
+      if(HAL_IS_BIT_SET(FLASH->PECR, FLASH_PECR_PELOCK))
+      {
+        return HAL_ERROR;
+      }
+    }
     /* Unlocking the program memory access */
     WRITE_REG(FLASH->PRGKEYR, FLASH_PRGKEY1);
     WRITE_REG(FLASH->PRGKEYR, FLASH_PRGKEY2);
+    /* Verify that PRGLOCK is unlocked */
+    if (HAL_IS_BIT_SET(FLASH->PECR, FLASH_PECR_PRGLOCK))
+    {
+      return HAL_ERROR;
+    }
+  }
-  else
-  {
-    return HAL_ERROR;
-  }
   return HAL_OK;
+}
 /**
   * @brief  Locks the FLASH control register access
     if(HAL_IS_BIT_SET(FLASH->PECR, FLASH_PECR_PELOCK))
+    {
       /* Unlocking FLASH_PECR register access*/
       WRITE_REG(FLASH->PEKEYR, FLASH_PEKEY1);
       WRITE_REG(FLASH->PEKEYR, FLASH_PEKEY2);
+      /* Verify that PELOCK is unlocked */
+      if(HAL_IS_BIT_SET(FLASH->PECR, FLASH_PECR_PELOCK))
+      {
+        return HAL_ERROR;
+      }
+    }
     /* Unlocking the option bytes block access */
     WRITE_REG(FLASH->OPTKEYR, FLASH_OPTKEY1);
     WRITE_REG(FLASH->OPTKEYR, FLASH_OPTKEY2);
+    /* Verify that OPTLOCK is unlocked */
+    if (HAL_IS_BIT_SET(FLASH->PECR, FLASH_PECR_OPTLOCK))
+    {
+      return HAL_ERROR;
+    }
+  }
-  else
-  {
-    return HAL_ERROR;
-  }
   return HAL_OK;
+}
 /**
   while(__HAL_FLASH_GET_FLAG(FLASH_FLAG_BSY))
+  {
     if (Timeout != HAL_MAX_DELAY)
+    {
-      if((Timeout == 0) || ((HAL_GetTick()-tickstart) > Timeout))
+      if((Timeout == 0U) || ((HAL_GetTick()-tickstart) > Timeout))
+      {
         return HAL_TIMEOUT;
+      }
+    }
+  }
   * @brief  Set the specific FLASH error flag.
   * @retval None
   */
 static void FLASH_SetErrorCode(void)
+{
-  uint32_t flags = 0;
+  uint32_t flags = 0U;
   if(__HAL_FLASH_GET_FLAG(FLASH_FLAG_WRPERR))
+  {
     pFlash.ErrorCode |= HAL_FLASH_ERROR_WRP;
     flags |= FLASH_FLAG_WRPERR;

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Drivers/STM32L1xx_HAL_Driver/Src/stm32l1xx_hal_flash.c – Rev 49 → 50