xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
hathach
2018-09-28 23:58:43 +07:00
parent f14aebba1d
commit 104a4713d0
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/flash_nrf5x.c
View File

@@ -53,12 +53,8 @@ void flash_nrf5x_flush(void)
if ( memcmp(_fl_buf, (void *) _fl_addr, FLASH_PAGE_SIZE) != 0 ) if ( memcmp(_fl_buf, (void *) _fl_addr, FLASH_PAGE_SIZE) != 0 )
{ {
nrf_nvmc_page_erase(_fl_addr); // FIXME nrf_nvmc causes timeout upload large file sd_flash_page_erase does not nrf_nvmc_page_erase(_fl_addr);
// sd_flash_page_erase(_fl_addr / FLASH_PAGE_SIZE);
nrf_nvmc_write_words(_fl_addr, (uint32_t *) _fl_buf, FLASH_PAGE_SIZE / 4); nrf_nvmc_write_words(_fl_addr, (uint32_t *) _fl_buf, FLASH_PAGE_SIZE / 4);
// sd_flash_write((uint32_t*) _fl_addr, (uint32_t *) _fl_buf, FLASH_PAGE_SIZE/4);
} }
_fl_addr = FLASH_CACHE_INVALID_ADDR; _fl_addr = FLASH_CACHE_INVALID_ADDR;
@@ -77,13 +73,3 @@ void flash_nrf5x_write (uint32_t dst, void const *src, int len)
memcpy(_fl_buf + (dst & (FLASH_PAGE_SIZE - 1)), src, len); memcpy(_fl_buf + (dst & (FLASH_PAGE_SIZE - 1)), src, len);
} }
void flash_nrf5x_erase(uint32_t addr, uint32_t bytes)
{
uint32_t page_count = bytes/FLASH_PAGE_SIZE;
if ( bytes%FLASH_PAGE_SIZE ) page_count++;
for(uint32_t i=0; i<page_count; i++)
{
nrf_nvmc_page_erase(addr + i*FLASH_PAGE_SIZE);
}
}