HitagS Improvements (#721)

[proxmark3-svn] / client / cmdhftopaz.c

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 39ff180473d19fa1eee81329cfd6e52ae960ac7f..6058cabe2ab8b8b18d671a00ba5427e6cb38f228 100644 (file)
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -8,17 +8,18 @@
 // High frequency Topaz (NFC Type 1) commands
 //-----------------------------------------------------------------------------
 
 // High frequency Topaz (NFC Type 1) commands
 //-----------------------------------------------------------------------------
 

+#include "cmdhftopaz.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "cmdmain.h"
 #include "cmdparser.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "cmdmain.h"
 #include "cmdparser.h"

-#include "cmdhftopaz.h"

 #include "cmdhf14a.h"
 #include "ui.h"
 #include "mifare.h"
 #include "cmdhf14a.h"
 #include "ui.h"
 #include "mifare.h"

-#include "proxmark3.h"
+#include "comms.h"

 #include "iso14443crc.h"
 #include "protocols.h"
 
 #include "iso14443crc.h"
 #include "protocols.h"
 


@@ -454,7 +455,7 @@ int CmdHFTopazReader(const char *Cmd)
        PrintAndLog("HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0], 
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
        PrintAndLog("HR0  : %02x (%sa Topaz tag (%scapable of carrying a NDEF message), %s memory map)", rid_response[0], 
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",
                                                (rid_response[0] & 0xF0) == 0x10 ? "" : "not ",

-                                               (rid_response[0] & 0x0F) == 0x10 ? "static" : "dynamic");
+                                               (rid_response[0] & 0x0F) == 0x01 ? "static" : "dynamic");

        PrintAndLog("HR1  : %02x", rid_response[1]);
        
        status = topaz_rall(uid_echo, rall_response);
        PrintAndLog("HR1  : %02x", rid_response[1]);
        
        status = topaz_rall(uid_echo, rall_response);


@@ -553,10 +554,7 @@ static command_t CommandTable[] =
 
 
 int CmdHFTopaz(const char *Cmd) {
 
 
 int CmdHFTopaz(const char *Cmd) {

-       // flush
-       WaitForResponseTimeout(CMD_ACK,NULL,100);
-
-       // parse
+       (void)WaitForResponseTimeout(CMD_ACK,NULL,100);

        CmdsParse(CommandTable, Cmd);
        return 0;
 }
        CmdsParse(CommandTable, Cmd);
        return 0;
 }