Finalized migration to new USB CDC interface

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 2e8bd2edb02372c201f09335af8ac336b7cbb115..d494810aa5b64ca9a476c047dc19727dcb5c2ba2 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "sleep.h"
-//#include "proxusb.h"
+#include "proxmark3.h"
 #include "flash.h"
 #include "uart.h"
 #include "usb_cmd.h"
@@ -21,10 +21,10 @@ static char* serial_port_name;
 void cmd_debug(UsbCommand* UC) {
   //  Debug
   printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
-  printf("  cmd[len=%zd]: %016llx\n",sizeof(UC->cmd),UC->cmd);
-  printf(" arg0[len=%zd]: %016llx\n",sizeof(UC->arg[0]),UC->arg[0]);
-  printf(" arg1[len=%zd]: %016llx\n",sizeof(UC->arg[1]),UC->arg[1]);
-  printf(" arg2[len=%zd]: %016llx\n",sizeof(UC->arg[2]),UC->arg[2]);
+  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(" data[len=%zd]: ",sizeof(UC->d.asBytes));
   for (size_t i=0; i<16; i++) {
     printf("%02x",UC->d.asBytes[i]);
@@ -67,6 +67,8 @@ void CloseProxmark() {
 int OpenProxmark(size_t i) {
   sp = uart_open(serial_port_name);
   if (sp == INVALID_SERIAL_PORT) {
+    //poll once a second
+    msleep(100);
     return 0;
   }
   return 1;