Finally, rewrote bootrom and flasher program, much faster now

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 3ca95a41b10ee9e649250b8960c081121437420d..efbd4c48a16cb199720de78f0cda5588da04f1cb 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -10,7 +10,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "proxusb.h"
+#include <inttypes.h>
+//#include "proxusb.h"
+#include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"
@@ -275,13 +277,12 @@ int CmdEM410xWatch(const char *Cmd)
  */
 int CmdEM4x50Read(const char *Cmd)
 {
-  int i, j, startblock, clock, skip, block, start, end, low, high;
+  int i, j, startblock, skip, block, start, end, low, high;
   bool complete= false;
   int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
   char tmp[6];
 
   high= low= 0;
-  clock= 64;
   memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64);
 
   /* first get high and low values */
@@ -404,7 +405,7 @@ int CmdEM410xWrite(const char *Cmd)
   uint64_t id = 0;
   unsigned int card;
 
-  sscanf(Cmd, "%lx %d", &id, &card);
+  sscanf(Cmd, "%" PRIx64 " %d", &id, &card);
 
   if (id >= 0x10000000000) {
     PrintAndLog("Error! Given EM410x ID is longer than 40 bits.\n");
@@ -416,7 +417,7 @@ int CmdEM410xWrite(const char *Cmd)
     return 0;
   }
 
-  PrintAndLog("Writing %s tag with UID 0x%010lx", card ? "T55x7":"T5555", id);
+  PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, card ? "T55x7":"T5555", id);
   UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
   SendCommand(&c);