mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

windows: Avoid unnecessary calls to SetCommTimeouts().

Browse Source 
This fixes bug #586.
This commit is contained in:
Martin Ling 2015-05-06 16:40:41 +01:00 committed by Uwe Hermann
parent 9a0c4bbdbe
commit 27a58c0521
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
serialport.c
View File

@ -751,9 +751,11 @@ SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
} }
/* Set timeout. */ /* Set timeout. */
port->timeouts.WriteTotalTimeoutConstant = timeout_ms; if (port->timeouts.WriteTotalTimeoutConstant != timeout_ms) {
if (SetCommTimeouts(port->hdl, &port->timeouts) == 0) port->timeouts.WriteTotalTimeoutConstant = timeout_ms;
RETURN_FAIL("SetCommTimeouts() failed"); if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
RETURN_FAIL("SetCommTimeouts() failed");
}
/* Start write. */ /* Start write. */
if (WriteFile(port->hdl, buf, count, NULL, &port->write_ovl) == 0) { if (WriteFile(port->hdl, buf, count, NULL, &port->write_ovl) == 0) {
@ -864,9 +866,11 @@ SP_API enum sp_return sp_nonblocking_write(struct sp_port *port,
} }
/* Set timeout. */ /* Set timeout. */
port->timeouts.WriteTotalTimeoutConstant = 0; if (port->timeouts.WriteTotalTimeoutConstant != 0) {
if (SetCommTimeouts(port->hdl, &port->timeouts) == 0) port->timeouts.WriteTotalTimeoutConstant = 0;
RETURN_FAIL("SetCommTimeouts() failed"); if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
RETURN_FAIL("SetCommTimeouts() failed");
}
/* /*
* Keep writing data until the OS has to actually start an async IO * Keep writing data until the OS has to actually start an async IO
@ -939,10 +943,13 @@ SP_API enum sp_return sp_blocking_read(struct sp_port *port, void *buf,
int ret; int ret;
/* Set timeout. */ /* Set timeout. */
port->timeouts.ReadIntervalTimeout = 0; if (port->timeouts.ReadIntervalTimeout != 0 ||
port->timeouts.ReadTotalTimeoutConstant = timeout_ms; port->timeouts.ReadTotalTimeoutConstant != timeout_ms) {
if (SetCommTimeouts(port->hdl, &port->timeouts) == 0) port->timeouts.ReadIntervalTimeout = 0;
RETURN_FAIL("SetCommTimeouts() failed"); port->timeouts.ReadTotalTimeoutConstant = timeout_ms;
if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
RETURN_FAIL("SetCommTimeouts() failed");
}
/* Start read. */ /* Start read. */
if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0) { if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0) {
@ -1051,10 +1058,13 @@ SP_API enum sp_return sp_nonblocking_read(struct sp_port *port, void *buf,
int ret; int ret;
/* Set timeout. */ /* Set timeout. */
port->timeouts.ReadIntervalTimeout = MAXDWORD; if (port->timeouts.ReadIntervalTimeout != MAXDWORD ||
port->timeouts.ReadTotalTimeoutConstant = 0; port->timeouts.ReadTotalTimeoutConstant != 0) {
if (SetCommTimeouts(port->hdl, &port->timeouts) == 0) port->timeouts.ReadIntervalTimeout = MAXDWORD;
RETURN_FAIL("SetCommTimeouts() failed"); port->timeouts.ReadTotalTimeoutConstant = 0;
if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
RETURN_FAIL("SetCommTimeouts() failed");
}
/* Do read. */ /* Do read. */
if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0) if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0)