stm32f072xx_hic: remove bank2 handling for flash

Author: mbrossard

source/hic_hal/stm32/stm32f072xx/flash.c

@@ -26,15 +26,12 @@
 extern FLASH_ProcessTypeDef pFlash;
 extern void FLASH_PageErase(uint32_t PageAddress);
 
-#define __wait_todo() util_assert(0)
-
 static uint32_t FlashInitStatus = 0;
 
 uint32_t Init(uint32_t adr, uint32_t clk, uint32_t fnc)
 {
     FlashInitStatus |= 1 << fnc;
-    if (FlashInitStatus)
-    {
+    if (FlashInitStatus) {
         HAL_FLASH_Unlock();
     }
     return 0;
@@ -43,22 +40,19 @@ uint32_t Init(uint32_t adr, uint32_t clk, uint32_t fnc)
 uint32_t UnInit(uint32_t fnc)
 {
     FlashInitStatus &= ~(1 << fnc);
-    if (!FlashInitStatus)
-    {
+    if (!FlashInitStatus) {
         HAL_FLASH_Lock();
     }
     return 0;
 }
 
 uint32_t BlankCheck(uint32_t adr, uint32_t sz, uint8_t pat)
 {
-    __wait_todo();
     return 0;
 }
 
 uint32_t EraseChip(void)
 {
-    __wait_todo();
     return 0;
 }
 
@@ -69,28 +63,15 @@ uint32_t EraseSector(uint32_t adr)
     util_assert(IS_FLASH_NB_PAGES(adr, 1));
 
     __HAL_LOCK(&pFlash);
-#if defined(FLASH_BANK2_END)
-    if (adr > FLASH_BANK1_END)
-    {
-        if (FLASH_WaitForLastOperationBank2(FLASH_TIMEOUT_VALUE) == HAL_OK)
-        {
-            FLASH_PageErase(adr);
-            status = FLASH_WaitForLastOperationBank2(FLASH_TIMEOUT_VALUE);
-            CLEAR_BIT(FLASH->CR2, FLASH_CR2_PER);
-        }
-    }
-    else
-#endif
-    {
-        if (FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE) == HAL_OK)
-        {
-            FLASH_PageErase(adr);
-            status = FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE);
-            CLEAR_BIT(FLASH->CR, FLASH_CR_PER);
-        }
+
+    if (FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE) == HAL_OK) {
+        FLASH_PageErase(adr);
+        status = FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE);
+        CLEAR_BIT(FLASH->CR, FLASH_CR_PER);
     }
 
     __HAL_UNLOCK(&pFlash);
+
     return status != HAL_OK;
 }
 
@@ -105,39 +86,13 @@ uint32_t ProgramPage(uint32_t adr, uint32_t sz, uint32_t *buf)
 
     __HAL_LOCK(&pFlash);
 
-#if defined(FLASH_BANK2_END)
-    if (adr <= FLASH_BANK1_END)
-    {
-#endif /* FLASH_BANK2_END */
+    status = FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE);
+
+    while (status == HAL_OK && sz > 0) {
+        SET_BIT(FLASH->CR, FLASH_CR_PG);
+        *(__IO uint16_t *)adr = *(uint16_t *)buf;
         status = FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE);
-#if defined(FLASH_BANK2_END)
-    }
-    else
-    {
-        status = FLASH_WaitForLastOperationBank2(FLASH_TIMEOUT_VALUE);
-    }
-#endif /* FLASH_BANK2_END */
-
-    while (status == HAL_OK && sz > 0)
-    {
-#if defined(FLASH_BANK2_END)
-        if (adr <= FLASH_BANK1_END)
-        {
-#endif /* FLASH_BANK2_END */
-            SET_BIT(FLASH->CR, FLASH_CR_PG);
-            *(__IO uint16_t *)adr = *(uint16_t *)buf;
-            status = FLASH_WaitForLastOperation(FLASH_TIMEOUT_VALUE);
-            CLEAR_BIT(FLASH->CR, FLASH_CR_PG);
-#if defined(FLASH_BANK2_END)
-        }
-        else
-        {
-            SET_BIT(FLASH->CR2, FLASH_CR2_PG);
-            *(__IO uint16_t *)adr = buf;
-            status = FLASH_WaitForLastOperationBank2(FLASH_TIMEOUT_VALUE);
-            CLEAR_BIT(FLASH->CR2, FLASH_CR2_PG);
-        }
-#endif /* FLASH_BANK2_END */
+        CLEAR_BIT(FLASH->CR, FLASH_CR_PG);
         sz -= sizeof(uint16_t);
         adr += sizeof(uint16_t);
         buf = (uint32_t *)(((uint16_t *)buf) + 1);
@@ -150,6 +105,5 @@ uint32_t ProgramPage(uint32_t adr, uint32_t sz, uint32_t *buf)
 
 uint32_t Verify(uint32_t adr, uint32_t sz, uint32_t *buf)
 {
-    __wait_todo();
     return 0;
 }