FIX: tcgetattr for Linux in Ukbhit(), should return -1 if fail.

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 57681d716933a59edda9277c117454a552b64631..8336d79330e588b7197fdb40896838ed663caf97 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -25,7 +25,7 @@ bool InitDesfireCard(){
        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);
+       int len = iso14443a_select_card(NULL,card,NULL,true,0);
 
        if (!len) {
                if (MF_DBGLEVEL >= MF_DBG_ERROR)
@@ -114,7 +114,7 @@ void MifareDesfireGetInformation(){
 
        // card select - information
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
-       byte_t isOK = iso14443a_select_card(NULL, card, NULL);
+       byte_t isOK = iso14443a_select_card(NULL, card, NULL, true, 0);
        if ( isOK == 0) {
                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                        Dbprintf("Can't select card");
@@ -575,11 +575,6 @@ void OnSuccess(){
 }
 
 void OnError(uint8_t reason){
-       pcb_blocknum = 0;
-       ReaderTransmit(deselect_cmd, 3 , NULL);
-       
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        cmd_send(CMD_ACK,0,reason,0,0,0);
-       LEDsoff();
-       set_tracing(FALSE);     
+       OnSuccess();
 }