minor fixes regaring the newly released patches from the pm3 community

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 6d18515fc80a6281f6a1de710a0d86a99599d576..15e2a2f0259f27aa90b2b3804d40133ae8b41203 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,16 +12,9 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H

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

 #include "mifaresniff.h"
 
 #include "mifaresniff.h"
 

-// mifare reader                      over DMA buffer (SnoopIso14443a())!!!
-#define MIFARE_BUFF_OFFSET 3560  //              \/   \/   \/
-// card emulator memory
-#define EML_RESPONSES      4000
-#define CARD_MEMORY        6000
-#define CARD_MEMORY_LEN    4096
-

 typedef struct {
        enum {
                DEMOD_UNSYNCD,
 typedef struct {
        enum {
                DEMOD_UNSYNCD,


@@ -35,12 +28,14 @@ typedef struct {
        uint16_t bitCount;
        uint16_t collisionPos;
        uint16_t syncBit;
        uint16_t bitCount;
        uint16_t collisionPos;
        uint16_t syncBit;

-       uint32_t parityBits;
+       uint8_t parityBits;
+       uint8_t parityLen;

        uint16_t shiftReg;
        uint16_t samples;
        uint16_t len;
        uint32_t startTime, endTime;
        uint8_t  *output;
        uint16_t shiftReg;
        uint16_t samples;
        uint16_t len;
        uint32_t startTime, endTime;
        uint8_t  *output;

+       uint8_t  *parity;

 } tDemod;
 
 typedef enum {
 } tDemod;
 
 typedef enum {


@@ -66,32 +61,33 @@ typedef struct {
        uint16_t byteCntMax;
        uint16_t posCnt;
        uint16_t syncBit;
        uint16_t byteCntMax;
        uint16_t posCnt;
        uint16_t syncBit;

-       uint32_t parityBits;
+       uint8_t parityBits;
+       uint8_t parityLen;

        uint16_t highCnt;
        uint16_t twoBits;
        uint32_t startTime, endTime;
     uint8_t *output;
        uint16_t highCnt;
        uint16_t twoBits;
        uint32_t startTime, endTime;
     uint8_t *output;

+       uint8_t *parity;

 } tUart;
 
 
 
 extern byte_t oddparity (const byte_t bt);
 } tUart;
 
 
 
 extern byte_t oddparity (const byte_t bt);

-extern uint32_t GetParity(const uint8_t *pbtCmd, int iLen);
+extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);

 extern void AppendCrc14443a(uint8_t *data, int len);
 
 extern void AppendCrc14443a(uint8_t *data, int len);
 

-extern void ReaderTransmit(uint8_t *frame, int len, uint32_t *timing);
-extern void ReaderTransmitBitsPar(uint8_t *frame, int bits, uint32_t par, uint32_t *timing);
-extern void ReaderTransmitPar(uint8_t *frame, int len, uint32_t par, uint32_t *timing);
-extern int ReaderReceive(uint8_t *receivedAnswer);
-extern int ReaderReceivePar(uint8_t *receivedAnswer, uint32_t *parptr);
+extern void ReaderTransmit(uint8_t *frame, uint16_t len, uint32_t *timing);
+extern void ReaderTransmitBitsPar(uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing);
+extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32_t *timing);
+extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);

 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);

-extern int iso14_apdu(uint8_t *cmd, size_t cmd_len, void *data);
+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 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_tracelen();
+extern void iso14a_clear_trace();

 extern void iso14a_set_tracing(bool enable);
 
 #endif /* __ISO14443A_H */
 extern void iso14a_set_tracing(bool enable);
 
 #endif /* __ISO14443A_H */