X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/28fdb04fd8d62e46c36f959b373d662f1a146448..78e7cf984c5bcd672cde13d50a4b3f7c3433569f:/client/flash.c

diff --git a/client/flash.c b/client/flash.c
index 4d091126..b59fff04 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "proxmark3.h"
 #include "sleep.h"
 //#include "proxusb.h"
 #include "flash.h"
@@ -296,7 +297,7 @@ static int get_proxmark_state(uint32_t *state)
 			*state = resp.arg[0];
 			break;
 		default:
-			fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04llx\n", resp.cmd);
+			fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04"llx"\n", resp.cmd);
 			return -1;
 			break;
 	}
@@ -336,14 +337,14 @@ static int enter_bootloader(void)
 			SendCommand(&c);
 			fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
 		}
-		fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
-
+    msleep(100);
 		CloseProxmark();
-		sleep(1);
-		while (!OpenProxmark(0)) {
+
+		fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
+    do {
 			sleep(1);
 			fprintf(stderr, ".");
-		}
+		} while (!OpenProxmark(0));
 		fprintf(stderr," Found.\n");
 
 		return 0;
@@ -358,7 +359,7 @@ static int wait_for_ack(void)
   UsbCommand ack;
 	ReceiveCommand(&ack);
 	if (ack.cmd != CMD_ACK) {
-		printf("Error: Unexpected reply 0x%04llx (expected ACK)\n", ack.cmd);
+		printf("Error: Unexpected reply 0x%04"llx" (expected ACK)\n", ack.cmd);
 		return -1;
 	}
 	return 0;
@@ -487,5 +488,6 @@ int flash_stop_flashing(void) {
 	UsbCommand c = {CMD_HARDWARE_RESET};
 //	SendCommand_(&c);
   SendCommand(&c);
+  msleep(100);
   return 0;
 }