ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use proper constant for invalid handles in Windows.

This commit is contained in:
Stephen Anthony 2020-10-25 15:03:34 -02:30
parent dd59729850
commit b9bb99aa4c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/windows/SerialPortWINDOWS.cxx
View File

@ -27,22 +27,22 @@ SerialPortWINDOWS::SerialPortWINDOWS()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SerialPortWINDOWS::~SerialPortWINDOWS()
{
if(myHandle)
if(myHandle != INVALID_HANDLE_VALUE)
{
CloseHandle(myHandle);
myHandle = 0;
myHandle = INVALID_HANDLE_VALUE;
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortWINDOWS::openPort(const string& device)
{
if(!myHandle)
if(myHandle == INVALID_HANDLE_VALUE)
{
myHandle = CreateFile(device.c_str(), GENERIC_READ|GENERIC_WRITE, 0,
NULL, OPEN_EXISTING, 0, NULL);
if(myHandle)
if(myHandle != INVALID_HANDLE_VALUE)
{
DCB dcb;
@ -51,7 +51,7 @@ bool SerialPortWINDOWS::openPort(const string& device)
if(!BuildCommDCB("19200,n,8,1", &dcb))
{
CloseHandle(myHandle);
myHandle = 0;
myHandle = INVALID_HANDLE_VALUE;
return false;
}
@ -79,7 +79,7 @@ bool SerialPortWINDOWS::openPort(const string& device)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortWINDOWS::readByte(uInt8& data)
{
if(myHandle)
if(myHandle != INVALID_HANDLE_VALUE)
{
DWORD read;
ReadFile(myHandle, &data, 1, &read, NULL);
@ -91,7 +91,7 @@ bool SerialPortWINDOWS::readByte(uInt8& data)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortWINDOWS::writeByte(uInt8 data)
{
if(myHandle)
if(myHandle != INVALID_HANDLE_VALUE)
{
DWORD written;
WriteFile(myHandle, &data, 1, &written, NULL);
@ -103,7 +103,7 @@ bool SerialPortWINDOWS::writeByte(uInt8 data)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortWINDOWS::isCTS()
{
if(myHandle)
if(myHandle != INVALID_HANDLE_VALUE)
{
DWORD modemStat;
GetCommModemStatus(myHandle, &modemStat);

2
src/windows/SerialPortWINDOWS.hxx
View File

@ -71,7 +71,7 @@ class SerialPortWINDOWS : public SerialPort
private:
// Handle to serial port
HANDLE myHandle{0};
HANDLE myHandle{INVALID_HANDLE_VALUE};
private:
// Following constructors and assignment operators not supported