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

Fix sp_blocking_read_next() implementation on Windows.

Browse Source 
A ReadFile() call needed to check the actual number of bytes read,
instead of assuming all requested bytes were read.
This commit is contained in:
Uwe Hermann 2016-01-22 15:30:44 +01:00
parent 02c8a1424d
commit 888fb45d66
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
serialport.c
View File

@ -1112,9 +1112,8 @@ SP_API enum sp_return sp_blocking_read_next(struct sp_port *port, void *buf,
/* Loop until we have at least one byte, or timeout is reached. */ /* Loop until we have at least one byte, or timeout is reached. */
while (bytes_read == 0) { while (bytes_read == 0) {
/* Start read. */ /* Start read. */
if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl)) { if (ReadFile(port->hdl, buf, count, &bytes_read, &port->read_ovl)) {
DEBUG("Read completed immediately"); DEBUG("Read completed immediately");
bytes_read = count;
} else if (GetLastError() == ERROR_IO_PENDING) { } else if (GetLastError() == ERROR_IO_PENDING) {
DEBUG("Waiting for read to complete"); DEBUG("Waiting for read to complete");
if (GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE) == 0) if (GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE) == 0)