diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-22 06:41:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-22 06:41:49 +0200 |
| commit | 0f3bdecc871625fe9873f1ba9d55aabad0036168 (patch) | |
| tree | 97dcdcc7173f020fa2deea25de1c42ee18ccec64 /src/serialport/qserialportinfo_unix.cpp | |
| parent | 4c5c0bc76b6f911b20a6ea53a143534e04412af6 (diff) | |
| parent | 335f1d02dc134bf11277c0573553c7c838cc6a9f (diff) | |
| download | qtserialport-0f3bdecc871625fe9873f1ba9d55aabad0036168.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I0f003a4aef121836be3ed7f1b82e23321fdfe884
Diffstat (limited to 'src/serialport/qserialportinfo_unix.cpp')
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 0f62a9d..105d10a 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -169,6 +169,12 @@ static bool isVirtualNullModemDevice(const QString &portName) return portName.startsWith(QLatin1String("tnt")); } +// provided by the g_serial driver +static bool isGadgetDevice(const QString &portName) +{ + return portName.startsWith(QLatin1String("ttyGS")); +} + static QString ueventProperty(const QDir &targetDir, const QByteArray &pattern) { QFile f(QFileInfo(targetDir, QStringLiteral("uevent")).absoluteFilePath()); @@ -265,7 +271,8 @@ QList<QSerialPortInfo> availablePortsBySysfs(bool &ok) const QString driverName = deviceDriver(targetDir); if (driverName.isEmpty()) { if (!isRfcommDevice(priv.portName) - && !isVirtualNullModemDevice(priv.portName)) { + && !isVirtualNullModemDevice(priv.portName) + && !isGadgetDevice(priv.portName)) { continue; } } @@ -436,7 +443,8 @@ QList<QSerialPortInfo> availablePortsByUdev(bool &ok) priv.productIdentifier = deviceProductIdentifier(dev.data(), priv.hasProductIdentifier); } else { if (!isRfcommDevice(priv.portName) - && !isVirtualNullModemDevice(priv.portName)) { + && !isVirtualNullModemDevice(priv.portName) + && !isGadgetDevice(priv.portName)) { continue; } } |