Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-22 17:16:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1987 from stefanrueger/win-write-timeout

Browse Source 
Fix r/w timeout for Windows `ser_send()`
This commit is contained in:
Stefan Rueger
2025-05-21 08:06:18 +02:00
committed by GitHub
parent 0ad18e5c2f e9d58b5f30
commit dcf0b4829c
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ser_win32.c
View File

@@ -70,7 +70,8 @@ static DWORD serial_baud_lookup(long baud) {
return baud;
}
static BOOL serial_w32SetTimeOut(HANDLE hComPort, DWORD timeout) { // ms
// Set read timeout in ms
static BOOL serial_w32SetTimeOut(HANDLE hComPort, DWORD timeout) {
COMMTIMEOUTS ctmo;
ZeroMemory(&ctmo, sizeof(COMMTIMEOUTS));
@@ -81,6 +82,16 @@ static BOOL serial_w32SetTimeOut(HANDLE hComPort, DWORD timeout) { // ms
return SetCommTimeouts(hComPort, &ctmo);
}
// Set read/write timeout in ms
static BOOL serial_w32SetRWTimeOut(HANDLE hComPort, DWORD timeout) {
COMMTIMEOUTS ctmo = {0};
ctmo.ReadTotalTimeoutConstant = timeout;
ctmo.WriteTotalTimeoutConstant = timeout;
return SetCommTimeouts(hComPort, &ctmo);
}
static int ser_setparams(const union filedescriptor *fd, long baud, unsigned long cflags) {
if(cx->ser_serial_over_ethernet)
return -ENOTTY;
@@ -343,7 +354,11 @@ static int ser_send(const union filedescriptor *fd, const unsigned char *buf, si
if(verbose >= MSG_TRACE)
trace_buffer(__func__, buf, len);
serial_w32SetTimeOut(hComPort, 500);
// Set minimum r/w timeout to 2000 ms or higher to cater for 110 baud or faster
if(!serial_w32SetRWTimeOut(hComPort, (len > 20? len: 20)*100)) {
pmsg_error("cannot set r/w timeout for serial port\n");
return -1;
}
if(!WriteFile(hComPort, buf, len, &written, NULL)) {
pmsg_error("unable to write: %s\n", "sorry no info avail"); // TODO
@@ -433,7 +448,12 @@ static int ser_recv(const union filedescriptor *fd, unsigned char *buf, size_t b
return -1;
}
serial_w32SetTimeOut(hComPort, serial_recv_timeout);
// Ensure can receive buflen bytes at 8N1 at 110 baud or higher: one byte takes 91 ms at 110 baud
long timeout = (long) buflen*100 > serial_recv_timeout? (long) buflen*100: serial_recv_timeout;
if(!serial_w32SetTimeOut(hComPort, timeout)) {
pmsg_error("cannot set read timeout for serial port\n");
return -1;
}
if(!ReadFile(hComPort, buf, buflen, &read, NULL)) {
LPVOID lpMsgBuf;
@@ -541,9 +561,8 @@ static int ser_drain(const union filedescriptor *fd, int display) {
serial_w32SetTimeOut(hComPort, serial_drain_timeout);
if(display) {
if(display)
msg_info("drain>");
}
while(1) {
readres = ReadFile(hComPort, buf, 1, &read, NULL);