FIX: ref https://github.com/marshmellow42/proxmark3/commit/2ec87733142000646c7ce86c7...

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 1e978e8808fa683f7744211e8bd4060c32eb59c5..3344de4327a5a7d8fba8e2edb595547d54c39e64 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,7 +12,8 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H

-#include "common.h"
+#include "../include/common.h"
+#include "../include/mifare.h"

 #include "mifaresniff.h"
 
 typedef struct {
 #include "mifaresniff.h"
 
 typedef struct {


@@ -56,15 +57,14 @@ typedef struct {
                // DROP_FIRST_HALF,
                } state;
        uint16_t shiftReg;
                // 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 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;
        uint32_t startTime, endTime;
     uint8_t *output;
        uint8_t *parity;