Create session key

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index b59fff049f52777b134401576890cf4bb3434ee4..60c04adce5d635a2154983d5a7024fbf166a8bab 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -13,11 +13,10 @@
 #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);
@@ -306,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;
 
@@ -340,7 +339,7 @@ static int enter_bootloader(void)
     msleep(100);
                CloseProxmark();
 
-               fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
+               fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
     do {
                        sleep(1);
                        fprintf(stderr, ".");
@@ -366,11 +365,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)