CHG: extern methods.

[proxmark3-svn] / armsrc / iso14443a.h

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 3dec6122263fd53093b7781772f444451168c0a0..d57f5a2feb846316c0a2748d2eef6247701671e2 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,24 +12,21 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H

-#include "common.h"
-#include "proxmark3.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cmd.h"

 #include "apps.h"
 #include "util.h"
 #include "string.h"
 #include "apps.h"
 #include "util.h"
 #include "string.h"

-#include "cmd.h"

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

-#include "iso14443b.h"

 #include "crapto1.h"
 #include "mifareutil.h"
 #include "crapto1.h"
 #include "mifareutil.h"

-#include "BigBuf.h"

 #include "parity.h"
 #include "parity.h"

-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#include "random.h"

 
 typedef struct {
        enum {
 
 typedef struct {
        enum {


@@ -85,13 +82,6 @@ typedef struct {
        uint8_t *parity;
 } tUart;
 
        uint8_t *parity;
 } tUart;
 

-typedef struct {
-       uint8_t* response;
-       size_t   response_n;
-       uint8_t* modulation;
-       size_t   modulation_n;
-       uint32_t ProxToAirDuration;
-} tag_response_info_t;

 
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 extern void AppendCrc14443a(uint8_t *data, int len);
 
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 extern void AppendCrc14443a(uint8_t *data, int len);


@@ -106,12 +96,10 @@ 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, bool anticollision, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);
 
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);
 

-int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen, bool correctionNeeded);
-int EmSend4bitEx(uint8_t resp, bool correctionNeeded);
+int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);

 int EmSend4bit(uint8_t resp);
 int EmSend4bit(uint8_t resp);

-int EmSendCmdExPar(uint8_t *resp, uint16_t respLen, bool correctionNeeded, uint8_t *par);
-int EmSendCmdEx(uint8_t *resp, uint16_t respLen, bool correctionNeeded);

 extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
 extern int EmSendCmd(uint8_t *resp, uint16_t respLen);

+extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);

 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
                                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);
 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
                                uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity);