From 9e1f4e2bcddca7ff0b97c21d49b6bf024e17a78f Mon Sep 17 00:00:00 2001 From: Ondrej Mikle Date: Sat, 19 Jul 2014 17:07:09 +0200 Subject: [PATCH] Allow ISO14443A cards now, we don't use it for any other anyway. --- brmdoor_nfc.cpp | 12 ++++++------ brmdoor_nfc.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/brmdoor_nfc.cpp b/brmdoor_nfc.cpp index 7dc5a1f..04ca79b 100644 --- a/brmdoor_nfc.cpp +++ b/brmdoor_nfc.cpp @@ -85,14 +85,14 @@ std::string NFCDevice::scanUID() throw(NFCError) } const nfc_modulation NFCDevice::_modulations[5] = { - { /*.nmt = */ NMT_ISO14443A, /* .nbr = */ NBR_106 }, - { /*.nmt = */ NMT_ISO14443B, /* .nbr = */ NBR_106 }, - { /*.nmt = */ NMT_FELICA, /* .nbr = */ NBR_212 }, - { /*.nmt = */ NMT_FELICA, /* .nbr = */ NBR_424 }, - { /*.nmt = */ NMT_JEWEL, /* .nbr = */ NBR_106 }, + { /*.nmt = */ NMT_ISO14443A, /* .nbr = */ NBR_106 } + //{ /*.nmt = */ NMT_ISO14443B, /* .nbr = */ NBR_106 }, + //{ /*.nmt = */ NMT_FELICA, /* .nbr = */ NBR_212 }, + //{ /*.nmt = */ NMT_FELICA, /* .nbr = */ NBR_424 }, + //{ /*.nmt = */ NMT_JEWEL, /* .nbr = */ NBR_106 }, }; -const size_t _modulationsLen = 5; +const size_t NFCDevice::_modulationsLen = 1; NFCError::NFCError(const std::string& msg) diff --git a/brmdoor_nfc.h b/brmdoor_nfc.h index 8d3edb8..143c86b 100644 --- a/brmdoor_nfc.h +++ b/brmdoor_nfc.h @@ -92,10 +92,10 @@ public: protected: /** Modulations that specify cards accepted by reader */ - static const nfc_modulation _modulations[5]; + static const nfc_modulation _modulations[5]; /** Number of modulations in _modulations array */ - static const size_t _modulationsLen = 5; + static const size_t _modulationsLen; /** libnfc-specific opaque context */ nfc_context *_nfcContext;