Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 6019a6b937120d3c7c3fe893c8887861d733348a..1390d8171cebb853149b349bdef16182312ffeb1 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -13,7 +13,7 @@
 #include "proxmark3.h"
 #include "flash.h"
 #include "uart.h"
 #include "proxmark3.h"
 #include "flash.h"
 #include "uart.h"

-#include "usb_cmd.h"
+#include "../include/usb_cmd.h"

 
 #ifdef _WIN32
 # define unlink(x)
 
 #ifdef _WIN32
 # define unlink(x)


@@ -72,7 +72,7 @@ void CloseProxmark() {
 
 int OpenProxmark(size_t i) {
   sp = uart_open(serial_port_name);
 
 int OpenProxmark(size_t i) {
   sp = uart_open(serial_port_name);

-  if (sp == INVALID_SERIAL_PORT) {
+  if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {

     //poll once a second
     return 0;
   }
     //poll once a second
     return 0;
   }


@@ -83,7 +83,12 @@ static void usage(char *argv0)
 {
        fprintf(stderr, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
        fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
 {
        fprintf(stderr, "Usage:   %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
        fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");

-       fprintf(stderr, "Example: %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
+       //Is the example below really true? /Martin
+       fprintf(stderr, "Example:\n\n\t %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
+       fprintf(stderr, "\nExample (Linux):\n\n\t %s  /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0);
+       fprintf(stderr, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
+       fprintf(stderr, "              you need to blacklist proxmark for modem-manager - see wiki for more details:\n");
+       fprintf(stderr, "              http://code.google.com/p/proxmark3/wiki/Linux\n\n");

 }
 
 #define MAX_FILES 4
 }
 
 #define MAX_FILES 4


@@ -123,14 +128,14 @@ int main(int argc, char **argv)
 
   serial_port_name = argv[1];
   
 
   serial_port_name = argv[1];
   

-  fprintf(stderr,"Waiting for Proxmark to appear on USB...");
+  fprintf(stderr,"Waiting for Proxmark to appear on %s",serial_port_name);

   do {
     sleep(1);
     fprintf(stderr, ".");
   } while (!OpenProxmark(0));
   fprintf(stderr," Found.\n");
 
   do {
     sleep(1);
     fprintf(stderr, ".");
   } while (!OpenProxmark(0));
   fprintf(stderr," Found.\n");
 

-       res = flash_start_flashing(can_write_bl);
+       res = flash_start_flashing(can_write_bl,serial_port_name);

        if (res < 0)
                return -1;
 
        if (res < 0)
                return -1;