qt:qtserialport.git
3 years agoEdit changelog for 5.4.1 version v5.4.1
Leena Miettinen [Mon, 19 Jan 2015 10:00:42 +0000 (11:00 +0100)]
Edit changelog for 5.4.1 version

Fix grammar, spelling, and style issues.

Change-Id: I98f8429f200d24633f504f6ea701509555da38a1
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoAdd changelog for 5.4.1 version
Denis Shienkov [Sat, 17 Jan 2015 10:34:21 +0000 (13:34 +0300)]
Add changelog for 5.4.1 version

Change-Id: I7623182c1ce1eecd724a2b4e8593f75a1ac49cc9
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoSkip the constructByInfo() test if no serial ports are found on *nix
Denis Shienkov [Sun, 4 Jan 2015 16:11:27 +0000 (16:11 +0000)]
Skip the constructByInfo() test if no serial ports are found on *nix

In unix-like systems it is possible to use socat to creation of the
virtual serial ports. But these devices are symlinks on the /dev/pts
devices, that is not a serial ports. Thus QSPI can not find it and will
construct a null object. In this case this is not an error and we need
just to skip test.

Change-Id: I59bbb3c4653555be39ea6fff903c386065c10d0a
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoShare the clearReceiver() function and for the *nix tests
Denis Shienkov [Sun, 4 Jan 2015 16:32:57 +0000 (16:32 +0000)]
Share the clearReceiver() function and for the *nix tests

The waitForReadyReadWithTimeout() test is failed when using the socat
utility. The reason is that the receiver's side receive data from the
previous waitForBytesWritten() test, even the receiver was closed and
re-opened again in the new test. We need suppress this behavior using
the clearReceiver() function when starting of
waitForReadyReadWithTimeout() test.

Change-Id: I6735aa9c9744ec1732f9bd4f701068a540ae2316
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoDo not touch of the read notifier after its creation
Denis Shienkov [Sun, 4 Jan 2015 17:03:53 +0000 (17:03 +0000)]
Do not touch of the read notifier after its creation

When are used the multiple opening and closing chains, then a read
notification can be stalled. The reason is in old heritage of a code
related to preventing of recursive calls. Thus, need just to remove this
old code. It is not the in-depth investigation of an issue but just a
workaround which can be improved in future.

Tested on Linux with on-board and socat serial ports using Qt5.

Task-number: QTBUG-43484
Change-Id: I04556fdde2775448b33d68f141f4328647c549c9
Reviewed-by: Laszlo Papp <lpapp@kde.org>
3 years agoRemove README file.
Jeff Tranter [Tue, 23 Dec 2014 18:20:40 +0000 (13:20 -0500)]
Remove README file.

Remove the README file as it is empty.

Change-Id: Icd252062c00d81a28a41d910161a4e56d2934493
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoMerge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
Frederik Gladhorn [Wed, 17 Dec 2014 12:02:30 +0000 (13:02 +0100)]
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4

