Browse Source

flashfs:Upstream renamed up_progmem_erasepage to up_progmem_eraseblock

sbg
David Sidrane 6 years ago
parent
commit
f00d633196
  1. 6
      src/lib/parameters/flashparams/flashfs.c
  2. 2
      src/modules/dataman/dataman.cpp
  3. 2
      src/systemcmds/bl_update/bl_update.c

6
src/lib/parameters/flashparams/flashfs.c

@ -645,11 +645,11 @@ static sector_descriptor_t *get_sector_info(flash_entry_header_t *current) @@ -645,11 +645,11 @@ static sector_descriptor_t *get_sector_info(flash_entry_header_t *current)
static int erase_sector(sector_descriptor_t *sm, flash_entry_header_t *pf)
{
int rv = 0;
ssize_t page = up_progmem_getpage((size_t)pf);
ssize_t block = up_progmem_getpage((size_t)pf);
if (page > 0 && page == sm->page) {
if (block > 0 && block == sm->page) {
last_erased = sm->page;
ssize_t size = up_progmem_erasepage(page);
ssize_t size = up_progmem_eraseblock(block);
if (size < 0 || size != (ssize_t)sm->size) {
rv = size;

2
src/modules/dataman/dataman.cpp

@ -1020,7 +1020,7 @@ _ram_flash_flush() @@ -1020,7 +1020,7 @@ _ram_flash_flush()
dm_operations_data.ram_flash.flush_timeout_usec = 0;
ssize_t ret = up_progmem_getpage(k_dataman_flash_sector->address);
ret = up_progmem_erasepage(ret);
ret = up_progmem_eraseblock(ret);
if (ret < 0) {
PX4_WARN("Error erasing flash sector %u", k_dataman_flash_sector->page);

2
src/systemcmds/bl_update/bl_update.c

@ -162,7 +162,7 @@ bl_update_main(int argc, char *argv[]) @@ -162,7 +162,7 @@ bl_update_main(int argc, char *argv[])
const size_t page = 0;
uint8_t *base = (uint8_t *) PX4_FLASH_BASE;
ssize_t size = up_progmem_erasepage(page);
ssize_t size = up_progmem_eraseblock(page);
if (size != BL_FILE_SIZE_LIMIT)
{

Loading…
Cancel
Save