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

Increase windows serial timeouts for 110 baud or more

Browse Source
This commit is contained in:
stefanrueger
2025-05-13 13:16:47 +02:00
parent da7669f3dc
commit e9d58b5f30
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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,7 +82,8 @@ static BOOL serial_w32SetTimeOut(HANDLE hComPort, DWORD timeout) { // ms
return SetCommTimeouts(hComPort, &ctmo);
}
static BOOL serial_w32SetRWTimeOut(HANDLE hComPort, DWORD timeout) { // ms
// Set read/write timeout in ms
static BOOL serial_w32SetRWTimeOut(HANDLE hComPort, DWORD timeout) {
COMMTIMEOUTS ctmo = {0};
ctmo.ReadTotalTimeoutConstant = timeout;
@@ -352,7 +354,8 @@ static int ser_send(const union filedescriptor *fd, const unsigned char *buf, si
if(verbose >= MSG_TRACE)
trace_buffer(__func__, buf, len);
if(!serial_w32SetRWTimeOut(hComPort, (len > 5? len: 5)*100)) {
// 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;
}
@@ -445,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;
@@ -553,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);