image_t -> struct image
Remove misleading typedef and redundant suffix from struct image. Also removes the typedef from enum image_type, as it is used in image.h only.
This commit is contained in:
@@ -153,7 +153,7 @@ static int loadDriver(struct ecosflash_flash_bank *info)
|
||||
{
|
||||
uint32_t buf_cnt;
|
||||
uint32_t image_size;
|
||||
image_t image;
|
||||
struct image image;
|
||||
|
||||
image.base_address_set = 0;
|
||||
image.start_address_set = 0;
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "image.h"
|
||||
#include "time_support.h"
|
||||
|
||||
static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock);
|
||||
static int flash_write_unlock(target_t *target, struct image *image, uint32_t *written, int erase, bool unlock);
|
||||
|
||||
/* flash drivers
|
||||
*/
|
||||
@@ -617,7 +617,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
|
||||
{
|
||||
target_t *target = get_current_target(cmd_ctx);
|
||||
|
||||
image_t image;
|
||||
struct image image;
|
||||
uint32_t written;
|
||||
|
||||
int retval;
|
||||
@@ -966,7 +966,7 @@ static int flash_unlock_address_range(target_t *target, uint32_t addr, uint32_t
|
||||
|
||||
|
||||
/* write (optional verify) an image to flash memory of the given target */
|
||||
static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock)
|
||||
static int flash_write_unlock(target_t *target, struct image *image, uint32_t *written, int erase, bool unlock)
|
||||
{
|
||||
int retval = ERROR_OK;
|
||||
|
||||
@@ -1125,7 +1125,7 @@ static int flash_write_unlock(target_t *target, image_t *image, uint32_t *writte
|
||||
return retval;
|
||||
}
|
||||
|
||||
int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
|
||||
int flash_write(target_t *target, struct image *image, uint32_t *written, int erase)
|
||||
{
|
||||
return flash_write_unlock(target, image, written, erase, false);
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "target.h"
|
||||
#include "log.h"
|
||||
|
||||
struct image_s;
|
||||
struct image;
|
||||
|
||||
#define FLASH_MAX_ERROR_STR (128)
|
||||
|
||||
@@ -286,7 +286,7 @@ int flash_erase_address_range(struct target_s *target,
|
||||
* @returns ERROR_OK if successful; otherwise, an error code.
|
||||
*/
|
||||
int flash_write(struct target_s *target,
|
||||
struct image_s *image, uint32_t *written, int erase);
|
||||
struct image *image, uint32_t *written, int erase);
|
||||
/**
|
||||
* Forces targets to re-examine their erase/protection state.
|
||||
* This routine must be called when the system may modify the status.
|
||||
|
||||
@@ -718,7 +718,7 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
|
||||
}
|
||||
|
||||
/* The image will always start at offset 0 */
|
||||
image_t image;
|
||||
struct image image;
|
||||
image.base_address_set = 1;
|
||||
image.base_address = 0;
|
||||
image.start_address_set = 0;
|
||||
|
||||
Reference in New Issue
Block a user