Merge branch 'master' into topaz

[proxmark3-svn] / client / cmdlfti.c

diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index dcb30746caac8bf67659b9dced847d88df4e2c57..12956abd09f54ec51fc1df55d8220296c044ab2f 100644 (file)
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -1,7 +1,17 @@
+//-----------------------------------------------------------------------------
+// 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 <stdio.h>
 #include <stdlib.h>
 #include "crc16.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "crc16.h"

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

 #include "data.h"
 #include "ui.h"
 #include "graph.h"
 #include "data.h"
 #include "ui.h"
 #include "graph.h"


@@ -263,7 +273,8 @@ int CmdTIWrite(const char *Cmd)
   UsbCommand c = {CMD_WRITE_TI_TYPE};
   int res = 0;
 
   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"llx" %012"llx" %012"llx"", &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");
   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");