From a13f088fab1d2b28778f41a6e8f4c0951061c03f Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Wed, 1 Feb 2017 22:21:53 +0100 Subject: Updated copyright headers Change-Id: I7d38491c7ee15a1de788375acf9144c59b507d2a Reviewed-by: Alex Blasche --- src/plugins/canbus/vectorcan/main.cpp | 2 +- src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 2 +- src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 2 +- src/plugins/canbus/vectorcan/vectorcanbackend.h | 2 +- src/plugins/canbus/vectorcan/vectorcanbackend_p.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/canbus/vectorcan') diff --git a/src/plugins/canbus/vectorcan/main.cpp b/src/plugins/canbus/vectorcan/main.cpp index 7be88b9..c7fada8 100644 --- a/src/plugins/canbus/vectorcan/main.cpp +++ b/src/plugins/canbus/vectorcan/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 Denis Shienkov +** Copyright (C) 2017 Denis Shienkov ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h index 429f50e..186aef6 100644 --- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h +++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 Denis Shienkov +** Copyright (C) 2017 Denis Shienkov ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index 005b726..6ad5047 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 Denis Shienkov +** Copyright (C) 2017 Denis Shienkov ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.h b/src/plugins/canbus/vectorcan/vectorcanbackend.h index e529f48..e6f6f43 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.h +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 Denis Shienkov +** Copyright (C) 2017 Denis Shienkov ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend_p.h b/src/plugins/canbus/vectorcan/vectorcanbackend_p.h index dbb3903..ede7223 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend_p.h +++ b/src/plugins/canbus/vectorcan/vectorcanbackend_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 Denis Shienkov +** Copyright (C) 2017 Denis Shienkov ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. -- cgit v1.2.3 From 1f2f5b700b0e72785af46ae23775009cb55a1192 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Tue, 14 Feb 2017 06:50:12 +0100 Subject: VectorCAN: Fix receiving frames with extended ID Beside the CAN ID, the bit XL_CAN_EXT_MSG_ID is stored in event.tagData.msg.id. This bit indicates, that the received frame has extended frame format. However, this bit must be masked before calling QCanBusFrame::setFrameId(), otherwise the frame is marked as invalid with the ID set to zero. Most likely this was broken by commit a54fd820916caed2fb13b1a38e57deb5d918f74f Task-number: QTBUG-58840 Change-Id: I1814f19fe3ba8a7d057c42e112b62228fabf4206 Reviewed-by: Denis Shienkov Reviewed-by: Alex Blasche --- src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 2 +- src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/canbus/vectorcan') diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h index 186aef6..a2ab367 100644 --- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h +++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h @@ -214,7 +214,7 @@ typedef HANDLE XLhandle; //current version #define XL_INTERFACE_VERSION XL_INTERFACE_VERSION_V3 -#define XL_CAN_EXT_MSG_ID 0x80000000 +#define XL_CAN_EXT_MSG_ID 0x80000000U #define XL_CAN_MSG_FLAG_ERROR_FRAME 0x01 #define XL_CAN_MSG_FLAG_OVERRUN 0x02 // Overrun in Driver or CAN Controller, previous msgs have been lost. diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index 6ad5047..c91afad 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -322,8 +322,8 @@ void VectorCanBackendPrivate::startRead() const s_xl_can_msg &msg = event.tagData.msg; - QCanBusFrame frame(msg.id, QByteArray(reinterpret_cast(msg.data), - int(msg.dlc))); + QCanBusFrame frame(msg.id & ~XL_CAN_EXT_MSG_ID, + QByteArray(reinterpret_cast(msg.data), int(msg.dlc))); frame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(event.timeStamp / 1000)); frame.setExtendedFrameFormat(msg.id & XL_CAN_EXT_MSG_ID); frame.setFrameType((msg.flags & XL_CAN_MSG_FLAG_REMOTE_FRAME) -- cgit v1.2.3 From 2f934cfb143df5fccdaab20b2982e54bb13a1bdf Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Mon, 13 Feb 2017 21:51:24 +0100 Subject: VectorCAN: Load vxlapi64.dll for 64 bit builds Task-number: QTBUG-58774 Change-Id: I9ac12dbb5ae267a063b3c60130ed86499bce22dc Reviewed-by: Denis Shienkov Reviewed-by: Alex Blasche --- src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/plugins/canbus/vectorcan') diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h index a2ab367..a267fa5 100644 --- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h +++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h @@ -458,7 +458,11 @@ GENERATE_SYMBOL_VARIABLE(char *, xlGetErrorString, XLstatus) inline bool resolveSymbols(QLibrary *vectorcanLibrary) { if (!vectorcanLibrary->isLoaded()) { +#ifdef Q_PROCESSOR_X86_64 + vectorcanLibrary->setFileName(QStringLiteral("vxlapi64")); +#else vectorcanLibrary->setFileName(QStringLiteral("vxlapi")); +#endif if (!vectorcanLibrary->load()) return false; } -- cgit v1.2.3