Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imagetool: move common code to imagetool module

Browse Source 
The get_type() and verify_print_header() functions have the
same code on both dumpimage.c and mkimage.c modules.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
master
Guilherme Maciel Ferreira 9 years ago committed by Tom Rini
parent 44f145fd81
commit 0ca6691c2e
4 changed files with 90 additions and 130 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 66
      tools/dumpimage.c
  2. 51
      tools/imagetool.c
  3. 31
      tools/imagetool.h
  4. 72
      tools/mkimage.c

66
tools/dumpimage.c
Unescape View File

@ -55,67 +55,6 @@ static void dumpimage_register(struct image_type_params *tparams)
debug("Registered %s\n", tparams->name);
}
/**
* dumpimage_get_type() - find the image type params for a given image type
*
* Scan all registered image types and check the input type_id for each
* supported image type
*
* @return respective image_type_params pointer. If the input type is not
* supported by any of registered image types, returns NULL
*/
static struct image_type_params *dumpimage_get_type(int type)
{
struct image_type_params *curr;
for (curr = dumpimage_tparams; curr != NULL; curr = curr->next) {
if (curr->check_image_type) {
if (!curr->check_image_type(type))
return curr;
}
}
return NULL;
}
/*
* dumpimage_verify_print_header() - verifies the image header
*
* Scan registered image types and verify the image_header for each
* supported image type. If verification is successful, this prints
* the respective header.
*
* @return 0 on success, negative if input image format does not match with
* any of supported image types
*/
static int dumpimage_verify_print_header(void *ptr, struct stat *sbuf)
{
int retval = -1;
struct image_type_params *curr;
for (curr = dumpimage_tparams; curr != NULL; curr = curr->next) {
if (curr->verify_header) {
retval = curr->verify_header((unsigned char *)ptr,
sbuf->st_size, &params);
if (retval != 0)
continue;
/*
* Print the image information if verify is
* successful
*/
if (curr->print_header) {
curr->print_header(ptr);
} else {
fprintf(stderr,
"%s: print_header undefined for %s\n",
params.cmdname, curr->name);
}
break;
}
}
return retval;
}
/*
* dumpimage_extract_datafile -
*
@ -203,7 +142,7 @@ int main(int argc, char **argv)
usage();
/* set tparams as per input type_id */
tparams = dumpimage_get_type(params.type);
tparams = imagetool_get_type(params.type, dumpimage_tparams);
if (tparams == NULL) {
fprintf(stderr, "%s: unsupported type %s\n",
params.cmdname, genimg_get_type_name(params.type));
@ -273,7 +212,8 @@ int main(int argc, char **argv)
* Print the image information for matched image type
* Returns the error code if not matched
*/
retval = dumpimage_verify_print_header(ptr, &sbuf);
retval = imagetool_verify_print_header(ptr, &sbuf,
tparams, &params);
}
(void)munmap((void *)ptr, sbuf.st_size);

51
tools/imagetool.c
Unescape View File

@ -8,6 +8,8 @@
#include "imagetool.h"
#include <image.h>
/*
* Callback function to register a image type within a tool
*/
@ -62,3 +64,52 @@ void register_image_type(struct image_type_params *tparams)
{
register_func(tparams);
}
struct image_type_params *imagetool_get_type(
int type,
struct image_type_params *tparams)
{
struct image_type_params *curr;
for (curr = tparams; curr != NULL; curr = curr->next) {
if (curr->check_image_type) {
if (!curr->check_image_type(type))
return curr;
}
}
return NULL;
}
int imagetool_verify_print_header(
void *ptr,
struct stat *sbuf,
struct image_type_params *tparams,
struct image_tool_params *params)
{
int retval = -1;
struct image_type_params *curr;
for (curr = tparams; curr != NULL; curr = curr->next) {
if (curr->verify_header) {
retval = curr->verify_header((unsigned char *)ptr,
sbuf->st_size, params);
if (retval == 0) {
/*
* Print the image information if verify is
* successful
*/
if (curr->print_header) {
curr->print_header(ptr);
} else {
fprintf(stderr,
"%s: print_header undefined for %s\n",
params->cmdname, curr->name);
}
break;
}
}
}
return retval;
}

