Break endless loop in serialport_write()
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>
diff --git a/serial.c b/serial.c
index 7e47dcc..9446ce3 100644
--- a/serial.c
+++ b/serial.c
@@ -262,6 +262,7 @@
#else
ssize_t tmp = 0;
#endif
+ unsigned int empty_writes = 250; /* results in a ca. 125ms timeout */
while (writecnt > 0) {
#ifdef _WIN32
@@ -273,9 +274,16 @@
msg_perr("Serial port write error!\n");
return 1;
}
- if (!tmp)
- msg_pdbg("Empty write\n");
- writecnt -= tmp;
+ if (!tmp) {
+ msg_pdbg2("Empty write\n");
+ empty_writes--;
+ programmer_delay(500);
+ if (empty_writes == 0) {
+ msg_perr("Serial port is unresponsive!\n");
+ return 1;
+ }
+ }
+ writecnt -= tmp;
buf += tmp;
}