Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 04:14:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

env: Adjust the get_char() method to return an int

Browse source 
In principle this can fail, e.g. if the index is out of range. Adjust the
driver signature to allow returning an error code.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2017-08-03 12:22:16 -06:00 • committed by Tom Rini
parent 723806cc5b
commit 21f639446d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
env/dataflash.c vendored
View file

@ -14,7 +14,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static unsigned char env_dataflash_get_char(int index) static int env_dataflash_get_char(int index)
{ {
uchar c; uchar c;

2
env/eeprom.c vendored
View file

@ -61,7 +61,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
return rcode; return rcode;
} }
static uchar env_eeprom_get_char(int index) static int env_eeprom_get_char(int index)
{ {
uchar c; uchar c;
unsigned int off = CONFIG_ENV_OFFSET; unsigned int off = CONFIG_ENV_OFFSET;

2
env/nvram.c vendored
View file

@ -41,7 +41,7 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif #endif
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
static uchar env_nvram_get_char(int index) static int env_nvram_get_char(int index)
{ {
uchar c; uchar c;

4
include/environment.h
View file

@ -227,9 +227,9 @@ struct env_driver {
* will read from gd->env_addr. * will read from gd->env_addr.
* *
* @index: Index of character to read (0=first) * @index: Index of character to read (0=first)
* @return character read * @return character read, or -ve on error
*/ */
unsigned char (*get_char)(int index); int (*get_char)(int index);
/** /**
* load() - Load the environment from storage * load() - Load the environment from storage