andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now it works. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12738 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2019-04-14 07:05:29 +00:00
parent 00c71fb05a
commit c50ef06e08
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/hal/ports/STM32/STM32L4xx/hal_efl_lld.c
View File

@ -120,15 +120,14 @@ static inline flash_error_t stm32_flash_check_errors(EFlashDriver *eflp) {
/* Some errors are only caught by assertion.*/
osalDbgAssert((sr & (FLASH_SR_FASTERR |
FLASH_SR_MISERR |
FLASH_SR_PGSERR |
FLASH_SR_SIZERR)) != 0U, "unexpected flash error");
FLASH_SR_SIZERR)) == 0U, "unexpected flash error");
/* Decoding relevant errors.*/
if ((sr & FLASH_SR_WRPERR) != 0U) {
return FLASH_ERROR_HW_FAILURE;
}
if ((sr & (FLASH_SR_PROGERR | FLASH_SR_OPERR)) != 0U) {
if ((sr & (FLASH_SR_PGAERR | FLASH_SR_PROGERR | FLASH_SR_OPERR)) != 0U) {
return eflp->state == FLASH_PGM ? FLASH_ERROR_PROGRAM : FLASH_ERROR_ERASE;
}
@ -301,6 +300,10 @@ flash_error_t efl_lld_program(void *instance, flash_offset_t offset,
line.w[0] = 0xFFFFFFFFU;
line.w[1] = 0xFFFFFFFFU;
/* Programming address aligned to flash lines.*/
address = (volatile uint32_t *)(efl_lld_descriptor.address +
(offset & ~STM32_FLASH_LINE_MASK));
/* Copying data inside the prepared line.*/
do {
line.b[offset & STM32_FLASH_LINE_MASK] = *pp;
@ -311,7 +314,6 @@ flash_error_t efl_lld_program(void *instance, flash_offset_t offset,
while ((n > 0U) & ((offset & STM32_FLASH_LINE_MASK) != 0U));
/* Programming line.*/
address = (volatile uint32_t *)(efl_lld_descriptor.address + offset);
address[0] = line.w[0];
address[1] = line.w[1];
stm32_flash_wait_busy(devp);