diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2016-12-25 19:28:52 +0100 |
|---|---|---|
| committer | Lars Schmertmann <lars.schmertmann@governikus.de> | 2017-01-14 11:19:12 +0000 |
| commit | 44401721f66bdd72da197a14241a66fdb3d11cf4 (patch) | |
| tree | 4f26e73d752099121f72746127103d9d0e95470c /src/nfc/targetemulator.cpp | |
| parent | f9e85fb10a0560563e3106c4e8f6e269ece67659 (diff) | |
Avoid code duplication by using checksum calculation from qtbase
Since qtbase supports checksum calculation defined in
ITU-V.41 an own implementation is not longer needed.
Change-Id: I0f62c872b4fb517493ba43a9bb7a6d35481fa40d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/nfc/targetemulator.cpp')
| -rw-r--r-- | src/nfc/targetemulator.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/nfc/targetemulator.cpp b/src/nfc/targetemulator.cpp index ffc2c1b5..80555593 100644 --- a/src/nfc/targetemulator.cpp +++ b/src/nfc/targetemulator.cpp @@ -44,9 +44,6 @@ #include <QtCore/QDebug> -// Implementation of qNfcChecksum -#include "qnearfieldtarget.h" - QT_BEGIN_NAMESPACE TagBase::TagBase() @@ -157,7 +154,7 @@ QByteArray NfcTagType1::processCommand(const QByteArray &command) QByteArray uid = command.mid(3, 4); // check checksum - if (qNfcChecksum(command.constData(), command.length()) != 0) + if (qChecksum(command.constData(), command.length(), Qt::ChecksumItuV41) != 0) return QByteArray(); // check UID @@ -226,7 +223,7 @@ QByteArray NfcTagType1::processCommand(const QByteArray &command) QByteArray uid = command.mid(10, 4); // check checksum - if (qNfcChecksum(command.constData(), command.length()) != 0) + if (qChecksum(command.constData(), command.length(), Qt::ChecksumItuV41) != 0) return QByteArray(); // check UID @@ -280,7 +277,7 @@ QByteArray NfcTagType1::processCommand(const QByteArray &command) } if (!response.isEmpty()) { - quint16 crc = qNfcChecksum(response.constData(), response.length()); + quint16 crc = qChecksum(response.constData(), response.length(), Qt::ChecksumItuV41); response.append(quint8(crc & 0xff)); response.append(quint8(crc >> 8)); } @@ -324,7 +321,7 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command) QByteArray response; // check checksum - if (qNfcChecksum(command.constData(), command.length()) != 0) + if (qChecksum(command.constData(), command.length(), Qt::ChecksumItuV41) != 0) return QByteArray(); if (expectPacket2) { @@ -381,7 +378,7 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command) } if (!response.isEmpty()) { - quint16 crc = qNfcChecksum(response.constData(), response.length()); + quint16 crc = qChecksum(response.constData(), response.length(), Qt::ChecksumItuV41); response.append(quint8(crc & 0xff)); response.append(quint8(crc >> 8)); } |