michaelh/zephyr
1
0
Fork 0
Code Releases Activity

flash_img: add error check to 'flash_progressive_erase'

Browse source 
Currently the error codes returne from this function is ignored.
Add error reporting to allow users to handle what is reported.

Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
This commit is contained in:
Håkon Øye Amundsen 2019-10-16 11:36:42 +00:00 • committed by Kumar Gala
commit b6b7cc34ff
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/dfu/img_util/flash_img.c
View file

@ -133,8 +133,13 @@ static int flash_sync(struct flash_img_context *ctx)
} }
#ifdef CONFIG_IMG_ERASE_PROGRESSIVELY #ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
flash_progressive_erase(ctx, ctx->bytes_written + rc = flash_progressive_erase(ctx, ctx->bytes_written +
CONFIG_IMG_BLOCK_BUF_SIZE); CONFIG_IMG_BLOCK_BUF_SIZE);
if (rc) {
LOG_ERR("flash_progressive_erase error %d offset=0x%08zx", rc,
ctx->bytes_written);
return rc;
}
#endif #endif
rc = flash_area_write(ctx->flash_area, ctx->bytes_written, ctx->buf, rc = flash_area_write(ctx->flash_area, ctx->bytes_written, ctx->buf,
@ -199,8 +204,11 @@ int flash_img_buffered_write(struct flash_img_context *ctx, u8_t *data,
} }
#ifdef CONFIG_IMG_ERASE_PROGRESSIVELY #ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
/* erase the image trailer area if it was not erased */ /* erase the image trailer area if it was not erased */
flash_progressive_erase(ctx, rc = flash_progressive_erase(ctx,
BOOT_TRAILER_IMG_STATUS_OFFS(ctx->flash_area)); BOOT_TRAILER_IMG_STATUS_OFFS(ctx->flash_area));
if (rc) {
return rc;
}
#endif #endif
flash_area_close(ctx->flash_area); flash_area_close(ctx->flash_area);