WebSVN – DashDisplay – Diff – /trunk/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c

 /**
   ******************************************************************************
   * @file    stm32f1xx_hal_flash.c
   * @author  MCD Application Team
-  * @version V1.0.1
+  * @version V1.0.4
-  * @date    31-July-2015
+  * @date    29-April-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
         (++) Get error flag status
   [..] In addition to these function, this driver includes a set of macros allowing
        to handle the following operations:
-      (+) Set the latency
+      (+) Set/Get the latency
       (+) Enable/Disable the prefetch buffer
       (+) Enable/Disable the half cycle access
       (+) Enable/Disable the FLASH interrupts
       (+) Monitor the FLASH flags status
   @endverbatim
   ******************************************************************************
   * @attention
+  *
-  * <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
+  * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+  *
   * Redistribution and use in source and binary forms, with or without modification,
   * are permitted provided that the following conditions are met:
   *   1. Redistributions of source code must retain the above copyright notice,
   *      this list of conditions and the following disclaimer.
   * @note   If an erase and a program operations are requested simultaneously,
   *         the erase operation is performed before the program one.
+  *
   * @note   FLASH should be previously erased before new programmation (only exception to this
   *         is when 0x0000 is programmed)
   *
   * @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  Data:         Specifies the data to be programmed
+  *
   * @note   The function HAL_FLASH_Unlock() should be called before to unlock the FLASH interface
   *         The function HAL_FLASH_Lock() should be called after to lock the FLASH interface
+  *
   * @note   If an erase and a program operations are requested simultaneously,
   *         the erase operation is performed before the program one.
   *
   * @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  Data:        Specifies the data to be programmed
+  *
     (__HAL_FLASH_GET_FLAG(FLASH_FLAG_WRPERR_BANK2) || __HAL_FLASH_GET_FLAG(FLASH_FLAG_PGERR_BANK2)))
 #else
   if(__HAL_FLASH_GET_FLAG(FLASH_FLAG_WRPERR) ||__HAL_FLASH_GET_FLAG(FLASH_FLAG_PGERR))
 #endif /* FLASH_BANK2_END */
+  {
+    /*return the faulty address*/
+    addresstmp = pFlash.Address;
+    /* Reset address */
+    pFlash.Address = 0xFFFFFFFF;
     /*Save the Error code*/
     FLASH_SetErrorCode();
     /* FLASH error interrupt user callback */
-    HAL_FLASH_OperationErrorCallback(pFlash.Address);
+    HAL_FLASH_OperationErrorCallback(addresstmp);
-    /* Reset address and stop the procedure ongoing*/
+    /* Stop the procedure ongoing*/
-    pFlash.Address = 0xFFFFFFFF;
     pFlash.ProcedureOnGoing = FLASH_PROC_NONE;
+  }
   /* Check FLASH End of Operation flag  */
 #if defined(FLASH_BANK2_END)
       if(pFlash.ProcedureOnGoing == FLASH_PROC_PAGEERASE)
+      {
         /* Nb of pages to erased can be decreased */
         pFlash.DataRemaining--;
-        /* Indicate user which page address has been erased*/
-        HAL_FLASH_EndOfOperationCallback(pFlash.Address);
         /* Check if there are still pages to erase*/
         if(pFlash.DataRemaining != 0)
+        {
-          /* Increment page address to next page */
-          pFlash.Address += FLASH_PAGE_SIZE;
           addresstmp = pFlash.Address;
+          /*Indicate user which sector has been erased*/
+          HAL_FLASH_EndOfOperationCallback(addresstmp);
+          /*Increment sector number*/
+          addresstmp = pFlash.Address + FLASH_PAGE_SIZE;
+          pFlash.Address = addresstmp;
-          /* Operation is completed, disable the PER Bit */
+          /* If the erase operation is completed, disable the PER Bit */
           CLEAR_BIT(FLASH->CR, FLASH_CR_PER);
           FLASH_PageErase(addresstmp);
+        }
         else
+        {
-          /*No more pages to Erase*/
+          /*No more pages to Erase, user callback can be called.*/
-          /*Reset Address and stop Erase pages procedure*/
+          /*Reset Sector and stop Erase pages procedure*/
-          pFlash.Address = 0xFFFFFFFF;
+          pFlash.Address = addresstmp = 0xFFFFFFFF;
           pFlash.ProcedureOnGoing = FLASH_PROC_NONE;
+          /* FLASH EOP interrupt user callback */
+          HAL_FLASH_EndOfOperationCallback(addresstmp);
+        }
+      }
       else if(pFlash.ProcedureOnGoing == FLASH_PROC_MASSERASE)
