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

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>
master
Simon Glass 7 years ago committed by Tom Rini
parent 723806cc5b
commit 21f639446d
  1. 2
      env/dataflash.c
  2. 2
      env/eeprom.c
  3. 2
      env/nvram.c
  4. 4
      include/environment.h

2
env/dataflash.c vendored

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

2
env/eeprom.c vendored

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

2
env/nvram.c vendored

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

@ -227,9 +227,9 @@ struct env_driver {
* will read from gd->env_addr.
*
* @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

Loading…
Cancel
Save