1. get_table_entry_id API made global 2. get_table_entry_name API made global 3. struct table_entry moved to image.h
Currently it is used by image.c only These APIs are very usefull and can be used by other part of code
This patch makes these APIs and struct global
Signed-off-by: Prafulla Wadaskar prafulla@marvell.com --- Change log: v2: updated as per review feedback for v1 APIs and struct declared in same context with some documentation The actual use case apart from image.c will come in kwbimage support patch
common/image.c | 10 ++-------- include/image.h | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/common/image.c b/common/image.c index 1d15148..2e16347 100644 --- a/common/image.c +++ b/common/image.c @@ -74,12 +74,6 @@ static image_header_t* image_get_ramdisk (ulong rd_addr, uint8_t arch, #include <image.h> #endif /* !USE_HOSTCC*/
-typedef struct table_entry { - int id; /* as defined in image.h */ - char *sname; /* short (input) name */ - char *lname; /* long (output) name */ -} table_entry_t; - static table_entry_t uimage_arch[] = { { IH_ARCH_INVALID, NULL, "Invalid ARCH", }, { IH_ARCH_ALPHA, "alpha", "Alpha", }, @@ -514,7 +508,7 @@ static void genimg_print_time (time_t timestamp) * long entry name if translation succeeds * msg otherwise */ -static char *get_table_entry_name (table_entry_t *table, char *msg, int id) +char *get_table_entry_name (table_entry_t *table, char *msg, int id) { for (; table->id >= 0; ++table) { if (table->id == id) @@ -561,7 +555,7 @@ const char *genimg_get_comp_name (uint8_t comp) * entry id if translation succeeds * -1 otherwise */ -static int get_table_entry_id (table_entry_t *table, +int get_table_entry_id (table_entry_t *table, const char *table_name, const char *name) { table_entry_t *t; diff --git a/include/image.h b/include/image.h index 7c6eb04..7fe87f3 100644 --- a/include/image.h +++ b/include/image.h @@ -299,6 +299,31 @@ int genimg_get_comp_id (const char *name); #define IMAGE_FORMAT_LEGACY 0x01 /* legacy image_header based format */ #define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */
+/* + * Translation table for entries of a specific type + * This structue is used by the global functions get_table_entry_id, + * get_table_entry_name and these functions and this structure can also be + * referred by other part of code + */ +typedef struct table_entry { + int id; + char *sname; /* name used to find table entry */ + char *lname; /* name used to print for messages */ +} table_entry_t; + +/* + * get_table_entry_id() will go over translation table trying to find + * entry that matches given short name. If matching entry is found, + * its id returned to the caller. + */ +int get_table_entry_id (table_entry_t *table, + const char *table_name, const char *name); +/* + * get_table_entry_name() will go over translation table trying to find + * entry that matches given id. If matching entry is found, its long + * name is returned to the caller. + */ +char *get_table_entry_name (table_entry_t *table, char *msg, int id); void genimg_print_size (uint32_t size); int genimg_get_format (void *img_addr); int genimg_has_config (bootm_headers_t *images);