Merge pull request #264 from qweenwasabi/master

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 2a24ba8fc07543cbccb82cb35deba5a1d9fc28f0..0c1dbd71f1794a1fe4a6a33f2792f057878b5363 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -9,8 +9,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include "sleep.h"
+#include <inttypes.h>

 #include "proxmark3.h"
 #include "proxmark3.h"

+#include "util.h"

 #include "flash.h"
 #include "uart.h"
 #include "usb_cmd.h"
 #include "flash.h"
 #include "uart.h"
 #include "usb_cmd.h"


@@ -25,10 +26,10 @@ static char* serial_port_name;
 void cmd_debug(UsbCommand* UC) {
   //  Debug
   printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
 void cmd_debug(UsbCommand* UC) {
   //  Debug
   printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));

-  printf("  cmd[len=%zd]: %016"llx"\n",sizeof(UC->cmd),UC->cmd);
-  printf(" arg0[len=%zd]: %016"llx"\n",sizeof(UC->arg[0]),UC->arg[0]);
-  printf(" arg1[len=%zd]: %016"llx"\n",sizeof(UC->arg[1]),UC->arg[1]);
-  printf(" arg2[len=%zd]: %016"llx"\n",sizeof(UC->arg[2]),UC->arg[2]);
+  printf("  cmd[len=%zd]: %016" PRIx64 "\n",sizeof(UC->cmd),UC->cmd);
+  printf(" arg0[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[0]),UC->arg[0]);
+  printf(" arg1[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[1]),UC->arg[1]);
+  printf(" arg2[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[2]),UC->arg[2]);

   printf(" data[len=%zd]: ",sizeof(UC->d.asBytes));
   for (size_t i=0; i<16; i++) {
     printf("%02x",UC->d.asBytes[i]);
   printf(" data[len=%zd]: ",sizeof(UC->d.asBytes));
   for (size_t i=0; i<16; i++) {
     printf("%02x",UC->d.asBytes[i]);


@@ -52,11 +53,8 @@ void ReceiveCommand(UsbCommand* rxcmd) {
   while (true) {
     rxlen = sizeof(UsbCommand) - (prx-prxcmd);
     if (uart_receive(sp,prx,&rxlen)) {
   while (true) {
     rxlen = sizeof(UsbCommand) - (prx-prxcmd);
     if (uart_receive(sp,prx,&rxlen)) {

-//      printf("received [%zd] bytes\n",rxlen);

       prx += rxlen;
       if ((prx-prxcmd) >= sizeof(UsbCommand)) {
       prx += rxlen;
       if ((prx-prxcmd) >= sizeof(UsbCommand)) {

-//        printf("received: ");
-//        cmd_debug(rxcmd);

         return;
       }
     }
         return;
       }
     }