libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[HC32] Fixed a bug about erase flash.

This commit is contained in:
JamieTx 2024-05-16 13:37:00 +08:00 committed by Meco Man
parent 194fd6df05
commit 3d30b56c86
1 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
bsp/hc32/libraries/hc32_drivers/drv_flash/drv_flash_f4.c
View File

@ -30,30 +30,20 @@
*/ */
static rt_uint32_t GetSectorNum(rt_uint32_t addr, size_t size) static rt_uint32_t GetSectorNum(rt_uint32_t addr, size_t size)
{ {
rt_uint32_t firstSector = 0, temp = 0; rt_uint32_t firstSector = 0, lastSector = 0;
rt_uint32_t sectorNum = 0; rt_uint32_t temp = 0;
rt_uint32_t NumOfSectors = 0;
firstSector = addr / SECTOR_SIZE; firstSector = addr / SECTOR_SIZE;
if (0U != (addr % SECTOR_SIZE)) temp = addr + size;
lastSector = temp / SECTOR_SIZE;
if (0U != (temp % SECTOR_SIZE))
{ {
temp = (firstSector + 1U) * SECTOR_SIZE - addr; lastSector += 1U;
sectorNum = 1U;
if (temp >= size)
{
return sectorNum;
}
else
{
size = size - temp;
}
}
sectorNum += size / SECTOR_SIZE;
if (0U != (size % SECTOR_SIZE))
{
sectorNum += 1U;
} }
NumOfSectors = lastSector - firstSector + 1U;
return sectorNum; return NumOfSectors;
} }
/** /**
@ -92,9 +82,11 @@ int hc32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
{ {
uint8_t u8MemBuf[4] = {0xFF, 0xFF, 0xFF, 0xFF}; uint8_t u8MemBuf[4] = {0xFF, 0xFF, 0xFF, 0xFF};
rt_err_t result = RT_EOK; rt_err_t result = RT_EOK;
rt_uint32_t FirstSector = 0, NbOfSectors = 0;
rt_uint32_t newAddr = addr, offsetVal = 0; rt_uint32_t newAddr = addr, offsetVal = 0;
rt_uint32_t index = 0, u32Cnt = 0; rt_uint32_t index = 0, u32Cnt = 0;
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
rt_uint32_t FirstSector = 0, NumOfSectors = 0;
#endif
if ((addr + size) > HC32_FLASH_END_ADDRESS) if ((addr + size) > HC32_FLASH_END_ADDRESS)
{ {
@ -108,12 +100,12 @@ int hc32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
/* EFM_FWMC write enable */ /* EFM_FWMC write enable */
EFM_FWMC_Cmd(ENABLE); EFM_FWMC_Cmd(ENABLE);
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
/* calculate sector information */ /* calculate sector information */
FirstSector = addr / SECTOR_SIZE, FirstSector = addr / SECTOR_SIZE,
NbOfSectors = GetSectorNum(addr, size); NumOfSectors = GetSectorNum(addr, size);
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
/* Sectors disable write protection */ /* Sectors disable write protection */
EFM_SequenceSectorOperateCmd(FirstSector, NbOfSectors, ENABLE); EFM_SequenceSectorOperateCmd(FirstSector, NumOfSectors, ENABLE);
#endif #endif
/* Word align */ /* Word align */
if (0U != (addr % 4)) if (0U != (addr % 4))
@ -153,7 +145,7 @@ int hc32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
__exit: __exit:
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448) #if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
/* Sectors enable write protection */ /* Sectors enable write protection */
EFM_SequenceSectorOperateCmd(FirstSector, NbOfSectors, DISABLE); EFM_SequenceSectorOperateCmd(FirstSector, NumOfSectors, DISABLE);
#endif #endif
EFM_FWMC_Cmd(DISABLE); EFM_FWMC_Cmd(DISABLE);
@ -175,8 +167,11 @@ __exit:
int hc32_flash_erase(rt_uint32_t addr, size_t size) int hc32_flash_erase(rt_uint32_t addr, size_t size)
{ {
rt_err_t result = RT_EOK; rt_err_t result = RT_EOK;
rt_uint32_t FirstSector = 0, NbOfSectors = 0; rt_uint32_t NumOfSectors = 0;
rt_uint32_t SectorVal = 0, u32Addr; rt_uint32_t SectorVal = 0, u32Addr = addr;
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
rt_uint32_t FirstSector = 0;
#endif
if ((addr + size) > HC32_FLASH_END_ADDRESS) if ((addr + size) > HC32_FLASH_END_ADDRESS)
{ {
@ -191,25 +186,25 @@ int hc32_flash_erase(rt_uint32_t addr, size_t size)
/* EFM_FWMC write enable */ /* EFM_FWMC write enable */
EFM_FWMC_Cmd(ENABLE); EFM_FWMC_Cmd(ENABLE);
/* calculate sector information */ /* calculate sector information */
FirstSector = addr / SECTOR_SIZE, NumOfSectors = GetSectorNum(addr, size);
NbOfSectors = GetSectorNum(addr, size);
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448) #if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
FirstSector = addr / SECTOR_SIZE,
/* Sectors disable write protection */ /* Sectors disable write protection */
EFM_SequenceSectorOperateCmd(FirstSector, NbOfSectors, ENABLE); EFM_SequenceSectorOperateCmd(FirstSector, NumOfSectors, ENABLE);
#endif #endif
/* Erase sector */ /* Erase sector */
for (SectorVal = FirstSector; SectorVal < NbOfSectors; SectorVal++) for (SectorVal = 0U; SectorVal < NumOfSectors; SectorVal++)
{ {
u32Addr = EFM_SECTOR_ADDR(SectorVal);
if (LL_OK != EFM_SectorErase(u32Addr)) if (LL_OK != EFM_SectorErase(u32Addr))
{ {
result = -RT_ERROR; result = -RT_ERROR;
break; break;
} }
u32Addr += SECTOR_SIZE;
} }
#if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448) #if defined (HC32F4A0) || defined (HC32F472) || defined (HC32F448)
/* Sectors enable write protection */ /* Sectors enable write protection */
EFM_SequenceSectorOperateCmd(FirstSector, NbOfSectors, DISABLE); EFM_SequenceSectorOperateCmd(FirstSector, NumOfSectors, DISABLE);
#endif #endif
EFM_FWMC_Cmd(DISABLE); EFM_FWMC_Cmd(DISABLE);