Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-31 21:29:39 +00:00
Code Issues Projects Releases Wiki Activity

SerialComms: Changed queue to deque so we can clear() the container.

Browse Source
This commit is contained in:
tomch 2009-10-19 21:33:12 +00:00
parent 18ebd06cfe
commit 176e3c932c
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
AppleWin/source/SerialComms.cpp
View File

@ -99,9 +99,9 @@ void CSuperSerialCard::InternalReset()
m_vbTxIrqPending = false; m_vbTxIrqPending = false;
m_vbRxIrqPending = false; m_vbRxIrqPending = false;
m_qComSerialBuffer[0].c.clear(); m_qComSerialBuffer[0].clear();
m_qComSerialBuffer[1].c.clear(); m_qComSerialBuffer[1].clear();
m_qTcpSerialBuffer.c.clear(); m_qTcpSerialBuffer.clear();
} }
CSuperSerialCard::~CSuperSerialCard() CSuperSerialCard::~CSuperSerialCard()
@ -351,10 +351,8 @@ void CSuperSerialCard::CommTcpSerialClose()
closesocket(m_hCommAcceptSocket); closesocket(m_hCommAcceptSocket);
m_hCommAcceptSocket = INVALID_SOCKET; m_hCommAcceptSocket = INVALID_SOCKET;
} }
while (!m_qTcpSerialBuffer.empty())
{ m_qTcpSerialBuffer.clear();
m_qTcpSerialBuffer.pop();
}
} }
//=========================================================================== //===========================================================================
@ -381,7 +379,7 @@ void CSuperSerialCard::CommTcpSerialReceive()
{ {
for (int i = 0; i < nReceived; i++) for (int i = 0; i < nReceived; i++)
{ {
m_qTcpSerialBuffer.push(Data[i]); m_qTcpSerialBuffer.push_back(Data[i]);
} }
} }
@ -603,7 +601,7 @@ BYTE __stdcall CSuperSerialCard::CommReceive(WORD, WORD, BYTE, BYTE, ULONG)
if (!m_qTcpSerialBuffer.empty()) if (!m_qTcpSerialBuffer.empty())
{ {
result = m_qTcpSerialBuffer.front(); result = m_qTcpSerialBuffer.front();
m_qTcpSerialBuffer.pop(); m_qTcpSerialBuffer.pop_front();
} }
else if (m_hCommHandle != INVALID_HANDLE_VALUE) // COM else if (m_hCommHandle != INVALID_HANDLE_VALUE) // COM
{ {
@ -614,7 +612,7 @@ BYTE __stdcall CSuperSerialCard::CommReceive(WORD, WORD, BYTE, BYTE, ULONG)
if (!m_qComSerialBuffer[uSSCIdx].empty()) if (!m_qComSerialBuffer[uSSCIdx].empty())
{ {
result = m_qComSerialBuffer[uSSCIdx].front(); result = m_qComSerialBuffer[uSSCIdx].front();
m_qComSerialBuffer[uSSCIdx].pop(); m_qComSerialBuffer[uSSCIdx].pop_front();
UINT uNewSSCIdx = uSSCIdx; UINT uNewSSCIdx = uSSCIdx;
if ( m_qComSerialBuffer[uSSCIdx].empty() && // Current SSC buffer is empty if ( m_qComSerialBuffer[uSSCIdx].empty() && // Current SSC buffer is empty
@ -956,7 +954,7 @@ void CSuperSerialCard::CheckCommEvent(DWORD dwEvtMask)
{ {
const UINT uCOMIdx = m_vuRxCurrBuffer; const UINT uCOMIdx = m_vuRxCurrBuffer;
for (DWORD i = 0; i < dwReceived; i++) for (DWORD i = 0; i < dwReceived; i++)
m_qComSerialBuffer[uCOMIdx].push(Data[i]); m_qComSerialBuffer[uCOMIdx].push_back(Data[i]);
} }
LeaveCriticalSection(&m_CriticalSection); LeaveCriticalSection(&m_CriticalSection);
} }

4
AppleWin/source/SerialComms.h
View File

@ -113,9 +113,9 @@ private:
// //
CRITICAL_SECTION m_CriticalSection; // To guard /g_vRecvBytes/ CRITICAL_SECTION m_CriticalSection; // To guard /g_vRecvBytes/
queue<BYTE> m_qComSerialBuffer[2]; deque<BYTE> m_qComSerialBuffer[2];
volatile UINT m_vuRxCurrBuffer; // Written to on COM recv. SSC reads from other one volatile UINT m_vuRxCurrBuffer; // Written to on COM recv. SSC reads from other one
queue<BYTE> m_qTcpSerialBuffer; deque<BYTE> m_qTcpSerialBuffer;
// //