michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dfu: flash_img: Removing conditional compilation from header

Browse source 
Applying Coding Guideline rule A.1: Conditional Compilation.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2021-05-28 18:46:48 +00:00 • committed by Anas Nashif
commit 8108db984c
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/dfu/flash_img.h
View file

@ -20,7 +20,6 @@ struct flash_img_context {
struct stream_flash_ctx stream; struct stream_flash_ctx stream;
}; };
#if defined(CONFIG_IMG_ENABLE_IMAGE_CHECK)
/** /**
* @brief Structure for verify flash region integrity * @brief Structure for verify flash region integrity
* *
@ -31,7 +30,6 @@ struct flash_img_check {
const uint8_t *match; /** Match vector data */ const uint8_t *match; /** Match vector data */
size_t clen; /** Content to be compared */ size_t clen; /** Content to be compared */
}; };
#endif
/** /**
* @brief Initialize context needed for writing the image to the flash. * @brief Initialize context needed for writing the image to the flash.
@ -81,11 +79,12 @@ size_t flash_img_bytes_written(struct flash_img_context *ctx);
int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data, int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
size_t len, bool flush); size_t len, bool flush);
#if defined(CONFIG_IMG_ENABLE_IMAGE_CHECK)
/** /**
* @brief Verify flash memory length bytes integrity from a flash area. The * @brief Verify flash memory length bytes integrity from a flash area. The
* start point is indicated by an offset value. * start point is indicated by an offset value.
* *
* The function is enabled via CONFIG_IMG_ENABLE_IMAGE_CHECK Kconfig options.
*
* @param[in] ctx context. * @param[in] ctx context.
* @param[in] fic flash img check data. * @param[in] fic flash img check data.
* @param[in] area_id flash area id of partition where the image should be * @param[in] area_id flash area id of partition where the image should be
@ -96,7 +95,6 @@ int flash_img_buffered_write(struct flash_img_context *ctx, const uint8_t *data,
int flash_img_check(struct flash_img_context *ctx, int flash_img_check(struct flash_img_context *ctx,
const struct flash_img_check *fic, const struct flash_img_check *fic,
uint8_t area_id); uint8_t area_id);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }