openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

Break endless loop in serialport_write()

Browse Source 
Serialport_write could loop endlessly when used with a seemingly valid port
that does always return 0 on writes instead of an error.
Give up after about 125 ms i.e. 250 tries with a period of 500 us.

Corresponding to flashrom svn r1626.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Idwer Vollering <vidwer@gmail.com>
This commit is contained in:
Stefan Tauner 2012-11-30 16:46:41 +00:00
parent 26148ae3a8
commit 62574aa5c0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
serial.c
View File

@ -262,6 +262,7 @@ int serialport_write(unsigned char *buf, unsigned int writecnt)
#else #else
ssize_t tmp = 0; ssize_t tmp = 0;
#endif #endif
unsigned int empty_writes = 250; /* results in a ca. 125ms timeout */
while (writecnt > 0) { while (writecnt > 0) {
#ifdef _WIN32 #ifdef _WIN32
@ -273,9 +274,16 @@ int serialport_write(unsigned char *buf, unsigned int writecnt)
msg_perr("Serial port write error!\n"); msg_perr("Serial port write error!\n");
return 1; return 1;
} }
if (!tmp) if (!tmp) {
msg_pdbg("Empty write\n"); msg_pdbg2("Empty write\n");
writecnt -= tmp; empty_writes--;
programmer_delay(500);
if (empty_writes == 0) {
msg_perr("Serial port is unresponsive!\n");
return 1;
}
}
writecnt -= tmp;
buf += tmp; buf += tmp;
} }