appmain.c cleanup

[proxmark3-svn] / client / cmdhf14a.h

diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 5276da365ec9f21044f6894b3df413d44ebf320a..d1669f3a653c745e01883563c7a6fe80c85008ee 100644 (file)
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -12,30 +12,23 @@
 #ifndef CMDHF14A_H__
 #define CMDHF14A_H__
 
 #ifndef CMDHF14A_H__
 #define CMDHF14A_H__
 

-#include <stdio.h>

 #include <stdint.h>
 #include <stdint.h>

-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
-#include <unistd.h>

 #include <stdbool.h>
 #include <stdbool.h>

+#include "mifare.h"

 
 

-// structure and database for uid -> tagtype lookups 
-typedef struct { 
-       uint8_t uid;
-       char* desc;
-} manufactureName; 
-
-int CmdHF14A(const char *Cmd);
-int CmdHF14AList(const char *Cmd);
-int CmdHF14AMifare(const char *Cmd);
-int CmdHF14AReader(const char *Cmd);
+extern int CmdHF14A(const char *Cmd);
+extern int CmdHF14AMfDbg(const char* cmd);
+extern int CmdHF14AList(const char *Cmd);
+extern int CmdHF14AMifare(const char *Cmd);
+extern int CmdHF14AReader(const char *Cmd);

 extern int CmdHF14AInfo(const char *Cmd);
 extern int CmdHF14AInfo(const char *Cmd);

-int CmdHF14ASim(const char *Cmd);
-int CmdHF14ASnoop(const char *Cmd);
-char* getTagInfo(uint8_t uid);
+extern int CmdHF14ASim(const char *Cmd);
+extern int CmdHF14ASnoop(const char *Cmd);

 
 extern void DropField();
 
 extern void DropField();

-extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen);
+
+extern int Hf14443_4aGetCardData(iso14a_card_select_t * card);
+extern int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
+extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);

 
 #endif
 
 #endif