test: hf 15 sim..

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 4d091126273a773a044b8e898f56cd533b15ef9f..60c04adce5d635a2154983d5a7024fbf166a8bab 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -11,12 +11,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "proxmark3.h"
 #include "sleep.h"
-//#include "proxusb.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
-#include "usb_cmd.h"
+#include "../include/usb_cmd.h"
 
 void SendCommand(UsbCommand* txcmd);
 void ReceiveCommand(UsbCommand* rxcmd);
@@ -296,7 +296,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;
        }
@@ -305,7 +305,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;
 
@@ -336,14 +336,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;
@@ -358,18 +358,18 @@ 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;
 }
 
 // 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)
@@ -487,5 +487,6 @@ int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
 //     SendCommand_(&c);
   SendCommand(&c);
+  msleep(100);
   return 0;
 }