V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

env: clean env_dataflash.c checkpatch and code style 

Cleanup the env_dataflash.c checkpatch warnings, errors
and coding style.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Igor Grinberg 2011-11-07 01:14:02 +00:00 committed by Stefano Babic
parent 6b15566681
commit 0901d9f891
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/env_dataflash.c
View File

@ -27,23 +27,17 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr = NULL; env_t *env_ptr;
char * env_name_spec = "dataflash"; char *env_name_spec = "dataflash";
extern int read_dataflash(unsigned long addr, unsigned long size,
char *result);
extern int write_dataflash(unsigned long addr_dest,
unsigned long addr_src, unsigned long size);
extern int AT91F_DataflashInit(void);
uchar env_get_char_spec(int index) uchar env_get_char_spec(int index)
{ {
uchar c; uchar c;
read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t,data), read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t, data),
1, (char *)&c); 1, (char *)&c);
return (c); return c;
} }
void env_relocate_spec(void) void env_relocate_spec(void)
@ -71,7 +65,7 @@ int saveenv(void)
error("Cannot export environment: errno = %d\n", errno); error("Cannot export environment: errno = %d\n", errno);
return 1; return 1;
} }
env_new.crc = crc32(0, env_new.data, ENV_SIZE); env_new.crc = crc32(0, env_new.data, ENV_SIZE);
return write_dataflash(CONFIG_ENV_ADDR, return write_dataflash(CONFIG_ENV_ADDR,
(unsigned long)&env_new, (unsigned long)&env_new,
@ -86,7 +80,7 @@ int saveenv(void)
*/ */
int env_init(void) int env_init(void)
{ {
ulong crc, len, new; ulong crc, len = ENV_SIZE, new = 0;
unsigned off; unsigned off;
uchar buf[64]; uchar buf[64];
@ -99,25 +93,23 @@ int env_init(void)
read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc),
sizeof(ulong), (char *)&crc); sizeof(ulong), (char *)&crc);
new = 0; off = offsetof(env_t, data);
len = ENV_SIZE;
off = offsetof(env_t,data);
while (len > 0) { while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len; int n = (len > sizeof(buf)) ? sizeof(buf) : len;
read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf); read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf);
new = crc32 (new, buf, n); new = crc32(new, buf, n);
len -= n; len -= n;
off += n; off += n;
} }
if (crc == new) { if (crc == new) {
gd->env_addr = offsetof(env_t,data); gd->env_addr = offsetof(env_t, data);
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;

2
include/dataflash.h
View File

@ -208,6 +208,8 @@ extern int dataflash_real_protect (int flag, unsigned long start_addr, unsigned
extern int addr_dataflash (unsigned long addr); extern int addr_dataflash (unsigned long addr);
extern int read_dataflash (unsigned long addr, unsigned long size, char *result); extern int read_dataflash (unsigned long addr, unsigned long size, char *result);
extern int write_dataflash (unsigned long addr, unsigned long dest, unsigned long size); extern int write_dataflash (unsigned long addr, unsigned long dest, unsigned long size);
extern int AT91F_DataflashInit(void);
extern void dataflash_print_info (void); extern void dataflash_print_info (void);
extern void dataflash_perror (int err); extern void dataflash_perror (int err);
extern void AT91F_DataflashSetEnv (void); extern void AT91F_DataflashSetEnv (void);