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: Break out helper function for awaiting previous write completion.

Browse Source
This commit is contained in:
Martin Ling 2017-07-03 20:55:13 +01:00 committed by Uwe Hermann
parent 15541ebd78
commit 62ed9f801a
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
serialport.c
View File

@ -731,6 +731,27 @@ SP_API enum sp_return sp_drain(struct sp_port *port)
#endif #endif
} }
#ifdef _WIN32
static enum sp_return await_write_completion(struct sp_port *port)
{
TRACE("%p", port);
DWORD bytes_written;
BOOL result;
/* Wait for previous non-blocking write to complete, if any. */
if (port->writing) {
DEBUG("Waiting for previous write to complete");
result = GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
port->writing = 0;
if (!result)
RETURN_FAIL("Previous write failed to complete");
DEBUG("Previous write completed");
}
RETURN_OK();
}
#endif
SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf, SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
size_t count, unsigned int timeout_ms) size_t count, unsigned int timeout_ms)
{ {
@ -753,17 +774,8 @@ SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
#ifdef _WIN32 #ifdef _WIN32
DWORD bytes_written = 0; DWORD bytes_written = 0;
BOOL result;
/* Wait for previous non-blocking write to complete, if any. */ TRY(await_write_completion(port));
if (port->writing) {
DEBUG("Waiting for previous write to complete");
result = GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
port->writing = 0;
if (!result)
RETURN_FAIL("Previous write failed to complete");
DEBUG("Previous write completed");
}
/* Set timeout. */ /* Set timeout. */
if (port->timeouts.WriteTotalTimeoutConstant != timeout_ms) { if (port->timeouts.WriteTotalTimeoutConstant != timeout_ms) {