Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-21 16:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_ChibiOS: fixed idle wait on H7 flash program

Browse Source
This commit is contained in:
Andrew Tridgell 2019-02-17 13:48:56 +11:00
parent e5efbffe5b
commit 8a40ee8132
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_HAL_ChibiOS/hwdef/common/flash.c
View File

@ -383,13 +383,15 @@ bool stm32_flash_erasepage(uint32_t page)
*/
static bool stm32h7_flash_write32(uint32_t addr, const void *buf)
{
volatile uint32_t *CR, *CCR;
volatile uint32_t *CR, *CCR, *SR;
if (addr - STM32_FLASH_BASE < 8 * STM32_FLASH_FIXED_PAGE_SIZE * 1024) {
CR = &FLASH->CR1;
CCR = &FLASH->CCR1;
SR = &FLASH->SR1;
} else {
CR = &FLASH->CR2;
CCR = &FLASH->CCR2;
SR = &FLASH->SR2;
}
stm32_flash_wait_idle();
*CCR = ~0;
@ -397,6 +399,9 @@ static bool stm32h7_flash_write32(uint32_t addr, const void *buf)
const uint32_t *v = (const uint32_t *)buf;
for (uint8_t i=0; i<8; i++) {
while ((FLASH->SR1 & (FLASH_SR_BSY|FLASH_SR_QW)) ||
(FLASH->SR2 & (FLASH_SR_BSY|FLASH_SR_QW))) { // nop
}
putreg32(*v, addr);
v++;
addr += 4;