From 9d918568110cb3c70fda1b77630f1f8c54c8bc89 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 17 Jun 2018 12:55:32 +0200 Subject: [PATCH] chg: from official --- client/flasher.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/client/flasher.c b/client/flasher.c index 9ef87d0f2..48e66d8f9 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -24,6 +24,14 @@ # include #endif +#if defined (_WIN32) +#define SERIAL_PORT_H "com3" +#elif defined(__APPLE__) +#define SERIAL_PORT_H "/dev/cu.usbmodem888" +#else +#define SERIAL_PORT_H "/dev/ttyACM0" +#endif + static serial_port sp; static char* serial_port_name; @@ -88,9 +96,7 @@ int OpenProxmark() { static void usage(char *argv0) { fprintf(stdout, "Usage: %s [-b] image.elf [image.elf...]\n\n", argv0); fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n"); - fprintf(stdout, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0); - fprintf(stdout, "\nExample (OSX :\n\n\t %s /dev/cu.usbmodem888 armsrc/obj/fullimage.elf\n", argv0); - fprintf(stdout, "\nExample (WIN) :\n\n\t %s com3 armsrc/obj/fullimage.elf\n\n", argv0); + fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0); #ifdef __linux__ fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on ',\n"); fprintf(stdout, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n");