dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-30 18:05:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

image: constify lookup tables

Browse Source 
These are pure lookup tables -- no need to be writable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger
2010-10-20 07:17:39 -04:00
committed by Wolfgang Denk
parent fc9903f38d
commit 7edb186fcf
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/image.c
View File

@@ -74,7 +74,7 @@ static const image_header_t* image_get_ramdisk (ulong rd_addr, uint8_t arch,
#include <image.h> #include <image.h>
#endif /* !USE_HOSTCC*/ #endif /* !USE_HOSTCC*/
static table_entry_t uimage_arch[] = { static const table_entry_t uimage_arch[] = {
{ IH_ARCH_INVALID, NULL, "Invalid ARCH", }, { IH_ARCH_INVALID, NULL, "Invalid ARCH", },
{ IH_ARCH_ALPHA, "alpha", "Alpha", }, { IH_ARCH_ALPHA, "alpha", "Alpha", },
{ IH_ARCH_ARM, "arm", "ARM", }, { IH_ARCH_ARM, "arm", "ARM", },
@@ -96,7 +96,7 @@ static table_entry_t uimage_arch[] = {
{ -1, "", "", }, { -1, "", "", },
}; };
static table_entry_t uimage_os[] = { static const table_entry_t uimage_os[] = {
{ IH_OS_INVALID, NULL, "Invalid OS", }, { IH_OS_INVALID, NULL, "Invalid OS", },
{ IH_OS_LINUX, "linux", "Linux", }, { IH_OS_LINUX, "linux", "Linux", },
#if defined(CONFIG_LYNXKDI) || defined(USE_HOSTCC) #if defined(CONFIG_LYNXKDI) || defined(USE_HOSTCC)
@@ -129,7 +129,7 @@ static table_entry_t uimage_os[] = {
{ -1, "", "", }, { -1, "", "", },
}; };
static table_entry_t uimage_type[] = { static const table_entry_t uimage_type[] = {
{ IH_TYPE_INVALID, NULL, "Invalid Image", }, { IH_TYPE_INVALID, NULL, "Invalid Image", },
{ IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", }, { IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", },
{ IH_TYPE_FIRMWARE, "firmware", "Firmware", }, { IH_TYPE_FIRMWARE, "firmware", "Firmware", },
@@ -144,7 +144,7 @@ static table_entry_t uimage_type[] = {
{ -1, "", "", }, { -1, "", "", },
}; };
static table_entry_t uimage_comp[] = { static const table_entry_t uimage_comp[] = {
{ IH_COMP_NONE, "none", "uncompressed", }, { IH_COMP_NONE, "none", "uncompressed", },
{ IH_COMP_BZIP2, "bzip2", "bzip2 compressed", }, { IH_COMP_BZIP2, "bzip2", "bzip2 compressed", },
{ IH_COMP_GZIP, "gzip", "gzip compressed", }, { IH_COMP_GZIP, "gzip", "gzip compressed", },
@@ -516,7 +516,7 @@ static void genimg_print_time (time_t timestamp)
* long entry name if translation succeeds * long entry name if translation succeeds
* msg otherwise * msg otherwise
*/ */
char *get_table_entry_name (table_entry_t *table, char *msg, int id) char *get_table_entry_name(const table_entry_t *table, char *msg, int id)
{ {
for (; table->id >= 0; ++table) { for (; table->id >= 0; ++table) {
if (table->id == id) if (table->id == id)
@@ -563,10 +563,10 @@ const char *genimg_get_comp_name (uint8_t comp)
* entry id if translation succeeds * entry id if translation succeeds
* -1 otherwise * -1 otherwise
*/ */
int get_table_entry_id (table_entry_t *table, int get_table_entry_id(const table_entry_t *table,
const char *table_name, const char *name) const char *table_name, const char *name)
{ {
table_entry_t *t; const table_entry_t *t;
#ifdef USE_HOSTCC #ifdef USE_HOSTCC
int first = 1; int first = 1;

4
include/image.h
View File

@@ -300,14 +300,14 @@ typedef struct table_entry {
* entry that matches the given short name. If a matching entry is * entry that matches the given short name. If a matching entry is
* found, it's id is returned to the caller. * found, it's id is returned to the caller.
*/ */
int get_table_entry_id (table_entry_t *table, int get_table_entry_id(const table_entry_t *table,
const char *table_name, const char *name); const char *table_name, const char *name);
/* /*
* get_table_entry_name() scans the translation table trying to find * get_table_entry_name() scans the translation table trying to find
* an entry that matches the given id. If a matching entry is found, * an entry that matches the given id. If a matching entry is found,
* its long name is returned to the caller. * its long name is returned to the caller.
*/ */
char *get_table_entry_name (table_entry_t *table, char *msg, int id); char *get_table_entry_name(const table_entry_t *table, char *msg, int id);
const char *genimg_get_os_name (uint8_t os); const char *genimg_get_os_name (uint8_t os);
const char *genimg_get_arch_name (uint8_t arch); const char *genimg_get_arch_name (uint8_t arch);