X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bcf61bd34ab2747580aabf648093e5854b7283ed..952a812c008767518e2357e420e1b54dcdf5e2b2:/armsrc/mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index fb486477..b1e035f9 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -19,13 +19,12 @@ static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
 //static uint8_t __res[MAX_FRAME_SIZE];
 
 bool InitDesfireCard(){
-	
-	byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
 
-	iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
-	
-	set_tracing(TRUE);
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+	set_tracing(TRUE);
+
+	byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
+	iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
 	
 	int len = iso14443a_select_card(NULL,card,NULL);
 
@@ -448,9 +447,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 	len = ReaderReceive(resp, par);
 	
 	if( len == 0x00 ){
-		if (MF_DBGLEVEL >= 4) {
-			Dbprintf("fukked");
-		}
+		if (MF_DBGLEVEL >= 4) Dbprintf("fukked");
 		return FALSE; //DATA LINK ERROR
 	}
 	// if we received an I- or R(ACK)-Block with a block number equal to the
@@ -497,6 +494,7 @@ void OnSuccess(){
 	ReaderTransmit(deselect_cmd, 3 , NULL);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
+	set_tracing(FALSE);	
 }
 
 void OnError(uint8_t reason){
@@ -506,4 +504,5 @@ void OnError(uint8_t reason){
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	cmd_send(CMD_ACK,0,reason,0,0,0);
 	LEDsoff();
+	set_tracing(FALSE);	
 }