ADD: Added the autodetection of Topaz to "HF SEARCH"

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index fbe4d2e696bcc924fde6f2b3ceabddd22780a765..6ad2702dd1de3c51f166c0521f8125b0585d4ace 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -73,16 +73,19 @@ int CmdSrix4kRead(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 

-int rawClose(void){
+static int rawCloseEx(bool silent){

        UsbCommand resp;
        UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
        clearCommandBuffer();
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
        UsbCommand resp;
        UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
        clearCommandBuffer();
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {

-               PrintAndLog("Command time-out");
-               return 1;
+               if ( !silent ) PrintAndLog("Command time-out");
+               return 0;

        }
        }

-       return 0;
+       return 1;
+}
+static int rawClose() {
+       return rawCloseEx(false);

 }
 
 int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
 }
 
 int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){