JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: serial: select: fix WaitCommEvent request

Browse Source 
- make sure event object is reset
- set read_ready to true if WaitCommEvent returns success
- improve debugging

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2020-03-23 13:08:32 +01:00
parent 912c902615
commit 3a74630f75
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/select.cc
View File

@ -1457,7 +1457,7 @@ peek_serial (select_record *s, bool)
if (!ClearCommError (h, &io_err, &st)) if (!ClearCommError (h, &io_err, &st))
{ {
debug_printf ("ClearCommError %E"); select_printf ("ClearCommError %E");
goto err; goto err;
} }
if (st.cbInQue) if (st.cbInQue)
@ -1493,6 +1493,7 @@ serial_read_cleanup (select_record *s, select_stuff *stuff)
} }
} }
static int
verify_serial (select_record *me, fd_set *rfds, fd_set *wfds, fd_set *efds) verify_serial (select_record *me, fd_set *rfds, fd_set *wfds, fd_set *efds)
{ {
return peek_serial (me, true); return peek_serial (me, true);
@ -1513,9 +1514,16 @@ fhandler_serial::select_read (select_stuff *ss)
See: http://cygwin.com/ml/cygwin/2009-01/msg00667.html */ See: http://cygwin.com/ml/cygwin/2009-01/msg00667.html */
SetCommMask (get_handle_cyg (), 0); SetCommMask (get_handle_cyg (), 0);
SetCommMask (get_handle_cyg (), EV_RXCHAR); SetCommMask (get_handle_cyg (), EV_RXCHAR);
if (!WaitCommEvent (get_handle_cyg (), &event, &io_status) ResetEvent (io_status.hEvent);
&& GetLastError () == ERROR_IO_PENDING) if (!WaitCommEvent (get_handle_cyg (), &event, &io_status))
{
if (GetLastError () == ERROR_IO_PENDING)
s->h = io_status.hEvent; s->h = io_status.hEvent;
else
select_printf ("WaitCommEvent %E");
}
else
s->read_ready = true;
return s; return s;
} }