3 years agoMerge remote-tracking branch 'origin/5.4.0' into 5.4
Frederik Gladhorn [Wed, 17 Dec 2014 11:59:10 +0000 (12:59 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Ic608866ccf52db4cd42bc2563a040d9cbd47d684

3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Wed, 17 Dec 2014 11:49:35 +0000 (12:49 +0100)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I078c03570399f5212b660b7ed29d3e45ed995896

3 years agoBump version
Oswald Buddenhagen [Fri, 12 Dec 2014 12:48:46 +0000 (13:48 +0100)]
Bump version

Change-Id: Id5237f32002f15c64ff41e59e19c6308cc1eb2b5

3 years agoUse Q_NULLPTR where it is possible
Denis Shienkov [Tue, 9 Dec 2014 20:19:44 +0000 (23:19 +0300)]
Use Q_NULLPTR where it is possible

Change-Id: I7261a92ea4405c8aeab7670f73e7225ed7e4d9d0
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoDo not use internal pre-cached RTS and DTR variables
Denis Shienkov [Fri, 5 Dec 2014 09:57:48 +0000 (12:57 +0300)]
Do not use internal pre-cached RTS and DTR variables

Some devices do not support these signals, and returns an errors when attempt
to query it. But the QSP::open() always requests a status of these lines.
In this case the QSP::open() will return true, but also will setup an error
code (for example, QSP::UnsupportedOperationError for socat's devices in
Linux). That is unexpected behavior for the user.

It is reasonable do not query a state of these signals when opening.
Also we do not need to use of appropriate internal variables, and we can
remove it.

Change-Id: I277110014c20c1f2c3fdaed20c4582d1356897b9
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoInterpret ENOTTY as UnsupportedOperationError instead of ResourceError
Denis Shienkov [Thu, 4 Dec 2014 19:57:11 +0000 (22:57 +0300)]
Interpret ENOTTY as UnsupportedOperationError instead of ResourceError

The ENOTTY is closer to QSP::UnsupportedOperationError, because it
is decoded as "Inappropriate ioctl for device".

Change-Id: Ibcbe09e201eeb5ede6daa417654a181dd380df5a
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoDetect of Bluetooth SPP (rfcomm) device with SysFs
Denis Shienkov [Thu, 4 Dec 2014 13:14:51 +0000 (16:14 +0300)]
Detect of Bluetooth SPP (rfcomm) device with SysFs

Change-Id: I41d67e9ca8d9cb6042b4d8de756a22d18b077dcd
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoSetup an error when QSP::setBaudRate() fails on Unix
Denis Shienkov [Thu, 4 Dec 2014 10:36:04 +0000 (13:36 +0300)]
Setup an error when QSP::setBaudRate() fails on Unix

Inside of a method is missed setup of an error code, therefore always
returns QSP::UnknownError (or some previous error).

Tested on Linux with USB PL2303, using Terminal example (when trying to
setup of an unsupported 14400 baud rate).

Change-Id: I6b3143dd6d451a32024a5ca5239dac826ceb7af6
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoMark a device as open only after all settings was aplied
Denis Shienkov [Thu, 4 Dec 2014 10:22:47 +0000 (13:22 +0300)]
Mark a device as open only after all settings was aplied

Otherwise it lead to emmiting of the QSP::NotOpenError in case we close
a device from a slot, which is connected to QSP::SerialPortError signal.
In this case QSP::close() called twice: from the slot, and from the
QSP::open() method (this behavior can be reproduced with Terminal
example).

So, inside of QSP::open() we need to move QIODevice::open() down, and
instead of QSP::close() to use QSPP::close().

Tested on Linux with USB PL2303 with trying to setup an unsupported
baud rate as 14400 baud.

Change-Id: I12dec085423dd9f5a08b7884f32dd2ba8aa8c951
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoDo not close closed device in Terminal example
Denis Shienkov [Thu, 4 Dec 2014 09:56:13 +0000 (12:56 +0300)]
Do not close closed device in Terminal example

When opening is fails, the QSP himself close a device. Thus, we do not
need to close device in Terminal example again, because it caused
emmiting of the QSP::NotOpenError and to showing of additional
messagebox.

Change-Id: Id8aa3f3b835fd7d4187bdf83c1d6584d5fd541f7
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoDetect a valid of serial8250 ports
Denis Shienkov [Sat, 29 Nov 2014 16:23:33 +0000 (16:23 +0000)]
Detect a valid of serial8250 ports

Usually, a Linux kernel reserves a places for the non-PnP serial
devices, for example, such as ttyS[0-4/14]. In case the system has not a
HW devices which are attached to this places, then these devices will be
stubs and present as usual serial ports. Thus, we can know about a
validity of these devices only in attempt to open them and to query a
type of.

Note: This patch is theoretical, because are not tested for a valid 8250
devices.

Task-number: QTBUG-32024
Change-Id: I313145caadfeeee4d5fe3c8e16c1bcf4ae79214d
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoImprove QSPI sysfs algorithm
Denis Shienkov [Sat, 29 Nov 2014 00:14:37 +0000 (00:14 +0000)]
Improve QSPI sysfs algorithm

Earlier, the algorithm used check for magic keywords (like "usb",
"platform" and so on) in the target path for decision-making what
of device can be skipped or accepted. But this is a wrong approach,
because on different platforms can be different key-words and we
can not know it. So, it is more reasonable to use a different
approach where we make decision by a driver name (by analogy with
current udev implementation). In this case we skip those devices
which has an empty driver name or when a name is equal to
"serial8250".

* When a driver name is empty, then we can be sure that it is
other than serial port device (e.g. as pseudo-terminal, console
and so on). Thus, it is similar to udev devices without a parent,
which we ignore.

* When a driver name is "serial8250", it is equal to "platform"
devices, which we too ignore for current implementation. Though in
a future this can be solved (i.e. we can try to detect a valid
devices based on "serial8250" driver).

Tested on Linux with on-board and USB serial ports using Qt5.

Change-Id: I884ad8f3fddff9487ad4a67c4904b57f62164e00
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoMake QSPI udev functions more readable
Denis Shienkov [Fri, 28 Nov 2014 21:48:56 +0000 (21:48 +0000)]
Make QSPI udev functions more readable

Change-Id: I5c33421338e6a64dbadeb168cf165a84bedec5b9
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoImprove QSPI algorithm on Unix
Denis Shienkov [Fri, 28 Nov 2014 21:25:36 +0000 (21:25 +0000)]
Improve QSPI algorithm on Unix

QSPI uses the wrong algorithm of devices search. In case no any devices
are detected with udev (or with sysfs), starts a search with a filters.
In this case a user gets a list of devices that are not a serial ports,
that is wrong.

The main idea should be in that udev or sysfs are the main sources of
obtaining information. In case they returns an empty list this means
that system has no serial ports.

Algorithm is:

Try to find devices through udev. If it fails (system error or udev is
not present), then try to find using sysfs; otherwise return udev result,
even if it has an empty list. If sysfs is fails (permission denied or
sysfs is not present), then try to find devices in /dev/ as last attempt;
otherwise return sysfs result, even if it has an empty list.

Tested on Linux (with udev, sysfs, filters) using FTDI serial ports.

Change-Id: I0132e27f720b007ea3f4861e9cd7ed77833cff8c
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoAdd scroll area to Enumerator example
Denis Shienkov [Mon, 1 Dec 2014 11:30:57 +0000 (14:30 +0300)]
Add scroll area to Enumerator example

When a system has many serial ports, the last of them are
not visible on the screen, because a widget has a big height.
So, it is reasonable to add scrolling of all serial ports info.

Change-Id: Ic13b58fba38a17d6f5142476bca501a0d26ec76d
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoTranslate serial port settings of Terminal example
Denis Shienkov [Mon, 1 Dec 2014 10:51:46 +0000 (13:51 +0300)]
Translate serial port settings of Terminal example

Change-Id: Ica127147999eaecc3d03189cfa9cd893115b846c
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoAllow to setup custom device in Terminal example
Denis Shienkov [Thu, 27 Nov 2014 13:18:42 +0000 (16:18 +0300)]
Allow to setup custom device in Terminal example

Terminal example allows to select only available devices which are
received from QSPI. Now it is possible to enter and to open of any
custom device.

Change-Id: I83172a346cb5dc0e20c217957133e9e3e506d8a4
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoAutotest misconfiguration error message is more verbose
Sergey Belyashov [Mon, 1 Dec 2014 08:38:28 +0000 (11:38 +0300)]
Autotest misconfiguration error message is more verbose

Error message about missing environment variables generates list of
required variables.

Change-Id: Icbb680abbd9fc5d0549907b7399757d943c6d535
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoRemove foreign records from 5.4.0 changes v5.4.0
Denis Shienkov [Fri, 28 Nov 2014 10:20:35 +0000 (13:20 +0300)]
Remove foreign records from 5.4.0 changes

To this changelog were added wrong changes from 5.4.1.

Change-Id: I77cc5abb7d537dda3859969d18fb22546cf466ec
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoSimplify and improve the QSP::TimeoutError handling
Denis Shienkov [Fri, 21 Nov 2014 21:14:12 +0000 (00:14 +0300)]
Simplify and improve the QSP::TimeoutError handling

It is reasonable to get rid of duplicating a code of TimeoutError
handling. A common parts of a code can be moved to one place.
Also, can be improved some of related if/else conditions.

Tested on Windows 8 and Linux with virtual serial ports.

Change-Id: I63112727faf42d4357f64f3450ea422167eaee90
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoHandle EINVAL, ENOIOCTLCMD, ENOTTY and EPERM errors
Denis Shienkov [Thu, 27 Nov 2014 22:21:22 +0000 (22:21 +0000)]
Handle EINVAL, ENOIOCTLCMD, ENOTTY and EPERM errors

According to TTY_IOCTL(4), the ioctl on tty device can return these
errors, which we need to interpret to QSP::SerialPortError.

For example, a virtual devices which are created by SOCAT, returns the
EINVAL error when the ioctl does query of line states.

Change-Id: Iece3b773fdc8fe4b97951ccf7cff9d2670f24694
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoAdd changelog for Qt 5.4.0
Denis Shienkov [Thu, 27 Nov 2014 13:23:32 +0000 (16:23 +0300)]
Add changelog for Qt 5.4.0

Change-Id: I7c15897db3429df3a0d122893662c20ede4c8f66
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoRefactor and add missed changes up 5.2.0 to 5.3.2 5.3
Denis Shienkov [Wed, 8 Oct 2014 16:14:11 +0000 (20:14 +0400)]
Refactor and add missed changes up 5.2.0 to 5.3.2

Change-Id: I8a3c40202a89cd1fd264e324e6379d1f6220c340
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoImprove the QSP::clear() on Windows
Denis Shienkov [Fri, 10 Oct 2014 18:41:24 +0000 (22:41 +0400)]
Improve the QSP::clear() on Windows

Commit 9c88ad89801596e1d94acc4f32ff55c34118a66f solves a problem
partially. Still when used QSP::clear() with some devices (e.g.
virtual ports from the "AGG Software") the reading can be stalled.

It is reasonable to make following:

1. Prevent to reset the both readStarted and writeStarted variables
inside of QSP::clear() method. These variables shall be reset inside
of _q_completeXX() methods which will be called automatically from the
notifiers, since the PurgeComm should terminate pending read or write
operations.

2. Instead of startAsyncRead() should be called the
startAsyncCommunication(), that allow to correctly startup of the read
sequence.

This scenario can be reproduced with running of the
tst_QSerialPort::readAfterInputClear() autotest.

Tested on Windows 8 with the virtual com0com ports and with the
virtual ports from the "AGG Software" using Qt5.

Change-Id: Ic1a53334abd97667a9dd3291c3b975eb04062efd
Reviewed-by: Robert Kurjata <rkurjata@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoPrevent multiple calls of WaitCommEvent
Denis Shienkov [Fri, 10 Oct 2014 17:51:12 +0000 (21:51 +0400)]
Prevent multiple calls of WaitCommEvent

Commit ac0422e8c9e74f2275129e3c7c69ef64299f07a9 introduced a regression
that QSP::startAsyncCommunication() was called twice when a limited read
buffer is used. In the second call the WaitCommEvent function returned the
ERROR_INVALID_PARAMETER error that lead to a stall of the read sequence.

QSP::startAsyncCommunication() should be called only when the read buffer
has enough space.

Tested on Windows 8 with the virtual com0com ports using Qt5.

Change-Id: Icd6cada7c3acfd4e689ac76ec304416b00f52b50
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix critical typo with _q_startAsyncWrite()
Denis Shienkov [Fri, 24 Oct 2014 13:36:01 +0000 (17:36 +0400)]
Fix critical typo with _q_startAsyncWrite()

Commit 62dfdeb3642250bdb642dbf607a8c7b95e57835e introduce a
critical typo that revert a bug which are fixed in the
b4d5bd813f591dc618e0fff2d55d93eeccb1a26e commit.

Change-Id: I9ed29f5b443cbd7102878287d531d18a9351a2e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoClose the handle for the events that were created
Andy Shaw [Thu, 27 Nov 2014 11:24:17 +0000 (12:24 +0100)]
Close the handle for the events that were created

The handles should be closed when QSerialPort is deleted in order to clean
up the native resources.

Change-Id: If04521fc0fa3b898093bda3317962b4c44818034
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoAllow to use custom devices paths
Denis Shienkov [Mon, 24 Nov 2014 15:21:57 +0000 (18:21 +0300)]
Allow to use custom devices paths

QSP incorrectly transforms non-standard device names to their paths
and vice-versa (for example, "/home/ttyS0", "//./COM1", and so on).

Now this problem is solved:

* The transformation code is moved to QSPP.

* Added autotests auto/qserialportinfoprivate to testing of
conversion algorithm. These tests are private and can be activated
with building of QtSerialPort with:

qmake "QT_CONFIG+=private_tests warnings_are_errors" \
DEFINES+=QT_BUILD_INTERNAL

Tested on Windows 8, Linux, OSX with auto-tests, with on-board
and virtual serial ports.

Task-number: QTBUG-38639
Change-Id: I43757a7f1390f53ed2b1d70de59c6bfb71892a59
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoRemove Q_OS_WIN64 since Q_OS_WIN32 defines 64-bit too
Denis Shienkov [Sun, 23 Nov 2014 20:06:16 +0000 (23:06 +0300)]
Remove Q_OS_WIN64 since Q_OS_WIN32 defines 64-bit too

Change-Id: I32eaf132f19a3b6fcbd5fd55d0690c3bd62bb641
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoRemove the 'register' keyword
Thiago Macieira [Sun, 23 Nov 2014 15:09:19 +0000 (07:09 -0800)]
Remove the 'register' keyword

It doesn't do anything and has been deprecated in C++14. Clang even
prints a warning.

Change-Id: Ie803a206f02897f99358ed22bf9cb999ca457741
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoSimplify handling of overlapped result
Denis Shienkov [Sat, 22 Nov 2014 20:22:41 +0000 (23:22 +0300)]
Simplify handling of overlapped result

There is not necessary to pass direction to handleOverlappedResult().
Because it is passed already as a second argument (pointer to
OVERLAPPED structure that defines a desired direction).

Also this method is renamed to more simple and short name.

Change-Id: I9c20cf97c1712aed8d3e9ea6d9b4687ce4487523
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoDeclare QElapsedTimer closer to usage
Denis Shienkov [Fri, 21 Nov 2014 20:36:57 +0000 (23:36 +0300)]
Declare QElapsedTimer closer to usage

Change-Id: I74622eaf3a7f5179ff25fc815997d5e4cf3cc2c7
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix QSPI::isNull()
Denis Shienkov [Fri, 21 Nov 2014 13:01:30 +0000 (16:01 +0300)]
Fix QSPI::isNull()

The method QSPI::isNull() should return false when QSPI is empty.

Tested on Winsows 8 and Linux with on-board, virtual and USB serial
ports using Qt5 and then Qt4.

Task-number: QTBUG-41262
Change-Id: Ic9e0afc5549311283aef7ec2ed841f5e418b7edf
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoCheck for lock file in non-writable directories v5.4.0-rc1
Rainer Keller [Thu, 23 Oct 2014 07:15:07 +0000 (09:15 +0200)]
Check for lock file in non-writable directories

On some linux systems /var/lock is not writable by users which are not
root and not in the uucp or dialout group.
If the root user acquires a lock and you are trying to access the same
port with a non-root user it will not check for the lock but creates a
new lock file in /tmp instead.
This change checks in readable directories for lock files.

Change-Id: Ia308fd344d2fe9d3c699f7a428ff620ea101eff3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 14 Oct 2014 12:07:32 +0000 (14:07 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: Id7e66059233e8d07ba44cad19048d9cddc68e250

3 years agoDoc: Applied title case in section1 titles v5.4.0-beta1
Nico Vertriest [Wed, 8 Oct 2014 11:31:05 +0000 (13:31 +0200)]
Doc: Applied title case in section1 titles

Change-Id: I8d68786028fe6e561e9c1d8b6960d43020c60e50
Task-number: QTBUG-41250
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix QSP::bytesToWrite() on Windows
Denis Shienkov [Sat, 19 Jul 2014 15:25:19 +0000 (19:25 +0400)]
Fix QSP::bytesToWrite() on Windows

After calling the WriteFile() function, QSP::bytesToWrite() should
return zero, but did return the size of writeBuffer.

On Windows, we must not to cut a size of the writeBuffer until the
asynchronous write operation has completed. So we need to make use of an
additional actualBytesToWrite variable, the value of which is increased
when new data is added to the writeBuffer, and decreased after calling
the WriteFile() function.

This change also entails the modification of the QSP::writeData() method
and deleting the QSP::startWriting() method. Now all platform-dependent
code (related to startWriting(), and to copying of memory to
writeBuffer) resides in the new QSP::writeData() method. But this
modification does not change the behavior on platforms other than Windows.

Tested on Windows with the virtual com0com serial ports using Qt5.

Change-Id: I35c1428ad374c0709d6c352a93c552898e947bde
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoAllow for deviceInstanceIdentifier() to return an upper case string
Denis Shienkov [Tue, 30 Sep 2014 19:00:03 +0000 (23:00 +0400)]
Allow for deviceInstanceIdentifier() to return an upper case string

Change-Id: I91977b1aa4a8e5bd8321efc5cfda375c9d7deff7
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoRestart of async reading when a QSP::clear() is called
Denis Shienkov [Fri, 3 Oct 2014 09:21:17 +0000 (13:21 +0400)]
Restart of async reading when a QSP::clear() is called

The method QSP::clear() can stall reading in case of following
situations:

- at the moment when PurgeComm abort of previously started
asynchronous reading operation

- when a serial port is in hardware flow control mode

- when a serial port has a limited read buffer size

Therefore is necessary restart of asynchronous reading to enable
of the read sequence.

Change-Id: I7a722a1ee20ecba0dd631da96ca81d2937d7ca6b
Reviewed-by: Robert Kurjata <rkurjata@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix reading on Windows at limited read buffer size
Denis Shienkov [Mon, 29 Sep 2014 14:44:36 +0000 (18:44 +0400)]
Fix reading on Windows at limited read buffer size

In case the read buffer has a limited size then are impossible to read
remainder which is still can be in driver's queue, since no readyRead
signal emmitted and reading are stalled.

Problem is that Windows does not fire the EV_RXCHAR event in case a
driver's queue has ready to read remainder; this event will be triggered
only when a new data are received.

The solution is to start of asynchronous read operation for reading of
possible remainder from the queue after doing QSP::read() from the user.

Besides is necessary to meet conditions:

- do not start reading in case a reading already is started

- do not start reading in case is not in limited buffer size

- do not start reading in case is a previous reading returns
a less data than read buffer size or are not in the hardware
flow control mode

Tested on Windows 8 with virtual com0com serial ports using Qt5 and then
Qt4.

Task-number: QTBUG-41295
Change-Id: I01797e6f8d6006751244144fead3616b1de1b811
Reviewed-by: Robert Kurjata <rkurjata@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoRemove custom baud rate filtering
Manuele Conti [Wed, 1 Oct 2014 11:13:11 +0000 (13:13 +0200)]
Remove custom baud rate filtering

Some serial device have baud base that it is not multiple of baud rate selected,
so we need to allow baud rate compliant with device.

Change-Id: I7d3ce94f10d4382a29ff34bb18daebb650186c1c
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoFix segfault related to dynamic udev loading
Sergey Belyashov [Fri, 26 Sep 2014 12:00:39 +0000 (16:00 +0400)]
Fix segfault related to dynamic udev loading

Problem was caused by conflict of libudev symbols and function pointers
declared in qtudev_p.h.

Task-number: QTBUG-40113
Change-Id: I599575e8a1b9ffe32295331d46d991422975f773
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoHandle onboard serial ports when parsing sysfs
Rainer Keller [Fri, 26 Sep 2014 12:42:20 +0000 (14:42 +0200)]
Handle onboard serial ports when parsing sysfs

The device detection stopped if one of the sources reported at least
one device. This made onboard serial ports not listed if a USB device was
plugged in. Onboard serial ports are now detected and added to the list
of devices.

Change-Id: I8798e7f14073e19d9e206eb4d7cdd0b28bd8a0bb
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoFix typo in twoStageSynchronousLoopback test
Denis Shienkov [Sat, 27 Sep 2014 20:00:22 +0000 (00:00 +0400)]
Fix typo in twoStageSynchronousLoopback test

Commit f1761c1236edce428278f7a9e8aa1091097eaa57 introduce a typo
for receiverPort and senderPort variables, that lead to failure of test.

Change-Id: I18ecad78bb11d7bb218a674c3c3bf9c863a2b33c
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix order of passed parameters into QCOMPARE
Denis Shienkov [Sat, 27 Sep 2014 19:22:04 +0000 (23:22 +0400)]
Fix order of passed parameters into QCOMPARE

According to documentation the QCOMPARE should accept to the first
parameter an actual value, and to the second parameter an expected value.

Change-Id: I64e762e779fa6a61401f358c4dd6097dacf7a33a
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix access after delete in OS X QSPI
Dyami Caliri [Wed, 24 Sep 2014 22:07:01 +0000 (15:07 -0700)]
Fix access after delete in OS X QSPI

Valgrind analysis shows that searchStringProperty was accessing memory
after deletion. This was caused by constructing QCFString local var
with CFStringRef, which does not retain object.

Change-Id: I1e9571a5051aa6f0c3fbc732ac01e821069f8b02
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoQuery a serial number of USB device from Sysfs
Denis Shienkov [Thu, 25 Sep 2014 09:22:26 +0000 (13:22 +0400)]
Query a serial number of USB device from Sysfs

Tested on Linux with the USB (FTDI and TI) serial ports
using Qt4

Change-Id: I8c088bf8b6fe440565cc37538ca7ef029651fb61
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 16 Sep 2014 13:29:27 +0000 (15:29 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf

Change-Id: I5887622f233275703cca8cc2a5db4aaaccc72d97

3 years agoMake tst_qtserialport build with Qt 4
Samuel Gaist [Thu, 11 Sep 2014 19:52:52 +0000 (21:52 +0200)]
Make tst_qtserialport build with Qt 4

The newly moved twoStageSynchronousLoopback fails to compile since
there's no qCompare available for int and long long with Qt 4. This
patch allows to build it again with Qt 4

Change-Id: Ib3764b125f371ae70864bd578c7ccda39d08ae22
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoAdded missing deprecation guards and documentation update
Samuel Gaist [Thu, 11 Sep 2014 23:00:17 +0000 (01:00 +0200)]
Added missing deprecation guards and documentation update

This patch adds the missing guards around the deprecated functions
implementations.

Change-Id: I829e90e289da7af736fc6f5d6c319509138f1aef
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoFix Qt 4 build
Samuel Gaist [Thu, 11 Sep 2014 23:03:08 +0000 (01:03 +0200)]
Fix Qt 4 build

Following the discussion on the development mailing list with
Thiago Macieira, remove the guard around the signals since
it's not supported to build with Qt 4.

Task-number: QTBUG-41190
Change-Id: I8df1b7fa8cc69a2aacdcb4fedea0cc6fe092eece
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoUpdate license headers and add new license files
Antti Kokko [Fri, 22 Aug 2014 06:02:37 +0000 (09:02 +0300)]
Update license headers and add new license files

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I08685205169cdd4b49a651ed98f36ba1e6c1bb29
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoBump version
Frederik Gladhorn [Fri, 29 Aug 2014 09:33:42 +0000 (11:33 +0200)]
Bump version

Change-Id: Ida6ecfd792ea1906c70bf17bb5b8077ad4c5e631

3 years agoFix a race condition at writing on Windows 5.3.2 v5.3.2
Denis Shienkov [Thu, 14 Aug 2014 17:50:05 +0000 (21:50 +0400)]
Fix a race condition at writing on Windows

1. The writeStarted flag shall be reset to false after bytesWritten() signal
is emitted, but not before it.

2. In case of start of writing from the startAsyncWriteTimer it is necessary
to call the startAsyncWrite() method but not the completeAsyncWrite() method.

It give guarantees to exclude of race condition to multiple call of the
WriteFile twice until the write operation is not completed.

For example, a race condition is watched in case of writing data from the
slots which are connected to the bytesWritten() signal from a device; or to
the timeout() signal from a timer with zero interval. To checking of these
scenarios are added additional autotests.

Tested on Windows 8 with the on-board and USB serial ports, using Qt5.

Task-number: QTBUG-40769
Change-Id: Iedabbf38847debeee795a10fd7a4c54c65d2a338
Reviewed-by: Patrick Noffke <patrick.noffke@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4 v5.4.0-alpha1
Frederik Gladhorn [Thu, 28 Aug 2014 14:18:59 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: Id742521c303261262a87db4189d369851ed2078b

3 years agoAdd missing private headers warnings
Samuel Gaist [Sat, 16 Aug 2014 21:24:32 +0000 (23:24 +0200)]
Add missing private headers warnings

Change-Id: Ia60bf0d020d98a6fda8f689d631bb8681950d15f
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix handling of writing at using of waitForReadyRead()
Denis Shienkov [Thu, 14 Aug 2014 18:35:03 +0000 (22:35 +0400)]
Fix handling of writing at using of waitForReadyRead()

The method waitForReadyRead() shall call of the write sequence since the
signals from the startAsyncWriteTimer will not be handled inside of
waitForReadyRead() without event-loop.

Tested on Windows 8 with the on-board and USB serial ports, using Qt5.

Task-number: QTBUG-40793
Change-Id: I7806f16a4df30c4ec1643d8f696ad5761decd30a
Reviewed-by: Patrick Noffke <patrick.noffke@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 12 Aug 2014 11:09:58 +0000 (13:09 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
examples/serialport/examples.qdoc

Change-Id: If79f2f140e72f0a499f8e61e3897848f454a5042

3 years agoFix compilation of apps with QT_DISABLE_DEPRECATED_BEFORE=0x050300
Marcel Krems [Mon, 11 Aug 2014 14:51:12 +0000 (16:51 +0200)]
Fix compilation of apps with QT_DISABLE_DEPRECATED_BEFORE=0x050300

The enum is already marked as deprecated leading to this error:
qserialport.h:267:46: error: no type named 'DataErrorPolicy' in 'QSerialPort'
    void dataErrorPolicyChanged(QSerialPort::DataErrorPolicy policy);
                                ~~~~~~~~~~~~~^

Change-Id: I8d178f0d0921b8f5308183e1f09a4c8388448e26
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoMove the synchronous loopback test from benchmarks to auto tests
Denis Shienkov [Sat, 26 Jul 2014 13:55:43 +0000 (17:55 +0400)]
Move the synchronous loopback test from benchmarks to auto tests

Previous commit 76f293bfb0fd7bab391f96ac822eacc40e4c5176 with adding of
this test to the benchmarks were hasty.

After all it makes sense to place it to auto tests to have opportunity to
run with others together.

Besides, this test is renamed since it is not a loopback, it is an I/O
test with the synchronous approach.

Change-Id: I043a6e0075561167bb29a59a384554ef98dbbd4a
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoMake the QSerialPort::flush() non-blocking
Denis Shienkov [Sat, 19 Jul 2014 15:53:16 +0000 (19:53 +0400)]
Make the QSerialPort::flush() non-blocking

According to documentation, the flush() method shall be non-blocking.

Tested on Linux 64-bit with auto-tests with the on-board and the USB
serial ports for Qt4 and then Qt5.

Note: On Windows the flush() method still does not work.

Change-Id: Iaee80361e59e0c281206ca24c817a446cdbf6ed1
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoPass a length of string to QString::fromWCharArray
Denis Shienkov [Thu, 10 Jul 2014 12:46:28 +0000 (16:46 +0400)]
Pass a length of string to QString::fromWCharArray

Using of the QString::fromWCharArray() we didn't pass length of a string,
hoping that all WCHAR strings are terminated by the null-character.

But it can lead to the wrong results if the initial WCHAR string has no
null character. Therefore it is reasonable to pass length of a string to
exclude an error.

Besides, to do not break of the algorithm of string comparison it is
necessary to return not null-terminated strings. Also now there is no need
to initialize of some allocated arrays by zero values.

Tested on Windows 7/8 with the on-board, the virtual com0com, the USB FTDI
and the PL2303 serial ports, using Qt4 and then Qt5.

Change-Id: I382cf8eacf4ab4d21c54de17fcdd6b9fcfa3d02c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoFix leak of a descriptor after unsuccessful opening
Denis Shienkov [Fri, 25 Jul 2014 08:14:54 +0000 (12:14 +0400)]
Fix leak of a descriptor after unsuccessful opening

In case of unsuccessful initialization of a device at the opening, a
valid descriptor has to be closed before return from the open() method.

Task-number: QTBUG-40414
Change-Id: I45568f176e003d9be1fe8c3017da29f39908efb0
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoFix events handling in waitForBytesWritten() method on Windows
Denis Shienkov [Fri, 25 Jul 2014 21:31:28 +0000 (01:31 +0400)]
Fix events handling in waitForBytesWritten() method on Windows

In case of communication event is triggered in the
waitForBytesWritten() method then necessary to process it with
the _q_completeAsyncCommunication() method, but not with the
_q_completeAsyncRead() method.

Otherwise it leads to false filling of the readBuffer with the
data that were read earlier (or with garbage) which remained in
readChunkBuffer.

The synchronous loopback autotest reproduces a bug without of
this patch.

Tested on Windows 7/8 with the on-board and USB serial ports,
using Qt5.

Task-number: QTBUG-40344
Change-Id: I679109b60f4058c4c6f7e5f02c1f70ba6039d8d8
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
3 years agoUpdate QRingBuffer by recent version from qtbase
Alex Trotsenko [Sat, 26 Jul 2014 12:19:33 +0000 (15:19 +0300)]
Update QRingBuffer by recent version from qtbase

Fix some issues. Optimized for size and speed.

Change-Id: Ie7b55e3f01fb088999d3a5b10d0d941934fda162
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
3 years agoAdd the synchronous loopback data verification test
Denis Shienkov [Fri, 11 Jul 2014 12:32:28 +0000 (16:32 +0400)]
Add the synchronous loopback data verification test

Good reason to check of data correctness at transferring and receiving.
In this test are used two serial ports, connected in a null-modem mode:
http://en.wikipedia.org/wiki/Null_modem .

The sender port transfers data to the receiver port. After data are
received is carried out check of equivalence of the transferred and
received data.

Before run of testing it is necessary to set two variable environments
QTEST_SERIALPORT_SENDER and QTEST_SERIALPORT_RECEIVER to specify names
of used serial ports.

This test can reveal errors related with the internal data processing
and also errors of synchronous I/O inside of QSerialPort.

This test is placed in separate "benchmarks" category not to mix-up
with "manual" and "auto" categories, because this test is closer to
"benchmarks" by own functionality.

Tested on Windows 7/8 with the virtual com0com serial ports, using
Qt4 and then Qt5.

Change-Id: Ie6f87b50784bce211cf68c16cf75f79d12a8564f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoDoc: rename the end file for serialport docs
Thiago Macieira [Thu, 24 Jul 2014 17:59:36 +0000 (10:59 -0700)]
Doc: rename the end file for serialport docs

This page has been showing up in the master Qt docs as
http://qt-project.org/doc/qt-5/examples.html, which is way too
generic. The current practice is to add the module:

    \page qt3d-examples.html
    \page qt3d-examples-placeholder.html
    \page examples-graphicsview.html
    \page examples-graphicsview.html
    \page bluetooth-examples.html
\page nfc-examples.html
\page qtquick-codesamples.html
    \page qtexamplesandtutorials.html
    \page examples-layouts.html
    \page examples-draganddrop.html
    \page examples-threadandconcurrent.html
    \page examples-sql.html
    \page examples-xml.html
    \page examples-statemachine.html
    \page examples-animation.html
    \page examples-gestures.html
    \page examples-activeqt.html
  \page qdeclarativeexamples.html
    \page declarative-cppextensions-reference.html
    \page declarative-cppextensions-qgraphicslayouts.html
    \page examples-serialport.html
    \page qtwebkitexamples-index.html

Change-Id: Ib272f6380cb694ad4acfc24a248266805cef05a8
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoDoc: Edited example documentation.
Jerome Pasion [Thu, 10 Jul 2014 13:15:23 +0000 (15:15 +0200)]
Doc: Edited example documentation.

-added information about how to run the example by including a file
 from qtbase/doc/global
-edited summary sections
-added \brief.
-removed image captions. Our Qt 5 CSS files don't handle them.

Task-number: QTBUG-33597
Change-Id: If3293aa9d98b662f20af2af7030b0ab0fb1e8401
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
4 years agoReturn from the loop if a port name is found
Denis Shienkov [Thu, 10 Jul 2014 07:40:18 +0000 (11:40 +0400)]
Return from the loop if a port name is found

The function devicePortName() search in the Registry the names of ports
by names of registry keys. At first looks for value of a key of "PortName",
and then of "PortNumber" key.

Thus, the first found value shall stop search and do not try to continue.

Tested on Windows 7/8 using Qt4 and then Qt5.

Change-Id: I98b00ff043a3b08476fec0a57b0d36ce65fc8d63
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
4 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Thu, 10 Jul 2014 08:16:01 +0000 (10:16 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: I64b13e135d58980ea4cf7429224aa1877778cb46

4 years agoWrap of getting the port properties on Windows
Denis Shienkov [Wed, 2 Jul 2014 12:52:09 +0000 (16:52 +0400)]
Wrap of getting the port properties on Windows

It is reasonable to wrap implementation of getting properties of port
from availablePorts() to the separate functions. It is simplifies a
code and improves its understanding.

Tested on Windows 7/8 with the on-board, virtual com0com, USB FTDI
serial ports using Qt4 and then Qt5.

Change-Id: I2345fa49b3633960412715b299e068daa8fdcfd0
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoDo not continue waitForReadyRead() if an error occurred
Denis Shienkov [Wed, 2 Jul 2014 23:23:17 +0000 (23:23 +0000)]
Do not continue waitForReadyRead() if an error occurred

This patch improves workaround implemented in the previous commit
d34fce4a5d12789ded107631e22cb6ef54d35eee

Change-Id: I013b19b47ee343ab00f242d7ee1021b92c07d18f
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoRefactor of the QSerialPortInfo for OS X
Denis Shienkov [Wed, 2 Jul 2014 08:28:11 +0000 (12:28 +0400)]
Refactor of the QSerialPortInfo for OS X

The current implementation of the qserialportinfo_mac.cpp module is a
little confused and complicated.

It is reasonable to re-write it using some ready wrappers of CFTypeRef,
CFStringRef and others objects from the private qcore_mac_p.h file.

Thus, it will allow to bypass of manual releasing of the allocated
resources (using the RAII idiom where it is possible), and also to
simplify a code.

Tested on OS X 10.8.4 with the on-board, USB PL2303, USB FTDI,
USB Android serial ports and with the USB ZTE Modem using Qt4.

Change-Id: Ibbac03a17fdd41bbaf530f863e7c690a15708bd2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoMake independent implementation of QSerialPortInfo for OS X
Denis Shienkov [Tue, 1 Jul 2014 14:57:59 +0000 (18:57 +0400)]
Make independent implementation of QSerialPortInfo for OS X

Building in OS X uses some shared code from the serialportinfo_unix.cpp
module with the OS X specific code from the serialportinfo_mac.cpp module.

Thus, all code of the serialportinfo_unix.cpp module, which not related
with the OS X, is shielded by a macro. It adds an excessive garbage for
readability in this module and also some confusion in the *.pri file.

It makes sense to make implementation of the serialportinfo_mac.cpp
module completely independent, that will simplify maintaining of source
code.

Besides are added tests which can reveal declared but not implemented
methods in building, and also to check a correctness of default values
at running.

Tested build on OS X 10.8.4 with Qt4, an then on Android with Qt5.

Change-Id: I67935b64e2b623fb8d4c14d59e1b87f1eac71c3e
Reviewed-by: Bernard Pratz <guyzmo+qt@m0g.net>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoCorrect WinRT exclusion to top-level pro file
Maurice Kalinowski [Mon, 7 Jul 2014 09:58:34 +0000 (11:58 +0200)]
Correct WinRT exclusion to top-level pro file

So far only the module was excluded, but not the examples.
Adopt to a style which has been approved for other modules as well
by using requires.

Change-Id: I8a8bbeb8c5db1bdb2e508da0988a38bbb1789986
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoImprove error handling for the waitForXX() methods on Windows
Denis Shienkov [Mon, 30 Jun 2014 14:38:04 +0000 (18:38 +0400)]
Improve error handling for the waitForXX() methods on Windows

The slots _q_completeXX() returns empty values, therefore the
waitForXX() methods continue to work even if occurs an error
from the I/O completion.

Is reasonable allow to return of boolean values for the I/O
completion slots.

Besides, it allows avoiding indirect detection of an error,
comparing of the sizes of I/O buffers before and after the
operation completion. Though, for the waitForReadyRead(),
for this purpose it is necessary to add additional
modifications in a following patches.

Tested on Windows 7/8 with the virtual com0com ports using
Qt4 and then Qt5. Testing was made using of autotests
and examples.

Change-Id: I95a76461af4595f6658f0cad766a4fff14eb7afc
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoUnify handling of errors of the overlapped I/O result
Denis Shienkov [Mon, 30 Jun 2014 09:35:50 +0000 (13:35 +0400)]
Unify handling of errors of the overlapped I/O result

Each q_completeXXX() slot does call of GetOverlappedResult()
and differently interprets an error depending on the type of
I/O operation (read, write or communication).

It is more reasonable to make it in the separate method
handleOverlappedResult() which returns the number of the
transferred bytes or -1 in case of error.

Besides, this method accepts the additional integer parameter
which expresses type of overlapped operation using the
existing QSerialPort::Direction enumeration. The type of the
communication operation has not separate value, so is used
zero value for it.

Tested build on Windows 7/8 using Qt4 and then Qt5.

Change-Id: I8482392d06279bc430656e50b1e4392c513885c6
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoDoc: Removing url variable from qdocconf file.
Jerome Pasion [Fri, 4 Jul 2014 12:48:49 +0000 (14:48 +0200)]
Doc: Removing url variable from qdocconf file.

-url inherited from the url variable set in qtbase/doc/global

Change-Id: I16bde5a3c34540c448a10903e4efde69a9d3585c
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoAbort waitForReadyRead() when there is an error
Peter Kümmel [Mon, 16 Jun 2014 18:59:22 +0000 (20:59 +0200)]
Abort waitForReadyRead() when there is an error

When in readNotification() or completeAsyncWrite() an error
is emitted and the loop is not exited, this error signal
will flood the eventloop.

Change-Id: I77b8a4c337041258862b19a07917bef059c11cc1
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoImprove the serial number handling on Windows
Denis Shienkov [Tue, 10 Jun 2014 13:49:02 +0000 (17:49 +0400)]
Improve the serial number handling on Windows

The standard USB CDC driver (usbser.sys) does not add information of
serial number to the device instance identifier of the child devices
(serial ports), so our algorithm returns an empty string.

But information about a serial number is stored in the device identifier
of the parental node. Thus, it is necessary to get this parent
identifier, using these recommendations from MSDN:

http://msdn.microsoft.com/en-us/library/windows/hardware/ff549417%28v=vs.85%29.aspx

For this purpose is used the set of new functions from the
"Configuration Manager Functions" family.

Therefore it was necessary:

* Rewrite the deviceInstanceIdentifier() function.

Now this function accepts one DEVINST parameter and returns the
corresponding device instance identifier string.

* Add the new parentDeviceInstanceNumber() function.

This function accepts a DEVINST of the child device and returns a
DEVINST of the parent device.

Thus, the new algorithm tries to extract a serial number from the
current (child) device and in case it is empty, try to extract from
the parent.

Tested on Windows 7/8 with the Segger JLink device (provides the CDC
serial port) using Qt4 (MSVC2010) and then Qt5 (MSVC2012, MinGW).

Also are checked other devices for possible regressions:

* on-board serial port
* com0com virtual serial port
* USB FTDI serial port

no regressions found.

Change-Id: Ic6afc258f45aa374ec77dc0b586d479b5286359f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoImprove the ResourceError handling on Windows
Denis Shienkov [Sat, 7 Jun 2014 11:18:15 +0000 (15:18 +0400)]
Improve the ResourceError handling on Windows

To the ResourceError handling we generally relied on triggering of the
_q_completeAsyncCommunication(), in case of ejection of an USB device
from a host. But it worked with not all USB devices (for example it did
not work with the ZTE modems). Even when this worked (for example with
the PL2303 devices), then we got the non informative "Unknown error" of
the ResourceError string representation.

It is more reasonable not to do any custom checks of an event mask when
triggered of the _q_completeAsyncCommunication() method. We need allow
to detect an errors with means of the
ReadFile/GetOverlappedResult/WaitCommEvent syscalls on an invalid device
handle.

An important note is that returns the different error codes for a
different types of devices.

For example:

* For the USB ZTE and the Samsung Android USB modem returns the
ERROR_ACCESS_DENIED error code.

* For the FTDI and the Samsung Android Diagnostic Serial Port returns
the ERROR_OPERATION_ABORTED error code.

* For the USB PL2303 device returns the ERROR_BAD_COMMAND error code.

Thus, there is no universal solution of this issue. Each vendor of the
driver implements it own way. Therefore for each new type of the device
it is necessary to add processing its error code, if we have no it yet.

Tested on Windows 7/8 with the USB ZTE and the Android modems, with the
USB PL2303 and the FTDI devices and with the Android diagnostic serial
port using Qt4 and then Qt5, no regressions found.

Task-number: QTBUG-32020
Change-Id: I61c02078ee98221ecef18a27cde3d9bae3674d70
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoImprove the I/O completion errors handling on Windows
Denis Shienkov [Sat, 7 Jun 2014 10:04:12 +0000 (14:04 +0400)]
Improve the I/O completion errors handling on Windows

* It is necessary to ignore the NoError error code.

* In case of error from GetOverlappedResult() it is necessary to stop
the I/O operation by a immediate return from the function, because I/O
processing does not make sense. This is consistent behavior similar to
starting I/O operations.

* All errors from the read completion should be interpreted as ReadError.
Exception is only the critical ResourceError error which it is necessary
to leave without changes. This is also consistent behavior similar to
starting I/O operations.

* The write completion error handling should be similar to the read
completion handling.

* For the communication completion we have no specific error codes.
Therefore error handling shall be without modification of their error
code.

Also were made small cosmetic fixes to the related start I/O methods.

Tested on Windows 7/8 with the on-board, the PL2303 and the virtual
com0com serial ports using Qt4 and then Qt5. Testing are made by means
of examples of library and also by means of auto tests, no regressions
found.

Change-Id: I0d08b53627431c42ab5147d4330f1aaf819b4d63
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Thu, 26 Jun 2014 15:27:19 +0000 (17:27 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Ib1727ebdc69ab673d782c39ba9f1b5f51c192d4b

4 years agoBump version
Oswald Buddenhagen [Tue, 17 Jun 2014 22:36:41 +0000 (00:36 +0200)]
Bump version

Change-Id: I50ea328c903f3ba0c78f9570b6b6b892bb38f976

4 years agoFix mixed up vendor and product identifiers v5.3.1
Oleg Shparber [Fri, 13 Jun 2014 21:53:47 +0000 (14:53 -0700)]
Fix mixed up vendor and product identifiers

Caused by I1a66164c.

Change-Id: I78973a509ff91a1302f435b1a23ecce432e56dd4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
4 years agoMerge remote-tracking branch 'origin/5.3' into dev
Sergio Ahumada [Sat, 14 Jun 2014 19:58:29 +0000 (21:58 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Ib9551beb8dc9d2d9c9ff50b7fe4702287f1854cd

4 years agoRemove the exception notifier handling for *nix
Denis Shienkov [Sat, 7 Jun 2014 23:22:19 +0000 (23:22 +0000)]
Remove the exception notifier handling for *nix

The exception notifier does not do any useful operation while processing
I/O but only complicates error handling. It has been thoughtlessly
introduced at beginning in hope that in the future it can it is useful,
but the practice showed that it not so.

Problem is that in case of ejection of an open USB device from a host
there is the infinite triggering of the exception notifier that leads to
program hangup. We could stop an exception notifier in this case, but it
not rationally because after the exception notifier is triggered the read
notifier which also enters the infinite loop.

Thus the read notifier anyway duplicates the exception notifier, as for
functionality and as for an error code. Therefore more rationally to
completely remove the exception notifier. So in case of the ResourceError
we need just to stop of the read notifier, because it is a critical
error. Then an user will be notified on the ResourceError appearance and
must to close the device himself.

Though work was checked only on Linux, but we can do not worry, and to
refuse from this notifier in MacOSX also. Because anyway in MacOSX this
type of notifier is not supported, at least from the Qt 5.1 and above:

https://qt.gitorious.org/qt/qtbase/source/982fdd4ef556f63ba77384a0dbe97928e610091b:src/platformsupport/cfsocketnotifier/qcfsocketnotifier.cpp#L210

Besides in documentation on QSocketNotifier is recommended do not
use the Exception mode:

http://qt-project.org/doc/qt-5/qsocketnotifier.html#Type-enum

Tested on ArchLinux 64 bit with the USB PL2303 device, ZTE modem,
Android serial port using Qt4 and then Qt5.

Task-number: QTBUG-36727
Task-number: QTBUG-35829
Change-Id: I4ea6db2a1c7f10c096d57817c00edefc4f0595ff
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
4 years agoMerge remote-tracking branch 'origin/5.3.0' into 5.3
Oswald Buddenhagen [Thu, 12 Jun 2014 08:35:31 +0000 (10:35 +0200)]
Merge remote-tracking branch 'origin/5.3.0' into 5.3

Manually adjusted:
    src/serialport/qserialport_unix.cpp
    to remove isCustomBaudRateSupported

Change-Id: I22480b57d8c1b91ea7ea4a1da4ba3060e1a5f93f

4 years agoMerge remote-tracking branch 'origin/stable' into 5.3
Sergio Ahumada [Wed, 11 Jun 2014 08:06:39 +0000 (10:06 +0200)]
Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: I65f7cd2fdeced526c8bd7dc5bc4081e7687e7310

4 years agouclibc sets ENOENT when one tries to open a non-existing device
Peter Kümmel [Sat, 7 Jun 2014 20:36:58 +0000 (22:36 +0200)]
uclibc sets ENOENT when one tries to open a non-existing device

Change-Id: Ia5bcc1230af988f06923447f8cb1de5a8d585518
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoRefactor the availablePortsByUdev() in favor to readability stable
Denis Shienkov [Tue, 3 Jun 2014 18:06:31 +0000 (22:06 +0400)]
Refactor the availablePortsByUdev() in favor to readability

Implementation of the availablePortsByUdev() function is a little
complicated by excess "if/else" conditions and also too long lines,
that worsens readability.

It is reasonable to make the following:

* To get rid of the big "if {...}" blocks in favor to immediate return
from function in case of an error. It will allow to reduce a quantity
of lines and will shift code alignment to the left.

* To split declaration of some long variables and functions into separate
lines, with length at least up to 80~100 characters.

* To drop of the 'struct' keywords and the '::' global namespace
operator for variables.

Tested on ArchLinux 64 bit with the on-board and PL2303 serial ports
using Qt4 and then Qt5.

Tested build on Android x86 using Qt5.

Change-Id: Iddc2a9511230e56e4a9d01a4c22af7b2eaeae60c
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
4 years agoUse QScopedPointer (RAII) to do not care of the udev resources
Denis Shienkov [Mon, 2 Jun 2014 23:38:37 +0000 (23:38 +0000)]
Use QScopedPointer (RAII) to do not care of the udev resources

It is a good idea to get rid from the manually releasing of the
allocated udev resources.

Tested on ArchLinux 64 bit with on-board and PL2303 serial ports using
Qt4 and then Qt5.

Change-Id: Ib25e100bea37ad3cc0bee015b7de6d4de762f2cc
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
4 years agoSimplify of the availablePortsByUdev()
Denis Shienkov [Sun, 1 Jun 2014 14:48:59 +0000 (14:48 +0000)]
Simplify of the availablePortsByUdev()

There is no sense to use udev_device_get_subsystem() for comparing with
the predetermined names of subsystems (like "pnp", "usb" and so on).
This idea was preliminary and required further revising after
accumulation of some statistic.

The main ideas in favor of refactoring are given below:

* It seems that reasonable to use the "ID_MODEL", "ID_VENDOR" and others
identifiers to query of properties for all types of serial ports. We
lose nothing, because in the worst case the getUdevPropertyValue()
function will simply return an empty string, as before.

* Earlier we excluded from the list all ports which have a subsystem
with the "platform" name. Practice showed that for these devices is used
the serial8250 driver. Therefore it is reasonable to exclude this type
of devices by the name of drivers instead of by the name of subsystems.

Also are made related changes:

* Is added the resolving of chars for the new udev_device_get_driver()
function

* The functions of getting properties are wrapped for reduction of
length up to 100 characters.

Tested on ArchLinux 64-bit with the on-board, PL2303 serial devices
using Qt4 and then Qt5.

Tested build on Android x86 using Qt5.

Change-Id: I1a66164ca1893180e1ed97524cff98b4a933a63b
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>