X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bc908d8f9d6cb17b623a9ce9127e294375e38aec..e99acd00cc0ef24aa685b86eb4623c397e082368:/client/cmdhfmfdes.h

diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 5979113d..18594075 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-// Copyright (C) 2014 Iceman
+// Iceman, 2014
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------------
 // High frequency MIFARE Desfire commands
 //-----------------------------------------------------------------------------
+#ifndef __MFDESFIRE_H
+#define __MFDESFIRE_H
 
 int CmdHFMFDes(const char *Cmd);
 int CmdHF14ADesAuth(const char* cmd);
@@ -30,42 +32,42 @@ enum  {
 } CmdOptions ;
 
 
-#define  CREATE_APPLICATION 			 0xca
-#define  DELETE_APPLICATION 			 0xda
-#define  GET_APPLICATION_IDS 			 0x6a
-#define      SELECT_APPLICATION 		 0x5a
-#define      FORMAT_PICC 				 0xfc
-#define      GET_VERSION 				 0x60
-#define      READ_DATA 					 0xbd
-#define      WRITE_DATA					 0x3d
-#define      GET_VALUE 					 0x6c
-#define      CREDIT 					 0x0c
-#define      DEBIT 						 0xdc
-#define      LIMITED_CREDIT 			 0x1c
-#define      WRITE_RECORD 				 0x3b
-#define      READ_RECORDS 				 0xbb
-#define     CLEAR_RECORD_FILE 			 0xeb
-#define      COMMIT_TRANSACTION 		 0xc7
-#define      ABORT_TRANSACTION 			 0xa7
-#define      GET_FREE_MEMORY             0x6e
-#define  	GET_FILE_IDS 				 0x6f
-#define  	GET_ISOFILE_IDS 			 0x61
-#define     GET_FILE_SETTINGS 			 0xf5
-#define     CHANGE_FILE_SETTINGS 		 0x5f
-#define     CREATE_STD_DATA_FILE 		 0xcd
-#define     CREATE_BACKUP_DATA_FILE 	 0xcb
-#define     CREATE_VALUE_FILE 			 0xcc
-#define     CREATE_LINEAR_RECORD_FILE 	 0xc1
-#define     CREATE_CYCLIC_RECORD_FILE 	 0xc0
-#define     DELETE_FILE 				 0xdf
-#define     AUTHENTICATE	 			 0x0a  // AUTHENTICATE_NATIVE
-#define  	AUTHENTICATE_ISO 			 0x1a  // AUTHENTICATE_STANDARD
-#define  	AUTHENTICATE_AES 			 0xaa
-#define     CHANGE_KEY_SETTINGS 		 0x54
-#define     GET_KEY_SETTINGS 			 0x45
-#define     CHANGE_KEY 					 0xc4
-#define     GET_KEY_VERSION 			 0x64
-#define     AUTHENTICATION_FRAME 		 0xAF
+#define  CREATE_APPLICATION 		 0xca
+#define  DELETE_APPLICATION 		 0xda
+#define  GET_APPLICATION_IDS 		 0x6a
+#define  SELECT_APPLICATION 		 0x5a
+#define  FORMAT_PICC 				 0xfc
+#define  GET_VERSION 				 0x60
+#define  READ_DATA 					 0xbd
+#define  WRITE_DATA					 0x3d
+#define  GET_VALUE 					 0x6c
+#define  CREDIT 					 0x0c
+#define  DEBIT 						 0xdc
+#define  LIMITED_CREDIT 			 0x1c
+#define  WRITE_RECORD 				 0x3b
+#define  READ_RECORDS 				 0xbb
+#define  CLEAR_RECORD_FILE 			 0xeb
+#define  COMMIT_TRANSACTION 		 0xc7
+#define  ABORT_TRANSACTION 			 0xa7
+#define  GET_FREE_MEMORY             0x6e
+#define  GET_FILE_IDS 				 0x6f
+#define  GET_ISOFILE_IDS 			 0x61
+#define  GET_FILE_SETTINGS 			 0xf5
+#define  CHANGE_FILE_SETTINGS 		 0x5f
+#define  CREATE_STD_DATA_FILE 		 0xcd
+#define  CREATE_BACKUP_DATA_FILE 	 0xcb
+#define  CREATE_VALUE_FILE 			 0xcc
+#define  CREATE_LINEAR_RECORD_FILE 	 0xc1
+#define  CREATE_CYCLIC_RECORD_FILE 	 0xc0
+#define  DELETE_FILE 				 0xdf
+#define  AUTHENTICATE	 			 0x0a  // AUTHENTICATE_NATIVE
+#define  AUTHENTICATE_ISO 			 0x1a  // AUTHENTICATE_STANDARD
+#define  AUTHENTICATE_AES 			 0xaa
+#define  CHANGE_KEY_SETTINGS 		 0x54
+#define  GET_KEY_SETTINGS 			 0x45
+#define  CHANGE_KEY 				 0xc4
+#define  GET_KEY_VERSION 			 0x64
+#define  AUTHENTICATION_FRAME 		 0xAF
 
 #define MAX_NUM_KEYS 0x0F
 #define MAX_APPLICATION_COUNT 28
@@ -108,8 +110,7 @@ enum  {
 #define COMMAND_ABORTED			0xCA		// Previous Command was not fully
 											//  completed Not all Frames were
 											//  requested or provided by PCD
-#define PICC_DISABLED_ERROR		0xCD // [1] // PICC was disabled by an unre-
-											//  coverable error
+#define PICC_DISABLED_ERROR		0xCD // [1] // PICC was disabled by an unrecoverable error
 #define COUNT_ERROR				0xCE		// Number of Applications limited
 											//  to 28, no additional
 											//  CreateApplication possible
@@ -125,4 +126,6 @@ enum  {
 #define FILE_INTEGRITY_ERROR	0xF1 // [1]	// Unrecoverable error within file,
 											//  file will be disabled
 //
-// [1] These errors are not expected to appear during normal operation.        |
\ No newline at end of file
+// [1] These errors are not expected to appear during normal operation
+
+#endif
\ No newline at end of file