sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

env: clean env_nvram.c checkpatch and code style 

Cleanup the env_nvram.c checkpatch warnings, errors and coding style.
There are 2 wanring left about the extern used in c file:
 WARNING: externs should be avoided in .c files
 #53: FILE: env_nvram.c:53:
 +extern void *nvram_read(void *dest, const long src, size_t count);

 WARNING: externs should be avoided in .c files
 #54: FILE: env_nvram.c:54:
 +extern void nvram_write(long dest, const void *src, size_t count);

 total: 0 errors, 2 warnings, 138 lines checked

There is no common nvram header file to use instead of the externs.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Igor Grinberg 2011-11-07 01:14:04 +00:00 committed by Stefano Babic
parent b919ec25e7
commit 91494ca6a0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/env_nvram.c
View File

@ -52,19 +52,19 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
extern void *nvram_read(void *dest, const long src, size_t count); extern void *nvram_read(void *dest, const long src, size_t count);
extern void nvram_write(long dest, const void *src, size_t count); extern void nvram_write(long dest, const void *src, size_t count);
env_t *env_ptr = NULL; env_t *env_ptr;
#else #else
env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif #endif
char * env_name_spec = "NVRAM"; char *env_name_spec = "NVRAM";
uchar env_get_char_spec(int index) uchar env_get_char_spec(int index)
{ {
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
uchar c; uchar c;
nvram_read(&c, CONFIG_ENV_ADDR+index, 1); nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
return c; return c;
#else #else
@ -79,7 +79,7 @@ void env_relocate_spec(void)
#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE) #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE); nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
#else #else
memcpy(buf, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE); memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
#endif #endif
env_import(buf, 1); env_import(buf, 1);
} }
@ -108,7 +108,6 @@ int saveenv(void)
return rcode; return rcode;
} }
/* /*
* Initialize Environment use * Initialize Environment use
* *
@ -121,18 +120,19 @@ int env_init(void)
uchar data[ENV_SIZE]; uchar data[ENV_SIZE];
nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong)); nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
nvram_read(data, CONFIG_ENV_ADDR+sizeof(ulong), ENV_SIZE); nvram_read(data, CONFIG_ENV_ADDR + sizeof(ulong), ENV_SIZE);
if (crc32(0, data, ENV_SIZE) == crc) { if (crc32(0, data, ENV_SIZE) == crc) {
gd->env_addr = (ulong)CONFIG_ENV_ADDR + sizeof(long); gd->env_addr = (ulong)CONFIG_ENV_ADDR + sizeof(long);
#else #else
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) { if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
gd->env_addr = (ulong)&(env_ptr->data); gd->env_addr = (ulong)&env_ptr->data;
#endif #endif
gd->env_valid = 1; gd->env_valid = 1;
} else { } else {
gd->env_addr = (ulong)&default_environment[0]; gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = 0; gd->env_valid = 0;
} }
return (0);
return 0;
} }