浏览代码

modify space

ethan.du 5 年之前
父节点
当前提交
6b614c05b8
共有 1 个文件被更改,包括 77 次插入77 次删除
  1. 77 77
      bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f7.c

+ 77 - 77
bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f7.c

@@ -42,122 +42,122 @@
   */
 static rt_uint32_t GetSector(rt_uint32_t Address)
 {
-  uint32_t sector = 0;
+    uint32_t sector = 0;
   
 #if defined (FLASH_OPTCR_nDBANK)
-  FLASH_OBProgramInitTypeDef OBInit;
-  uint32_t nbank = 0;
-
-  //get duel bank ability:nDBANK(Bit29)
-  HAL_FLASHEx_OBGetConfig(&OBInit);
-  nbank = ((OBInit.USERConfig & 0x20000000U) >> 29);
-  //1:single bank mode
-  if(1 == nbank)
-  {  
+    FLASH_OBProgramInitTypeDef OBInit;
+    uint32_t nbank = 0;
+
+    //get duel bank ability:nDBANK(Bit29)
+    HAL_FLASHEx_OBGetConfig(&OBInit);
+    nbank = ((OBInit.USERConfig & 0x20000000U) >> 29);
+    //1:single bank mode
+    if(1 == nbank)
+    {  
+        if((Address < ADDR_FLASH_SECTOR_1) && (Address >= ADDR_FLASH_SECTOR_0))
+        {
+            sector = FLASH_SECTOR_0;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_2) && (Address >= ADDR_FLASH_SECTOR_1))
+        {
+            sector = FLASH_SECTOR_1;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_3) && (Address >= ADDR_FLASH_SECTOR_2))
+        {
+            sector = FLASH_SECTOR_2;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_4) && (Address >= ADDR_FLASH_SECTOR_3))
+        {
+            sector = FLASH_SECTOR_3;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_5) && (Address >= ADDR_FLASH_SECTOR_4))
+        {
+            sector = FLASH_SECTOR_4;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_6) && (Address >= ADDR_FLASH_SECTOR_5))
+        {
+            sector = FLASH_SECTOR_5;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_7) && (Address >= ADDR_FLASH_SECTOR_6))
+        {
+            sector = FLASH_SECTOR_6;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_8) && (Address >= ADDR_FLASH_SECTOR_7))
+        {
+            sector = FLASH_SECTOR_7;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_9) && (Address >= ADDR_FLASH_SECTOR_8))
+        {
+            sector = FLASH_SECTOR_8;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_10) && (Address >= ADDR_FLASH_SECTOR_9))
+        {
+            sector = FLASH_SECTOR_9;
+        }
+        else if((Address < ADDR_FLASH_SECTOR_11) && (Address >= ADDR_FLASH_SECTOR_10))
+        {
+            sector = FLASH_SECTOR_10;
+        }
+        else 
+        {
+            sector = FLASH_SECTOR_11;
+        }
+    }
+    else  //0:dual bank mode
+    {
+        RT_ASSERT("rtthread doesn't support duel bank mode yet!");
+    }
+#else //no dual bank ability
     if((Address < ADDR_FLASH_SECTOR_1) && (Address >= ADDR_FLASH_SECTOR_0))
     {
-      sector = FLASH_SECTOR_0;
+        sector = FLASH_SECTOR_0;
     }
     else if((Address < ADDR_FLASH_SECTOR_2) && (Address >= ADDR_FLASH_SECTOR_1))
     {
-      sector = FLASH_SECTOR_1;
+        sector = FLASH_SECTOR_1;
     }
     else if((Address < ADDR_FLASH_SECTOR_3) && (Address >= ADDR_FLASH_SECTOR_2))
     {
-      sector = FLASH_SECTOR_2;
+        sector = FLASH_SECTOR_2;
     }
     else if((Address < ADDR_FLASH_SECTOR_4) && (Address >= ADDR_FLASH_SECTOR_3))
     {
-      sector = FLASH_SECTOR_3;
+        sector = FLASH_SECTOR_3;
     }
     else if((Address < ADDR_FLASH_SECTOR_5) && (Address >= ADDR_FLASH_SECTOR_4))
     {
-      sector = FLASH_SECTOR_4;
+        sector = FLASH_SECTOR_4;
     }
     else if((Address < ADDR_FLASH_SECTOR_6) && (Address >= ADDR_FLASH_SECTOR_5))
     {
-      sector = FLASH_SECTOR_5;
+        sector = FLASH_SECTOR_5;
     }
     else if((Address < ADDR_FLASH_SECTOR_7) && (Address >= ADDR_FLASH_SECTOR_6))
     {
-      sector = FLASH_SECTOR_6;
+        sector = FLASH_SECTOR_6;
     }
     else if((Address < ADDR_FLASH_SECTOR_8) && (Address >= ADDR_FLASH_SECTOR_7))
     {
-      sector = FLASH_SECTOR_7;
+        sector = FLASH_SECTOR_7;
     }
     else if((Address < ADDR_FLASH_SECTOR_9) && (Address >= ADDR_FLASH_SECTOR_8))
     {
-      sector = FLASH_SECTOR_8;
+        sector = FLASH_SECTOR_8;
     }
     else if((Address < ADDR_FLASH_SECTOR_10) && (Address >= ADDR_FLASH_SECTOR_9))
     {
-      sector = FLASH_SECTOR_9;
+        sector = FLASH_SECTOR_9;
     }
     else if((Address < ADDR_FLASH_SECTOR_11) && (Address >= ADDR_FLASH_SECTOR_10))
     {
-      sector = FLASH_SECTOR_10;
+        sector = FLASH_SECTOR_10;
     }
     else 
     {
-      sector = FLASH_SECTOR_11;
+        sector = FLASH_SECTOR_11;
     }
-  }
-  else  //0:dual bank mode
-  {
-    RT_ASSERT("rtthread doesn't support duel bank mode yet!");
-  }
-#else //no dual bank ability
-  if((Address < ADDR_FLASH_SECTOR_1) && (Address >= ADDR_FLASH_SECTOR_0))
-  {
-    sector = FLASH_SECTOR_0;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_2) && (Address >= ADDR_FLASH_SECTOR_1))
-  {
-    sector = FLASH_SECTOR_1;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_3) && (Address >= ADDR_FLASH_SECTOR_2))
-  {
-    sector = FLASH_SECTOR_2;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_4) && (Address >= ADDR_FLASH_SECTOR_3))
-  {
-    sector = FLASH_SECTOR_3;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_5) && (Address >= ADDR_FLASH_SECTOR_4))
-  {
-    sector = FLASH_SECTOR_4;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_6) && (Address >= ADDR_FLASH_SECTOR_5))
-  {
-    sector = FLASH_SECTOR_5;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_7) && (Address >= ADDR_FLASH_SECTOR_6))
-  {
-    sector = FLASH_SECTOR_6;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_8) && (Address >= ADDR_FLASH_SECTOR_7))
-  {
-    sector = FLASH_SECTOR_7;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_9) && (Address >= ADDR_FLASH_SECTOR_8))
-  {
-    sector = FLASH_SECTOR_8;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_10) && (Address >= ADDR_FLASH_SECTOR_9))
-  {
-    sector = FLASH_SECTOR_9;
-  }
-  else if((Address < ADDR_FLASH_SECTOR_11) && (Address >= ADDR_FLASH_SECTOR_10))
-  {
-    sector = FLASH_SECTOR_10;
-  }
-  else 
-  {
-    sector = FLASH_SECTOR_11;
-  }
 #endif
-  return sector;
+    return sector;
 }