diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:45:07 +0100 |
| commit | 1399a77954ec4b40fa14b75218e046e76d1324bc (patch) | |
| tree | a1ac141e729b5d8fb58aa0504a8d751a9348473e /src/plugins | |
| parent | 44a449ff8f0b7cdb71e67385e1bd9a098209045e (diff) | |
| parent | b65de45fbfa08d0d2d5b89df77181d3726598097 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ibcb5508d7f131cbeba0d047111177a8dff1e5f68
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.h | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 81b7c13..74b0d1d 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -75,6 +75,13 @@ struct canfd_frame { #endif +#ifndef CANFD_BRS +# define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ +#endif +#ifndef CANFD_ESI +# define CANFD_ESI 0x02 /* error state indicator of the transmitting node */ +#endif + QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_SOCKETCAN) diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h index 50976b1..b49d267 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.h +++ b/src/plugins/canbus/socketcan/socketcanbackend.h @@ -50,6 +50,7 @@ #include <sys/socket.h> #include <sys/uio.h> #include <linux/can.h> +#include <sys/time.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 7fdd5c5..3891186 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -73,7 +73,9 @@ bool TinyCanBackend::canCreate(QString *errorReason) QList<QCanBusDeviceInfo> TinyCanBackend::interfaces() { - return { createDeviceInfo(QStringLiteral("can0.0")), createDeviceInfo(QStringLiteral("can0.1")) }; + QList<QCanBusDeviceInfo> result; + result.append(createDeviceInfo(QStringLiteral("can0.0"))); + return result; } namespace { |