small refactoring

[proxmark3-svn] / client / cmdhf14a.h

diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index eaab18cb2c5fca5dd0342f8f63e312064f57daa9..919ece5ab607870bf52c50eda060cbe3f9b52464 100644 (file)
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -1,4 +1,5 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+// 2011, Merlok

 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,


@@ -11,12 +12,40 @@
 #ifndef CMDHF14A_H__
 #define CMDHF14A_H__
 
 #ifndef CMDHF14A_H__
 #define CMDHF14A_H__
 

-int CmdHF14A(const char *Cmd);
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <string.h>
+#include <unistd.h>
+#include "util.h"
+#include "util_posix.h"
+#include "iso14443crc.h"
+#include "data.h"
+#include "proxmark3.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "common.h"
+#include "cmdmain.h"
+#include "mifare.h"
+#include "cmdhfmfu.h"
+#include "mifarehost.h"
+#include "emv/apduinfo.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);
 int CmdHF14ASim(const char *Cmd);
 int CmdHF14ASnoop(const char *Cmd);
 int CmdHF14AList(const char *Cmd);
 int CmdHF14AMifare(const char *Cmd);
 int CmdHF14AReader(const char *Cmd);
 int CmdHF14ASim(const char *Cmd);
 int CmdHF14ASnoop(const char *Cmd);

+char* getTagInfo(uint8_t uid);
+
+extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen);

 
 #endif
 
 #endif