add: @pwpipi 's fixes to 14B

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index c595d5e128da9e085e40bec6dbc9b2b0ccba1d74..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;


@@ -85,9 +85,5 @@ extern void iso14443a_setup(uint8_t fpga_minor_mode);
 extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr);
 extern void iso14a_set_trigger(bool enable);
 extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr);
 extern void iso14a_set_trigger(bool enable);

-extern void iso14a_set_timeout(uint32_t timeout);
-
-extern void iso14a_clear_trace();
-extern void iso14a_set_tracing(bool enable);

 
 #endif /* __ISO14443A_H */
 
 #endif /* __ISO14443A_H */