add psk to em4x05 reads and tweak psk demod

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index c37103886e94b4a2175b9c32ee8325069142db12..ec99ab99a4f7426628d73ace74f10237b81838c3 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -56,15 +56,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,6 +84,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);

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