31
tools/imagetool.h
Unescape View File

@ -150,6 +150,37 @@ void register_image_tool(imagetool_register_t image_register);
*/
void register_image_type(struct image_type_params *tparams);
/**
* imagetool_get_type() - find the image type params for a given image type
*
* It scans all registers image type supports
* checks the input type for each supported image type
*
* if successful,
* returns respective image_type_params pointer if success
* if input type_id is not supported by any of image_type_support
* returns NULL
*/
struct image_type_params *imagetool_get_type(
int type,
struct image_type_params *tparams);
/*
* imagetool_verify_print_header() - verifies the image header
*
* Scan registered image types and verify the image_header for each
* supported image type. If verification is successful, this prints
* the respective header.
*
* @return 0 on success, negative if input image format does not match with
* any of supported image types
*/
int imagetool_verify_print_header(
void *ptr,
struct stat *sbuf,
struct image_type_params *tparams,
struct image_tool_params *params);
/*
* There is a c file associated with supported image type low level code
* for ex. default_image.c, fit_image.c

72
tools/mkimage.c
Unescape View File

@ -65,70 +65,6 @@ void mkimage_register (struct image_type_params *tparams)
debug ("Registered %s\n", tparams->name);
}
/*
* mkimage_get_type -
*
* It scans all registers image type supports
* checks the input type_id for each supported image type
*
* if successful,
* returns respective image_type_params pointer if success
* if input type_id is not supported by any of image_type_support
* returns NULL
*/
struct image_type_params *mkimage_get_type(int type)
{
struct image_type_params *curr;
for (curr = mkimage_tparams; curr != NULL; curr = curr->next) {
if (curr->check_image_type) {
if (!curr->check_image_type (type))
return curr;
}
}
return NULL;
}
/*
* mkimage_verify_print_header -
*
* It scans mkimage_tparams link list,
* verifies image_header for each supported image type
* if verification is successful, prints respective header
*
* returns negative if input image format does not match with any of
* supported image types
*/
int mkimage_verify_print_header (void *ptr, struct stat *sbuf)
{
int retval = -1;
struct image_type_params *curr;
for (curr = mkimage_tparams; curr != NULL; curr = curr->next ) {
if (curr->verify_header) {
retval = curr->verify_header (
(unsigned char *)ptr, sbuf->st_size,
&params);
if (retval == 0) {
/*
* Print the image information
* if verify is successful
*/
if (curr->print_header)
curr->print_header (ptr);
else {
fprintf (stderr,
"%s: print_header undefined for %s\n",
params.cmdname, curr->name);
}
break;
}
}
}
return retval;
}
int
main (int argc, char **argv)
{
@ -279,7 +215,7 @@ NXTARG: ;
usage ();
/* set tparams as per input type_id */
tparams = mkimage_get_type(params.type);
tparams = imagetool_get_type(params.type, mkimage_tparams);
if (tparams == NULL) {
fprintf (stderr, "%s: unsupported type %s\n",
params.cmdname, genimg_get_type_name(params.type));
@ -363,7 +299,8 @@ NXTARG: ;
* Print the image information for matched image type
* Returns the error code if not matched
*/
retval = mkimage_verify_print_header (ptr, &sbuf);
retval = imagetool_verify_print_header(ptr, &sbuf,
tparams, &params);
(void) munmap((void *)ptr, sbuf.st_size);
(void) close (ifd);
@ -529,7 +466,8 @@ copy_file (int ifd, const char *datafile, int pad)
uint8_t zeros[4096];
int offset = 0;
int size;
struct image_type_params *tparams = mkimage_get_type (params.type);
struct image_type_params *tparams = imagetool_get_type(params.type,
mkimage_tparams);
if (pad >= sizeof(zeros)) {
fprintf(stderr, "%s: Can't pad to %d\n",

Write Preview
Loading…
Cancel
Save