diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:07:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:07:32 +0200 |
| commit | 3bb682ea29ffaf72ff73e6eb57abdc5c59524e8a (patch) | |
| tree | 4d8e828da7ea6115c6ffe26cec2d024bad60aa91 /src/serialport/qserialport_unix_p.h | |
| parent | 14fe584d2abb1ae0776f0973b245baa79d0468d2 (diff) | |
| parent | 62dfdeb3642250bdb642dbf607a8c7b95e57835e (diff) | |
| download | qtserialport-3bb682ea29ffaf72ff73e6eb57abdc5c59524e8a.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: Id7e66059233e8d07ba44cad19048d9cddc68e250
Diffstat (limited to 'src/serialport/qserialport_unix_p.h')
| -rw-r--r-- | src/serialport/qserialport_unix_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h index e24804d..1cc767d 100644 --- a/src/serialport/qserialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -111,7 +111,7 @@ public: bool sendBreak(int duration); bool setBreakEnabled(bool set); - void startWriting(); + qint64 readData(char *data, qint64 maxSize); bool waitForReadyRead(int msecs); bool waitForBytesWritten(int msecs); @@ -128,6 +128,9 @@ public: bool startAsyncWrite(); bool completeAsyncWrite(); + qint64 bytesToWrite() const; + qint64 writeData(const char *data, qint64 maxSize); + static QString portNameToSystemLocation(const QString &port); static QString portNameFromSystemLocation(const QString &location); |