fixed hf mf rdbl response data (broken since r634)

[proxmark3-svn] / client / cmdhflegic.c

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index aad035615173aef5835fb0a7d6bb9498e0111ccf..ebc75f796ce494d09968a7927c47cad3034c502b 100644 (file)
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -10,7 +10,8 @@
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

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

 #include "data.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "data.h"
 #include "ui.h"
 #include "cmdparser.h"


@@ -69,7 +70,7 @@ int CmdLegicDecode(const char *Cmd)
   for (i = 0; i < 256; i += 12, h += 48) {
     UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
     SendCommand(&c);
   for (i = 0; i < 256; i += 12, h += 48) {
     UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
     SendCommand(&c);

-    WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
+    WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, NULL);

     
     for (j = 0; j < 48; j += 8) {
       for (k = 0; k < 8; k++) {
     
     for (j = 0; j < 48; j += 8) {
       for (k = 0; k < 8; k++) {


@@ -253,7 +254,7 @@ int CmdLegicLoad(const char *Cmd)
             c.d.asBytes[j] = data[j];
         }
         SendCommand(&c);
             c.d.asBytes[j] = data[j];
         }
         SendCommand(&c);

-        WaitForResponse(CMD_ACK);
+        WaitForResponse(CMD_ACK, NULL);

         offset += 8;
     }
     fclose(f);
         offset += 8;
     }
     fclose(f);


@@ -292,7 +293,7 @@ int CmdLegicSave(const char *Cmd)
   for (int i = offset; i < n+offset; i += 12) {
     UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
     SendCommand(&c);
   for (int i = offset; i < n+offset; i += 12) {
     UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
     SendCommand(&c);

-    WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
+    WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, NULL);

     for (int j = 0; j < 48; j += 8) {
       fprintf(f, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
         sample_buf[j+0],
     for (int j = 0; j < 48; j += 8) {
       fprintf(f, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
         sample_buf[j+0],


@@ -323,7 +324,7 @@ int CmdLegicRfSim(const char *Cmd)
    c.arg[0] = 6;
    c.arg[1] = 3;
    c.arg[2] = 0;
    c.arg[0] = 6;
    c.arg[1] = 3;
    c.arg[2] = 0;

-   sscanf(Cmd, " %i %i %i", &c.arg[0], &c.arg[1], &c.arg[2]);
+   sscanf(Cmd, " %"lli" %"lli" %"lli, &c.arg[0], &c.arg[1], &c.arg[2]);

    SendCommand(&c);
    return 0;
 }
    SendCommand(&c);
    return 0;
 }


@@ -331,7 +332,7 @@ int CmdLegicRfSim(const char *Cmd)
 int CmdLegicRfWrite(const char *Cmd)
 {
     UsbCommand c={CMD_WRITER_LEGIC_RF};
 int CmdLegicRfWrite(const char *Cmd)
 {
     UsbCommand c={CMD_WRITER_LEGIC_RF};

-    int res = sscanf(Cmd, " 0x%x 0x%x", &c.arg[0], &c.arg[1]);
+    int res = sscanf(Cmd, " 0x%"llx" 0x%"llx, &c.arg[0], &c.arg[1]);

        if(res != 2) {
                PrintAndLog("Please specify the offset and length as two hex strings");
         return -1;
        if(res != 2) {
                PrintAndLog("Please specify the offset and length as two hex strings");
         return -1;


@@ -343,7 +344,7 @@ int CmdLegicRfWrite(const char *Cmd)
 int CmdLegicRfFill(const char *Cmd)
 {
     UsbCommand cmd ={CMD_WRITER_LEGIC_RF};
 int CmdLegicRfFill(const char *Cmd)
 {
     UsbCommand cmd ={CMD_WRITER_LEGIC_RF};

-    int res = sscanf(Cmd, " 0x%x 0x%x 0x%x", &cmd.arg[0], &cmd.arg[1], &cmd.arg[2]);
+    int res = sscanf(Cmd, " 0x%"llx" 0x%"llx" 0x%"llx, &cmd.arg[0], &cmd.arg[1], &cmd.arg[2]);

     if(res != 3) {
         PrintAndLog("Please specify the offset, length and value as two hex strings");
         return -1;
     if(res != 3) {
         PrintAndLog("Please specify the offset, length and value as two hex strings");
         return -1;


@@ -357,7 +358,7 @@ int CmdLegicRfFill(const char *Cmd)
     for(i = 0; i < 22; i++) {
       c.arg[0] = i*48;
       SendCommand(&c);
     for(i = 0; i < 22; i++) {
       c.arg[0] = i*48;
       SendCommand(&c);

-      WaitForResponse(CMD_ACK);
+      WaitForResponse(CMD_ACK,NULL);

     }
     SendCommand(&cmd);
     return 0;
     }
     SendCommand(&cmd);
     return 0;