X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/17c60b1248713836ecf4e7e9ce2639a05a7e1d35..7444d916c680c4a5b93306c21f008b3096ed66cc:/armsrc/iso14443a.h?ds=sidebyside diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h index 1e978e88..3344de43 100644 --- a/armsrc/iso14443a.h +++ b/armsrc/iso14443a.h @@ -12,7 +12,8 @@ #ifndef __ISO14443A_H #define __ISO14443A_H -#include "common.h" +#include "../include/common.h" +#include "../include/mifare.h" #include "mifaresniff.h" typedef struct { @@ -56,15 +57,14 @@ typedef struct { // DROP_FIRST_HALF, } state; uint16_t shiftReg; - uint16_t bitCount; + int16_t bitCount; uint16_t len; uint16_t byteCntMax; uint16_t posCnt; uint16_t syncBit; uint8_t parityBits; uint8_t parityLen; - uint16_t highCnt; - uint16_t twoBits; + uint32_t fourBits; uint32_t startTime, endTime; uint8_t *output; uint8_t *parity;