Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / client / cmdlfti.c

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index a0e2bb84218f6f233624e96b6eb10877ac3d80b3..ff463971689ed830b43e4c5e514bbe3566907277 100644 (file)
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -1,11 +1,24 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// 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
+// the license.
+//-----------------------------------------------------------------------------
+// Low frequency TI commands
+//-----------------------------------------------------------------------------
+
+#include "cmdlfti.h"
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
 #include "crc16.h"
-#include "proxusb.h"
-#include "data.h"
+#include "comms.h"
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"
-#include "cmdlfti.h"
+#include "util.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -262,7 +275,8 @@ int CmdTIWrite(const char *Cmd)
   UsbCommand c = {CMD_WRITE_TI_TYPE};
   int res = 0;
 
-  res = sscanf(Cmd, "0x%x 0x%x 0x%x ", &c.arg[0], &c.arg[1], &c.arg[2]);
+  res = sscanf(Cmd, "%012" SCNx64 " %012" SCNx64 " %012" SCNx64 "", &c.arg[0], &c.arg[1], &c.arg[2]);
+  
   if (res == 2) c.arg[2]=0;
   if (res < 2)
     PrintAndLog("Please specify the data as two hex strings, optionally the CRC as a third");