WebSVN – DashDisplay – Diff – /trunk/eeprom_lib/eeprom.c

 static FLASH_Status EE_Format(void);
 static uint16_t EE_FindValidPage(uint8_t Operation);
 static uint16_t EE_VerifyPageFullWriteVariable(uint16_t VirtAddress, uint16_t Data);
 static uint16_t EE_PageTransfer(uint16_t VirtAddress, uint16_t Data);
+static uint16_t EE_ErasePages(uint32_t base,int count)
+{
+    uint16_t FlashStatus;
+        EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+          EraseInitStruct.PageAddress = base;
+          EraseInitStruct.NbPages     = count;
+          if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
+          {
+                  /* If erase operation was failed, a Flash error code is returned */
+        FlashStatus = HAL_FLASH_GetError();
+        return FlashStatus;
+    }
+        return HAL_FLASH_ERROR_NONE;
+}
 /**
   * @brief  Restore the pages to a known good state in case of page's status
   *   corruption after a power loss.
   * @param  None.
   * @retval - Flash error code: on write Flash error
+  {
     case ERASED:
       if (PageStatus1 == VALID_PAGE) /* Page0 erased, Page1 valid */
+      {
         /* Erase Page0 */
-          EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-          EraseInitStruct.PageAddress = PAGE0_BASE_ADDRESS;
+          FlashStatus = EE_ErasePages(PAGE0_BASE_ADDRESS,1);
-          EraseInitStruct.NbPages     = 1;
+          if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-          if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-          {
+                  {
-                  /* If erase operation was failed, a Flash error code is returned */
-              FlashStatus = HAL_FLASH_GetError();
-              return FlashStatus;
+                     return FlashStatus;
-          }
+                  }
+      }
       else if (PageStatus1 == RECEIVE_DATA) /* Page0 erased, Page1 receive */
+      {
         /* Erase Page0 */
-          EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-          EraseInitStruct.PageAddress = PAGE0_BASE_ADDRESS;
+          FlashStatus = EE_ErasePages(PAGE0_BASE_ADDRESS,1);
-          EraseInitStruct.NbPages     = 1;
+          if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-          if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-          {
+                  {
-                  /* If erase operation was failed, a Flash error code is returned */
-                 FlashStatus = HAL_FLASH_GetError();
-                 return FlashStatus;
+                     return FlashStatus;
-          }
+                  }
           /* Mark Page1 as valid */
          HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE1_BASE_ADDRESS, VALID_PAGE);
         /* If program operation was failed, a Flash error code is returned */
          FlashStatus = HAL_FLASH_GetError();
         if (FlashStatus != HAL_FLASH_ERROR_NONE)
+        {
           return FlashStatus;
+        }
         /* Erase Page1 */
-        FLASH_PageErase(PAGE1_BASE_ADDRESS);
+          FlashStatus = EE_ErasePages(PAGE1_BASE_ADDRESS,1);
-        /* If erase operation was failed, a Flash error code is returned */
-        FlashStatus = HAL_FLASH_GetError();
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+          if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-            {
+                  {
-          return FlashStatus;
+                     return FlashStatus;
-        }
+                  }
+      }
       else if (PageStatus1 == ERASED) /* Page0 receive, Page1 erased */
+      {
         /* Erase Page1 */
-        FLASH_PageErase(PAGE1_BASE_ADDRESS);
+          FlashStatus = EE_ErasePages(PAGE1_BASE_ADDRESS,1);
-        /* If erase operation was failed, a Flash error code is returned */
-        FlashStatus = HAL_FLASH_GetError();
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+          if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-        {
+                  {
-          return FlashStatus;
+                     return FlashStatus;
-        }
+                  }
-        /* Mark Page0 as valid */
+/* Mark Page0 as valid */
         HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE0_BASE_ADDRESS, VALID_PAGE);
         /* If program operation was failed, a Flash error code is returned */
         FlashStatus = HAL_FLASH_GetError();
         if (FlashStatus != HAL_FLASH_ERROR_NONE)
+        }
+      }
       else if (PageStatus1 == ERASED) /* Page0 valid, Page1 erased */
+      {
         /* Erase Page1 */
-        FLASH_PageErase(PAGE1_BASE_ADDRESS);
+          FlashStatus = EE_ErasePages(PAGE1_BASE_ADDRESS,1);
-        FlashStatus = HAL_FLASH_GetError();
-        /* If erase operation was failed, a Flash error code is returned */
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+          if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-        {
+                  {
-          return FlashStatus;
+                     return FlashStatus;
-        }
+                  }
+      }
       else /* Page0 valid, Page1 receive */
+      {
         /* Transfer data from Page0 to Page1 */
         for (VarIdx = 0; VarIdx < NumbOfVar; VarIdx++)
         if (FlashStatus != HAL_FLASH_ERROR_NONE)
+        {
           return FlashStatus;
+        }
         /* Erase Page0 */
-        FLASH_PageErase(PAGE0_BASE_ADDRESS);
+          FlashStatus = EE_ErasePages(PAGE0_BASE_ADDRESS,1);
-        /* If erase operation was failed, a Flash error code is returned */
-        FlashStatus = HAL_FLASH_GetError();
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+          if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-        {
+                  {
-          return FlashStatus;
+                     return FlashStatus;
-        }
+                  }
+      }
       break;
     default:  /* Any other state -> format eeprom */
       /* Erase both Page0 and Page1 and set Page0 as valid page */
 static FLASH_Status EE_Format(void)
+{
   FLASH_Status FlashStatus = HAL_FLASH_ERROR_NONE;
   /* Erase Page0 and Page1  */
-  /* Fill EraseInit structure*/
-   EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-   EraseInitStruct.PageAddress = PAGE0_BASE_ADDRESS;
+  FlashStatus = EE_ErasePages(PAGE0_BASE_ADDRESS,1);
-   EraseInitStruct.NbPages     = 2;
+  if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-   if(HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-   /* If erase operation was failed, a Flash error code is returned */
-  {
+          {
-          FlashStatus = HAL_FLASH_GetError();
              return FlashStatus;
-  }
+          }
   /* Set Page0 as valid page: Write VALID_PAGE at Page0 base address */
   uint32_t rc = HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE0_BASE_ADDRESS, VALID_PAGE);
    /* If program operation was failed, a Flash error code is returned */
     if (rc!= HAL_OK)
+   {
           FlashStatus = HAL_FLASH_GetError();
         return FlashStatus;
+   }
+    FlashStatus = EE_ErasePages(PAGE1_BASE_ADDRESS,1);
+    if(FlashStatus!=HAL_FLASH_ERROR_NONE)
+          {
+             return FlashStatus;
+          }
   /* Return Page1 erase operation status */
   return FlashStatus;
+}
 /**
+      }
+    }
+  }
   /* Erase the old Page: Set old Page status to ERASED status */
-  FLASH_PageErase(OldPageAddress);
+  FlashStatus = EE_ErasePages(OldPageAddress,1);
-  /* If erase operation was failed, a Flash error code is returned */
-  FlashStatus = HAL_FLASH_GetError();
-  if (FlashStatus !=  HAL_FLASH_ERROR_NONE)
+  if(FlashStatus!=HAL_FLASH_ERROR_NONE)
-  {
+          {
-    return FlashStatus;
+             return FlashStatus;
-  }
+          }
   /* Set new Page status to VALID_PAGE status */
   HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,NewPageAddress, VALID_PAGE);
   /* If program operation was failed, a Flash error code is returned */
   FlashStatus = HAL_FLASH_GetError();

Subversion Repositories DashDisplay

(root)/trunk/eeprom_lib/eeprom.c – Rev 21 → 22