From 5edd8ac32bb066318fef0c4b802bf26c86985e29 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 27 Oct 2019 16:53:24 +0000 Subject: [PATCH] SSC: Get initial modem status when COM port is first opened --- source/SerialComms.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/SerialComms.cpp b/source/SerialComms.cpp index a9e2fbf6..20958242 100644 --- a/source/SerialComms.cpp +++ b/source/SerialComms.cpp @@ -264,6 +264,8 @@ bool CSuperSerialCard::CheckComm() if (m_hCommHandle != INVALID_HANDLE_VALUE) { + GetCommModemStatus(m_hCommHandle, const_cast(&m_dwModemStatus)); + //BOOL bRes = SetupComm(m_hCommHandle, 8192, 8192); //_ASSERT(bRes); @@ -1085,9 +1087,7 @@ DWORD WINAPI CSuperSerialCard::CommThread(LPVOID lpParameter) // const UINT nNumEvents = 2; - HANDLE hCommEvent_Wait[nNumEvents] = {pSSC->m_hCommEvent[COMMEVT_WAIT], pSSC->m_hCommEvent[COMMEVT_TERM]}; - HANDLE hCommEvent_Ack[nNumEvents] = {pSSC->m_hCommEvent[COMMEVT_ACK], pSSC->m_hCommEvent[COMMEVT_TERM]}; while(1) { @@ -1095,7 +1095,6 @@ DWORD WINAPI CSuperSerialCard::CommThread(LPVOID lpParameter) DWORD dwWaitResult; bRes = WaitCommEvent(pSSC->m_hCommHandle, &dwEvtMask, &pSSC->m_o); // Will return immediately (probably with ERROR_IO_PENDING) - _ASSERT(!bRes); if (!bRes) { DWORD dwRet = GetLastError();