Some more tinkering with a generic 13.56MHz reader, still not finished

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 4af0dea82cc5b66a562c1492198c9076f3e57f4e..3a0a1cda61b8564fdad3012cddf4f7b88496d6a2 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -306,7 +306,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(void)
+static int enter_bootloader(char *serial_port_name)
 {
        uint32_t state;
 
@@ -337,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 %s",serial_port_name);
+    do {
                        sleep(1);
                        fprintf(stderr, ".");
-               }
+               } while (!OpenProxmark(0));
                fprintf(stderr," Found.\n");
 
                return 0;
@@ -366,11 +366,11 @@ static int wait_for_ack(void)
 }
 
 // Go into flashing mode
-int flash_start_flashing(int enable_bl_writes)
+int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
 {
        uint32_t state;
 
-       if (enter_bootloader() < 0)
+       if (enter_bootloader(serial_port_name) < 0)
                return -1;
 
        if (get_proxmark_state(&state) < 0)
@@ -488,5 +488,6 @@ int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
 //     SendCommand_(&c);
   SendCommand(&c);
+  msleep(100);
   return 0;
 }