X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e98572a1e2dde603f31cc06f330c6abd295139de..547595784facfc9565ca08af18d9bead6bfac31b:/client/mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 49991d66..a214ede4 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -19,28 +19,21 @@
 #include "nonce2key/nonce2key.h"
 #include "nonce2key/crapto1.h"
 #include "iso14443crc.h"
+#include "protocols.h"
 
 #define MEM_CHUNK               1000000
 #define NESTED_SECTOR_RETRY     10
 
-// mfCSetBlock work flags
-#define CSETBLOCK_UID 					0x01
-#define CSETBLOCK_WUPC					0x02
-#define CSETBLOCK_HALT					0x04
-#define CSETBLOCK_INIT_FIELD		0x08
-#define CSETBLOCK_RESET_FIELD		0x10
-#define CSETBLOCK_SINGLE_OPER		0x1F
-
 // mifare tracer flags
-#define TRACE_IDLE		 					0x00
-#define TRACE_AUTH1		 					0x01
-#define TRACE_AUTH2		 					0x02
-#define TRACE_AUTH_OK	 					0x03
-#define TRACE_READ_DATA 				0x04
-#define TRACE_WRITE_OK					0x05
-#define TRACE_WRITE_DATA				0x06
+#define TRACE_IDLE		 		0x00
+#define TRACE_AUTH1		 		0x01
+#define TRACE_AUTH2		 		0x02
+#define TRACE_AUTH_OK	 		0x03
+#define TRACE_READ_DATA 		0x04
+#define TRACE_WRITE_OK			0x05
+#define TRACE_WRITE_DATA		0x06
 
-#define TRACE_ERROR		 					0xFF
+#define TRACE_ERROR		 		0xFF
 
 typedef struct {
 	uint64_t Key[2];
@@ -56,8 +49,8 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
 int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
 
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe);
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard);
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
 
 int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);