Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmd: tlv_eeprom: enable 'dev' subcommand before 'read'

Browse source 
Move the handler for "tlv_eeprom dev X" command to the beginning of
do_tlv_eeprom, to allow using it before issuing a "read" command for
currently selected eeprom.

Also remove the check if eeprom exists, since that can only work after
the first execution of read_eeprom triggered device lookup.
Instead accept values up to the defined array size (MAX_TLV_DEVICES).

Signed-off-by: Josua Mayer <josua@solid-run.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Josua Mayer 2023-05-05 11:20:49 +03:00 committed by Stefan Roese
parent f6eff35b8c
commit fa0af90a0e
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cmd/tlv_eeprom.c
View file

@ -450,6 +450,22 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
// "reset" will both be treated as "read". // "reset" will both be treated as "read".
cmd = argv[1][0]; cmd = argv[1][0];
// select device
if (cmd == 'd') {
/* 'dev' command */
unsigned int devnum;
devnum = simple_strtoul(argv[2], NULL, 0);
if (devnum >= MAX_TLV_DEVICES) {
printf("Invalid device number\n");
return 0;
}
current_dev = devnum;
has_been_read = 0;
return 0;
}
// Read the EEPROM contents // Read the EEPROM contents
if (cmd == 'r') { if (cmd == 'r') {
has_been_read = 0; has_been_read = 0;
@ -508,16 +524,6 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
tlvinfo_delete_tlv(eeprom, tcode); tlvinfo_delete_tlv(eeprom, tcode);
if (argc == 4) if (argc == 4)
tlvinfo_add_tlv(eeprom, tcode, argv[3]); tlvinfo_add_tlv(eeprom, tcode, argv[3]);
} else if (cmd == 'd') { /* 'dev' command */
unsigned int devnum;
devnum = simple_strtoul(argv[2], NULL, 0);
if (devnum > MAX_TLV_DEVICES || !tlv_devices[devnum]) {
printf("Invalid device number\n");
return 0;
}
current_dev = devnum;
has_been_read = 0;
} else { } else {
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }