leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xyz-modem: Properly abort/terminate transfer on error

Browse Source 
Transfer termination tries to instruct sender that transfer was terminated.

Print error message and indicates aborted transfer in return value.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Pali Rohár 2021-08-03 16:28:42 +02:00 committed by Tom Rini
parent 1f26c49ea1
commit 081bd249d1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/load.c
View File

@ -978,6 +978,7 @@ static ulong load_serial_ymodem(ulong offset, int mode)
res = xyzModem_stream_open(&info, &err); res = xyzModem_stream_open(&info, &err);
if (!res) { if (!res) {
err = 0;
while ((res = while ((res =
xyzModem_stream_read(ymodemBuf, 1024, &err)) > 0) { xyzModem_stream_read(ymodemBuf, 1024, &err)) > 0) {
store_addr = addr + offset; store_addr = addr + offset;
@ -990,6 +991,9 @@ static ulong load_serial_ymodem(ulong offset, int mode)
rc = flash_write((char *) ymodemBuf, rc = flash_write((char *) ymodemBuf,
store_addr, res); store_addr, res);
if (rc != 0) { if (rc != 0) {
xyzModem_stream_terminate(true, &getcxmodem);
xyzModem_stream_close(&err);
printf("\n");
flash_perror(rc); flash_perror(rc);
return (~0); return (~0);
} }
@ -1001,12 +1005,20 @@ static ulong load_serial_ymodem(ulong offset, int mode)
} }
} }
if (err) {
xyzModem_stream_terminate((err == xyzModem_cancel) ? false : true, &getcxmodem);
xyzModem_stream_close(&err);
printf("\n%s\n", xyzModem_error(err));
return (~0); /* Download aborted */
}
if (IS_ENABLED(CONFIG_CMD_BOOTEFI)) if (IS_ENABLED(CONFIG_CMD_BOOTEFI))
efi_set_bootdev("Uart", "", "", efi_set_bootdev("Uart", "", "",
map_sysmem(offset, 0), size); map_sysmem(offset, 0), size);
} else { } else {
printf("%s\n", xyzModem_error(err)); printf("\n%s\n", xyzModem_error(err));
return (~0); /* Download aborted */
} }
xyzModem_stream_terminate(false, &getcxmodem); xyzModem_stream_terminate(false, &getcxmodem);