cad, cam file commit

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 46e1e57e043755d750aa807740f40e1f9d732f0b..c273c1f383b759c76a008669d91f1300c30134e7 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -52,11 +52,8 @@ void ReceiveCommand(UsbCommand* rxcmd) {
   while (true) {
     rxlen = sizeof(UsbCommand) - (prx-prxcmd);
     if (uart_receive(sp,prx,&rxlen)) {
-//      printf("received [%zd] bytes\n",rxlen);
       prx += rxlen;
       if ((prx-prxcmd) >= sizeof(UsbCommand)) {
-//        printf("received: ");
-//        cmd_debug(rxcmd);
         return;
       }
     }
@@ -84,10 +81,11 @@ 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");
        //Is the example below really true? /Martin
-       fprintf(stderr, "Example:\n\t %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
-       fprintf(stderr, "Example (Linux):\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 USB', try deactivating modem-manager: 'sudo service modemmanager stop'\n\n");
-
+       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
@@ -127,14 +125,14 @@ int main(int argc, char **argv)
 
   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");
 
-       res = flash_start_flashing(can_write_bl);
+       res = flash_start_flashing(can_write_bl,serial_port_name);
        if (res < 0)
                return -1;