diff options
Diffstat (limited to 'src/serialport/qserialport_wince.cpp')
| -rw-r--r-- | src/serialport/qserialport_wince.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index b1975af..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) @@ -743,15 +736,6 @@ static const QList<qint32> standardBaudRatePairList() return standardBaudRatesTable; }; -qint32 QSerialPortPrivate::settingFromBaudRate(qint32 baudRate) -{ - const QList<qint32> baudRatePairList = standardBaudRatePairList(); - const QList<qint32>::const_iterator baudRatePairListConstIterator - = std::find(baudRatePairList.constBegin(), baudRatePairList.constEnd(), baudRate); - - return (baudRatePairListConstIterator != baudRatePairList.constEnd()) ? *baudRatePairListConstIterator : 0; -} - QList<qint32> QSerialPortPrivate::standardBaudRates() { return standardBaudRatePairList(); |