diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-01-10 15:31:56 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-01-11 11:06:46 +0000 |
commit | 6dda140ada3d7c683537b069bf1512275a190884 (patch) | |
tree | 18802caba365a102c4abf1c90f4f17fc3e221958 | |
parent | 4ff8b20cf2877298c8437fb892ebda600f46e293 (diff) | |
download | qtserialport-6dda140ada3d7c683537b069bf1512275a190884.tar.gz |
Get rid of QSPP::updateCommTimeouts() method
This method is used only once when initializing of a device.
Thus its code can be moved to an initialization place, and
this method can be removed then.
Change-Id: Ie9a40da1d6a2980829327f66830893ad7179bd57
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r-- | src/serialport/qserialport_p.h | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_win.cpp | 13 | ||||
-rw-r--r-- | src/serialport/qserialport_wince.cpp | 13 |
3 files changed, 6 insertions, 22 deletions
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index 4a214e1..29c1d5a 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -182,7 +182,6 @@ public: bool initialize(DWORD eventMask); bool updateDcb(); - bool updateCommTimeouts(); bool waitForReadOrWrite(bool *selectForRead, bool *selectForWrite, bool checkRead, bool checkWrite, @@ -205,7 +204,6 @@ public: bool initialize(); bool setDcb(DCB *dcb); bool getDcb(DCB *dcb); - bool updateCommTimeouts(); OVERLAPPED *waitForNotified(int msecs); bool completeAsyncCommunication(qint64 bytesTransferred); diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index f176025..6d5dac0 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -631,8 +631,10 @@ inline bool QSerialPortPrivate::initialize() ::ZeroMemory(¤tCommTimeouts, sizeof(currentCommTimeouts)); currentCommTimeouts.ReadIntervalTimeout = MAXDWORD; - if (!updateCommTimeouts()) + if (!::SetCommTimeouts(handle, ¤tCommTimeouts)) { + setError(getSystemError()); return false; + } if (!::SetCommMask(handle, originalEventMask)) { setError(getSystemError()); @@ -672,15 +674,6 @@ bool QSerialPortPrivate::getDcb(DCB *dcb) return true; } -bool QSerialPortPrivate::updateCommTimeouts() -{ - if (!::SetCommTimeouts(handle, ¤tCommTimeouts)) { - setError(getSystemError()); - return false; - } - return true; -} - QSerialPortErrorInfo QSerialPortPrivate::getSystemError(int systemErrorCode) const { if (systemErrorCode == -1) diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index 9221f0e..6b063e1 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -559,8 +559,10 @@ inline bool QSerialPortPrivate::initialize(DWORD eventMask) ::memset(¤tCommTimeouts, 0, sizeof(currentCommTimeouts)); currentCommTimeouts.ReadIntervalTimeout = MAXDWORD; - if (!updateCommTimeouts()) + if (!::SetCommTimeouts(handle, ¤tCommTimeouts)) { + setError(getSystemError()); return false; + } eventNotifier = new CommEventNotifier(eventMask, this, q); eventNotifier->start(); @@ -589,15 +591,6 @@ bool QSerialPortPrivate::updateDcb() return ret; } -bool QSerialPortPrivate::updateCommTimeouts() -{ - if (!::SetCommTimeouts(handle, ¤tCommTimeouts)) { - setError(getSystemError()); - return false; - } - return true; -} - QSerialPortErrorInfo QSerialPortPrivate::getSystemError(int systemErrorCode) const { if (systemErrorCode == -1) |