+      {
         /* Operation is completed, disable the MER Bit */
       if(pFlash.ProcedureOnGoing == FLASH_PROC_PAGEERASE)
+      {
         /* Nb of pages to erased can be decreased */
         pFlash.DataRemaining--;
-        /* Indicate user which page address has been erased*/
-        HAL_FLASH_EndOfOperationCallback(pFlash.Address);
         /* Check if there are still pages to erase*/
         if(pFlash.DataRemaining != 0)
+        {
+          /* Indicate user which page address has been erased*/
+          HAL_FLASH_EndOfOperationCallback(pFlash.Address);
           /* Increment page address to next page */
           pFlash.Address += FLASH_PAGE_SIZE;
           addresstmp = pFlash.Address;
           /* Operation is completed, disable the PER Bit */
           /*No more pages to Erase*/
           /*Reset Address and stop Erase pages procedure*/
           pFlash.Address = 0xFFFFFFFF;
           pFlash.ProcedureOnGoing = FLASH_PROC_NONE;
+          /* FLASH EOP interrupt user callback */
+          HAL_FLASH_EndOfOperationCallback(pFlash.Address);
+        }
+      }
       else if(pFlash.ProcedureOnGoing == FLASH_PROC_MASSERASE)
+      {
         /* Operation is completed, disable the MER Bit */
 /**
   * @brief  FLASH end of operation interrupt callback
   * @param  ReturnValue: The value saved in this parameter depends on the ongoing procedure
   *                 - Mass Erase: No return value expected
   *                 - 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
   */
 __weak void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(ReturnValue);
   /* NOTE : This function Should not be modified, when the callback is needed,
             the HAL_FLASH_EndOfOperationCallback could be implemented in the user file
    */
+}
   *                 - Program: Address which was selected for data program
   * @retval none
   */
 __weak void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(ReturnValue);
   /* NOTE : This function Should not be modified, when the callback is needed,
             the HAL_FLASH_OperationErrorCallback could be implemented in the user file
    */
+}
   */
 /** @addtogroup FLASH_Private_Functions
  * @{
  */
 /**
   * @brief  Program a half-word (16-bit) at a specified address.
   * @param  Address: specifies the address to be programmed.
   * @param  Data: specifies the data to be programmed.
   * @retval None
   *(__IO uint16_t*)Address = Data;
+}
 /**
   * @brief  Wait for a FLASH operation to complete.
-  * @param  Timeout: maximum flash operationtimeout
+  * @param  Timeout: maximum flash operation timeout
   * @retval HAL_StatusTypeDef HAL Status
   */
 HAL_StatusTypeDef FLASH_WaitForLastOperation(uint32_t Timeout)
+{
   /* Wait for the FLASH operation to complete by polling on BUSY flag to be reset.
+  {
     /* Clear FLASH End of Operation pending bit */
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP);
+  }
-  if(__HAL_FLASH_GET_FLAG(FLASH_FLAG_WRPERR) || __HAL_FLASH_GET_FLAG(FLASH_FLAG_PGERR) || \
+  if(__HAL_FLASH_GET_FLAG(FLASH_FLAG_WRPERR)  ||
+     __HAL_FLASH_GET_FLAG(FLASH_FLAG_OPTVERR) ||
-     __HAL_FLASH_GET_FLAG(FLASH_FLAG_OPTVERR))
+     __HAL_FLASH_GET_FLAG(FLASH_FLAG_PGERR))
+  {
     /*Save the error code*/
     FLASH_SetErrorCode();
     return HAL_ERROR;
+  }
   /* If there is no error flag set */
   return HAL_OK;
+}
 #if defined(FLASH_BANK2_END)
 /**
   * @brief  Wait for a FLASH BANK2 operation to complete.

Subversion Repositories DashDisplay

(root)/trunk/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c – Rev 2 → 5