mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix the win32 raw serial receive support using a critical section

Browse Source 
(untested - code should be enabled after successful testing).
This commit is contained in:
Volker Ruppert 2014-12-23 17:13:29 +00:00
parent 5abc3e647f
commit 88d9ad57bf
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bochs/iodev/serial_raw.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004-2013 The Bochs Project
// Copyright (C) 2004-2014 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -71,6 +71,7 @@ serial_raw::serial_raw(const char *devname)
SetCommMask(hCOM, EV_BREAK | EV_CTS | EV_DSR | EV_ERR | EV_RING | EV_RLSD | EV_RXCHAR);
memset(&rx_ovl, 0, sizeof(OVERLAPPED));
rx_ovl.hEvent = CreateEvent(NULL,TRUE,FALSE,"receive");
InitializeCriticalSection(&serialCS);
hRawSerialThread = CreateThread(NULL, 0, RawSerialThread, this, 0, &threadID);
#endif
} else {
@ -96,6 +97,7 @@ serial_raw::~serial_raw(void)
thread_quit = TRUE;
SetCommMask(hCOM, 0);
while (thread_active) Sleep(10);
DeleteCriticalSection(&serialCS);
CloseHandle(thread_ovl.hEvent);
CloseHandle(rx_ovl.hEvent);
CloseHandle(hRawSerialThread);
@ -292,11 +294,17 @@ int serial_raw::receive()
if (DCBchanged) {
setup_port();
}
#ifdef WIN32_RECEIVE_RAW
EnterCriticalSection(&serialCS);
#endif
data = rxdata_buffer[0];
if (rxdata_count > 0) {
memcpy(&rxdata_buffer[0], &rxdata_buffer[1], sizeof(Bit16s)*(RX_BUFSIZE-1));
memmove(&rxdata_buffer[0], &rxdata_buffer[1], sizeof(Bit16s)*(RX_BUFSIZE-1));
rxdata_count--;
}
#ifdef WIN32_RECEIVE_RAW
LeaveCriticalSection(&serialCS);
#endif
if (data < 0) {
switch (data) {
case RAW_EVENT_CTS_ON:
@ -360,13 +368,17 @@ void serial_raw::serial_thread()
while (!thread_quit) {
if ((rxdata_count == 0) && (thread_rxdata_count > 0)) {
if (thread_rxdata_count > RX_BUFSIZE) {
EnterCriticalSection(&serialCS);
memcpy(&rxdata_buffer[0], &thread_rxdata_buffer[0], sizeof(Bit16s)*RX_BUFSIZE);
memcpy(&thread_rxdata_buffer[0], &thread_rxdata_buffer[RX_BUFSIZE], sizeof(Bit16s)*(thread_rxdata_count-RX_BUFSIZE));
rxdata_count = RX_BUFSIZE;
LeaveCriticalSection(&serialCS);
memmove(&thread_rxdata_buffer[0], &thread_rxdata_buffer[RX_BUFSIZE], sizeof(Bit16s)*(thread_rxdata_count-RX_BUFSIZE));
thread_rxdata_count -= RX_BUFSIZE;
} else {
EnterCriticalSection(&serialCS);
memcpy(&rxdata_buffer[0], &thread_rxdata_buffer[0], sizeof(Bit16s)*thread_rxdata_count);
rxdata_count = thread_rxdata_count;
LeaveCriticalSection(&serialCS);
thread_rxdata_count = 0;
}
}
@ -399,13 +411,17 @@ void serial_raw::serial_thread()
}
if ((rxdata_count == 0) && (thread_rxdata_count > 0)) {
if (thread_rxdata_count > RX_BUFSIZE) {
EnterCriticalSection(&serialCS);
memcpy(&rxdata_buffer[0], &thread_rxdata_buffer[0], sizeof(Bit16s)*RX_BUFSIZE);
memcpy(&thread_rxdata_buffer[0], &thread_rxdata_buffer[RX_BUFSIZE], sizeof(Bit16s)*(thread_rxdata_count-RX_BUFSIZE));
rxdata_count = RX_BUFSIZE;
LeaveCriticalSection(&serialCS);
memmove(&thread_rxdata_buffer[0], &thread_rxdata_buffer[RX_BUFSIZE], sizeof(Bit16s)*(thread_rxdata_count-RX_BUFSIZE));
thread_rxdata_count -= RX_BUFSIZE;
} else {
EnterCriticalSection(&serialCS);
memcpy(&rxdata_buffer[0], &thread_rxdata_buffer[0], sizeof(Bit16s)*thread_rxdata_count);
rxdata_count = thread_rxdata_count;
LeaveCriticalSection(&serialCS);
thread_rxdata_count = 0;
}
}

3
bochs/iodev/serial_raw.h
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004-2013 The Bochs Project
// Copyright (C) 2004-2014 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -91,6 +91,7 @@ public:
OVERLAPPED thread_ovl;
unsigned thread_rxdata_count;
Bit16s thread_rxdata_buffer[THREAD_RX_BUFSIZE];
CRITICAL_SECTION serialCS;
#endif
#endif
};