GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-22 15:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GPIO: pca953x: fix error reporting

Browse source 
Use the standard CMD_RET_* constants to clearly report errors from the
pca953x command. In addition, print error messages when I2C communication
fails.

Signed-off-by: Laurence Withers <lwithers@guralp.com>
This commit is contained in:
Laurence Withers 2012-07-25 03:55:48 +00:00 • committed by Tom Rini
parent d75bc03f45
commit 633efe9c23
1 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/gpio/pca953x.c
View file

@ -221,7 +221,7 @@ cmd_tbl_t cmd_pca953x[] = {
int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
static uint8_t chip = CONFIG_SYS_I2C_PCA953X_ADDR; static uint8_t chip = CONFIG_SYS_I2C_PCA953X_ADDR;
int val; int ret = CMD_RET_USAGE, val;
ulong ul_arg2 = 0; ulong ul_arg2 = 0;
ulong ul_arg3 = 0; ulong ul_arg3 = 0;
cmd_tbl_t *c; cmd_tbl_t *c;
@ -232,7 +232,7 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (!c || !((argc == (c->maxargs)) || if (!c || !((argc == (c->maxargs)) ||
(((int)c->cmd == PCA953X_CMD_DEVICE) && (((int)c->cmd == PCA953X_CMD_DEVICE) &&
(argc == (c->maxargs - 1))))) { (argc == (c->maxargs - 1))))) {
return cmd_usage(cmdtp); return CMD_RET_USAGE;
} }
/* arg2 used as chip number or pin number */ /* arg2 used as chip number or pin number */
@ -246,32 +246,53 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
switch ((int)c->cmd) { switch ((int)c->cmd) {
#ifdef CONFIG_CMD_PCA953X_INFO #ifdef CONFIG_CMD_PCA953X_INFO
case PCA953X_CMD_INFO: case PCA953X_CMD_INFO:
return pca953x_info(chip); ret = pca953x_info(chip);
if (ret)
ret = CMD_RET_FAILURE;
break;
#endif #endif
case PCA953X_CMD_DEVICE: case PCA953X_CMD_DEVICE:
if (argc == 3) if (argc == 3)
chip = (uint8_t)ul_arg2; chip = (uint8_t)ul_arg2;
printf("Current device address: 0x%x\n", chip); printf("Current device address: 0x%x\n", chip);
return 0; ret = CMD_RET_SUCCESS;
break;
case PCA953X_CMD_INPUT: case PCA953X_CMD_INPUT:
pca953x_set_dir(chip, (1 << ul_arg2), ret = pca953x_set_dir(chip, (1 << ul_arg2),
PCA953X_DIR_IN << ul_arg2); PCA953X_DIR_IN << ul_arg2);
val = (pca953x_get_val(chip) & (1 << ul_arg2)) != 0; val = (pca953x_get_val(chip) & (1 << ul_arg2)) != 0;
printf("chip 0x%02x, pin 0x%lx = %d\n", chip, ul_arg2, val); if (ret)
return val; ret = CMD_RET_FAILURE;
else
printf("chip 0x%02x, pin 0x%lx = %d\n", chip, ul_arg2,
val);
break;
case PCA953X_CMD_OUTPUT: case PCA953X_CMD_OUTPUT:
pca953x_set_dir(chip, (1 << ul_arg2), ret = pca953x_set_dir(chip, (1 << ul_arg2),
(PCA953X_DIR_OUT << ul_arg2)); (PCA953X_DIR_OUT << ul_arg2));
return pca953x_set_val(chip, (1 << ul_arg2), if (!ret)
(ul_arg3 << ul_arg2)); ret = pca953x_set_val(chip, (1 << ul_arg2),
(ul_arg3 << ul_arg2));
if (ret)
ret = CMD_RET_FAILURE;
break;
case PCA953X_CMD_INVERT: case PCA953X_CMD_INVERT:
return pca953x_set_pol(chip, (1 << ul_arg2), ret = pca953x_set_pol(chip, (1 << ul_arg2),
(ul_arg3 << ul_arg2)); (ul_arg3 << ul_arg2));
default: if (ret)
/* We should never get here */ ret = CMD_RET_FAILURE;
return 1; break;
} }
if (ret == CMD_RET_FAILURE)
eprintf("Error talking to chip at 0x%x\n", chip);
return ret;
} }
U_BOOT_CMD( U_BOOT_CMD(