X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5b59cfb7b1067f95d4a1eb403404d1c15c23cac2..16a372ab75c10b0ffb3786adc4029cd1df2f6066:/client/flasher.c?ds=sidebyside diff --git a/client/flasher.c b/client/flasher.c index 46e1e57e..2a24ba8f 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -84,10 +84,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 +128,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;